X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=a6c0c04ad864075d64cbf0c8dba6b66e96ce21cc;hp=569599af28c5e7fb6658855f99276d9ef92ea736;hb=a5a309207b81778262744a9de568f6d7c54996e2;hpb=d070c424703336e9cca9d1603e1a81bee5b59560

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 569599af2..a6c0c04ad 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -171,7 +171,7 @@ no_match:
  * lock MUST be acquired before calling this.
  */
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
-		char *name)
+		const char *name)
 {
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
@@ -564,6 +564,45 @@ int trace_ust_context_type_event_to_ust(
 	case LTTNG_EVENT_CONTEXT_APP_CONTEXT:
 		utype = LTTNG_UST_CONTEXT_APP_CONTEXT;
 		break;
+	case LTTNG_EVENT_CONTEXT_CGROUP_NS:
+		utype = LTTNG_UST_CONTEXT_CGROUP_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_IPC_NS:
+		utype = LTTNG_UST_CONTEXT_IPC_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_MNT_NS:
+		utype = LTTNG_UST_CONTEXT_MNT_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_NET_NS:
+		utype = LTTNG_UST_CONTEXT_NET_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_PID_NS:
+		utype = LTTNG_UST_CONTEXT_PID_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_USER_NS:
+		utype = LTTNG_UST_CONTEXT_USER_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_UTS_NS:
+		utype = LTTNG_UST_CONTEXT_UTS_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_VUID:
+		utype = LTTNG_UST_CONTEXT_VUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VEUID:
+		utype = LTTNG_UST_CONTEXT_VEUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VSUID:
+		utype = LTTNG_UST_CONTEXT_VSUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VGID:
+		utype = LTTNG_UST_CONTEXT_VGID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VEGID:
+		utype = LTTNG_UST_CONTEXT_VEGID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VSGID:
+		utype = LTTNG_UST_CONTEXT_VSGID;
+		break;
 	default:
 		utype = -1;
 		break;
@@ -574,8 +613,8 @@ int trace_ust_context_type_event_to_ust(
 /*
  * Return 1 if contexts match, 0 otherwise.
  */
-int trace_ust_match_context(struct ltt_ust_context *uctx,
-		struct lttng_event_context *ctx)
+int trace_ust_match_context(const struct ltt_ust_context *uctx,
+		const struct lttng_event_context *ctx)
 {
 	int utype;
 
@@ -624,7 +663,7 @@ int trace_ust_match_context(struct ltt_ust_context *uctx,
  * Return pointer to structure or NULL.
  */
 struct ltt_ust_context *trace_ust_create_context(
-		struct lttng_event_context *ctx)
+		const struct lttng_event_context *ctx)
 {
 	struct ltt_ust_context *uctx = NULL;
 	int utype;
@@ -883,6 +922,7 @@ end:
 int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
 {
 	int retval = LTTNG_OK;
+	bool should_update_apps = false;
 
 	if (pid == -1) {
 		/* Create empty tracker, replace old tracker. */
@@ -899,7 +939,7 @@ int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
 		fini_pid_tracker(&tmp_tracker);
 
 		/* Remove session from all applications */
-		ust_app_global_update_all(session);
+		should_update_apps = true;
 	} else {
 		int ret;
 		struct ust_app *app;
@@ -918,9 +958,12 @@ int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
 		/* Remove session from application. */
 		app = ust_app_find_by_pid(pid);
 		if (app) {
-			ust_app_global_update(session, app);
+			should_update_apps = true;
 		}
 	}
+	if (should_update_apps && session->active) {
+		ust_app_global_update_all(session);
+	}
 end:
 	return retval;
 }