- kctxpid.ctx = LTTNG_EVENT_CONTEXT_VPID;
- lttng_add_context(handle, &kctxpid, NULL, NULL);
- kctxtid.ctx = LTTNG_EVENT_CONTEXT_VTID;
- lttng_add_context(handle, &kctxtid, NULL, NULL);
+ if (!opt_pid) {
+ kctxppid.ctx = LTTNG_EVENT_CONTEXT_PPID;
+ lttng_add_context(handle, &kctxppid, NULL, NULL);
+ kctxcomm.ctx = LTTNG_EVENT_CONTEXT_PROCNAME;
+ lttng_add_context(handle, &kctxcomm, NULL, NULL);
+ kctxpid.ctx = LTTNG_EVENT_CONTEXT_VPID;
+ lttng_add_context(handle, &kctxpid, NULL, NULL);
+ kctxtid.ctx = LTTNG_EVENT_CONTEXT_VTID;
+ lttng_add_context(handle, &kctxtid, NULL, NULL);
+ }