projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tests: fix unused-but-set warning in test_fd_tracker.c
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
context.c
diff --git
a/src/bin/lttng-sessiond/context.c
b/src/bin/lttng-sessiond/context.c
index 0575ab91d5e12c50ed154d5cd74a2e314a66a39e..c8c89243823fe47a883e675532252065a75a551f 100644
(file)
--- a/
src/bin/lttng-sessiond/context.c
+++ b/
src/bin/lttng-sessiond/context.c
@@
-33,8
+33,8
@@
static int add_kctx_all_channels(struct ltt_kernel_session *ksession,
int ret;
struct ltt_kernel_channel *kchan;
int ret;
struct ltt_kernel_channel *kchan;
-
assert
(ksession);
-
assert
(kctx);
+
LTTNG_ASSERT
(ksession);
+
LTTNG_ASSERT
(kctx);
DBG("Adding kernel context to all channels");
DBG("Adding kernel context to all channels");
@@
-74,8
+74,8
@@
static int add_kctx_to_channel(struct ltt_kernel_context *kctx,
{
int ret;
{
int ret;
-
assert
(kchan);
-
assert
(kctx);
+
LTTNG_ASSERT
(kchan);
+
LTTNG_ASSERT
(kctx);
DBG("Add kernel context to channel '%s'", kchan->channel->name);
DBG("Add kernel context to channel '%s'", kchan->channel->name);
@@
-103,9
+103,9
@@
static int add_uctx_to_channel(struct ltt_ust_session *usess,
int ret;
struct ltt_ust_context *uctx = NULL;
int ret;
struct ltt_ust_context *uctx = NULL;
-
assert
(usess);
-
assert
(uchan);
-
assert
(ctx);
+
LTTNG_ASSERT
(usess);
+
LTTNG_ASSERT
(uchan);
+
LTTNG_ASSERT
(ctx);
/* Check if context is duplicate */
cds_list_for_each_entry(uctx, &uchan->ctx_list, list) {
/* Check if context is duplicate */
cds_list_for_each_entry(uctx, &uchan->ctx_list, list) {
@@
-150,7
+150,7
@@
static int add_uctx_to_channel(struct ltt_ust_session *usess,
case LTTNG_DOMAIN_UST:
break;
default:
case LTTNG_DOMAIN_UST:
break;
default:
- a
ssert(0
);
+ a
bort(
);
}
/* Create ltt UST context */
}
/* Create ltt UST context */
@@
-193,9
+193,9
@@
int context_kernel_add(struct ltt_kernel_session *ksession,
struct ltt_kernel_channel *kchan;
struct ltt_kernel_context *kctx;
struct ltt_kernel_channel *kchan;
struct ltt_kernel_context *kctx;
-
assert
(ksession);
-
assert
(ctx);
-
assert
(channel_name);
+
LTTNG_ASSERT
(ksession);
+
LTTNG_ASSERT
(ctx);
+
LTTNG_ASSERT
(channel_name);
kctx = trace_kernel_create_context(NULL);
if (!kctx) {
kctx = trace_kernel_create_context(NULL);
if (!kctx) {
@@
-206,113
+206,116
@@
int context_kernel_add(struct ltt_kernel_session *ksession,
/* Setup kernel context structure */
switch (ctx->ctx) {
case LTTNG_EVENT_CONTEXT_PID:
/* Setup kernel context structure */
switch (ctx->ctx) {
case LTTNG_EVENT_CONTEXT_PID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_PID;
break;
case LTTNG_EVENT_CONTEXT_PROCNAME:
break;
case LTTNG_EVENT_CONTEXT_PROCNAME:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_PROCNAME;
break;
case LTTNG_EVENT_CONTEXT_PRIO:
break;
case LTTNG_EVENT_CONTEXT_PRIO:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PRIO;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_PRIO;
break;
case LTTNG_EVENT_CONTEXT_NICE:
break;
case LTTNG_EVENT_CONTEXT_NICE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_NICE;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_NICE;
break;
case LTTNG_EVENT_CONTEXT_VPID:
break;
case LTTNG_EVENT_CONTEXT_VPID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VPID;
break;
case LTTNG_EVENT_CONTEXT_TID:
break;
case LTTNG_EVENT_CONTEXT_TID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_TID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_TID;
break;
case LTTNG_EVENT_CONTEXT_VTID:
break;
case LTTNG_EVENT_CONTEXT_VTID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VTID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VTID;
break;
case LTTNG_EVENT_CONTEXT_PPID:
break;
case LTTNG_EVENT_CONTEXT_PPID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_PPID;
break;
case LTTNG_EVENT_CONTEXT_VPPID:
break;
case LTTNG_EVENT_CONTEXT_VPPID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VPPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VPPID;
break;
case LTTNG_EVENT_CONTEXT_HOSTNAME:
break;
case LTTNG_EVENT_CONTEXT_HOSTNAME:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_HOSTNAME;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_HOSTNAME;
break;
case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER:
case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
break;
case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER:
case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_PERF_CPU_COUNTER;
break;
case LTTNG_EVENT_CONTEXT_INTERRUPTIBLE:
break;
case LTTNG_EVENT_CONTEXT_INTERRUPTIBLE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_INTERRUPTIBLE;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_INTERRUPTIBLE;
break;
case LTTNG_EVENT_CONTEXT_PREEMPTIBLE:
break;
case LTTNG_EVENT_CONTEXT_PREEMPTIBLE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PREEMPTIBLE;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_PREEMPTIBLE;
break;
case LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE:
break;
case LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_NEED_RESCHEDULE;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_NEED_RESCHEDULE;
break;
case LTTNG_EVENT_CONTEXT_MIGRATABLE:
break;
case LTTNG_EVENT_CONTEXT_MIGRATABLE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_MIGRATABLE;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_MIGRATABLE;
break;
case LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL:
break;
case LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_CALLSTACK_KERNEL;
break;
case LTTNG_EVENT_CONTEXT_CALLSTACK_USER:
break;
case LTTNG_EVENT_CONTEXT_CALLSTACK_USER:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_CALLSTACK_USER;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_CALLSTACK_USER;
break;
case LTTNG_EVENT_CONTEXT_CGROUP_NS:
break;
case LTTNG_EVENT_CONTEXT_CGROUP_NS:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_CGROUP_NS;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_CGROUP_NS;
break;
case LTTNG_EVENT_CONTEXT_IPC_NS:
break;
case LTTNG_EVENT_CONTEXT_IPC_NS:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_IPC_NS;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_IPC_NS;
break;
case LTTNG_EVENT_CONTEXT_MNT_NS:
break;
case LTTNG_EVENT_CONTEXT_MNT_NS:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_MNT_NS;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_MNT_NS;
break;
case LTTNG_EVENT_CONTEXT_NET_NS:
break;
case LTTNG_EVENT_CONTEXT_NET_NS:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_NET_NS;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_NET_NS;
break;
case LTTNG_EVENT_CONTEXT_PID_NS:
break;
case LTTNG_EVENT_CONTEXT_PID_NS:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PID_NS;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_PID_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_TIME_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_TIME_NS;
break;
case LTTNG_EVENT_CONTEXT_USER_NS:
break;
case LTTNG_EVENT_CONTEXT_USER_NS:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_USER_NS;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_USER_NS;
break;
case LTTNG_EVENT_CONTEXT_UTS_NS:
break;
case LTTNG_EVENT_CONTEXT_UTS_NS:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_UTS_NS;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_UTS_NS;
break;
case LTTNG_EVENT_CONTEXT_UID:
break;
case LTTNG_EVENT_CONTEXT_UID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_UID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_UID;
break;
case LTTNG_EVENT_CONTEXT_EUID:
break;
case LTTNG_EVENT_CONTEXT_EUID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_EUID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_EUID;
break;
case LTTNG_EVENT_CONTEXT_SUID:
break;
case LTTNG_EVENT_CONTEXT_SUID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_SUID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_SUID;
break;
case LTTNG_EVENT_CONTEXT_GID:
break;
case LTTNG_EVENT_CONTEXT_GID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_GID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_GID;
break;
case LTTNG_EVENT_CONTEXT_EGID:
break;
case LTTNG_EVENT_CONTEXT_EGID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_EGID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_EGID;
break;
case LTTNG_EVENT_CONTEXT_SGID:
break;
case LTTNG_EVENT_CONTEXT_SGID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_SGID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_SGID;
break;
case LTTNG_EVENT_CONTEXT_VUID:
break;
case LTTNG_EVENT_CONTEXT_VUID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VUID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VUID;
break;
case LTTNG_EVENT_CONTEXT_VEUID:
break;
case LTTNG_EVENT_CONTEXT_VEUID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VEUID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VEUID;
break;
case LTTNG_EVENT_CONTEXT_VSUID:
break;
case LTTNG_EVENT_CONTEXT_VSUID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VSUID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VSUID;
break;
case LTTNG_EVENT_CONTEXT_VGID:
break;
case LTTNG_EVENT_CONTEXT_VGID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VGID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VGID;
break;
case LTTNG_EVENT_CONTEXT_VEGID:
break;
case LTTNG_EVENT_CONTEXT_VEGID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VEGID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VEGID;
break;
case LTTNG_EVENT_CONTEXT_VSGID:
break;
case LTTNG_EVENT_CONTEXT_VSGID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VSGID;
+ kctx->ctx.ctx = LTTNG_KERNEL_
ABI_
CONTEXT_VSGID;
break;
default:
ret = LTTNG_ERR_KERN_CONTEXT_FAIL;
break;
default:
ret = LTTNG_ERR_KERN_CONTEXT_FAIL;
@@
-370,9
+373,9
@@
int context_ust_add(struct ltt_ust_session *usess,
struct lttng_ht *chan_ht;
struct ltt_ust_channel *uchan = NULL;
struct lttng_ht *chan_ht;
struct ltt_ust_channel *uchan = NULL;
-
assert
(usess);
-
assert
(ctx);
-
assert
(channel_name);
+
LTTNG_ASSERT
(usess);
+
LTTNG_ASSERT
(ctx);
+
LTTNG_ASSERT
(channel_name);
rcu_read_lock();
rcu_read_lock();
This page took
0.031889 seconds
and
4
git commands to generate.