X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_context.c;h=90a54f7eef87eae4a884737a9d8a8bba67d3d98f;hb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5;hp=994cd49eb32037b898dc3fcac9853c3681ebd9a9;hpb=b53d4e59bf0a980aa774dcccc27123986e77b8ff;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index 994cd49eb..90a54f7ee 100644
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -15,10 +15,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include <urcu/list.h>
 
+#include <lttng/domain-internal.h>
 #include <common/mi-lttng.h>
 
 #include "../command.h"
@@ -95,6 +95,7 @@ enum context_type {
 	CONTEXT_VGID         = 38,
 	CONTEXT_VEGID        = 39,
 	CONTEXT_VSGID        = 40,
+	CONTEXT_TIME_NS      = 41,
 };
 
 /*
@@ -264,6 +265,7 @@ const struct ctx_opts {
 	{ (char *) "mnt_ns", CONTEXT_MNT_NS },
 	{ (char *) "net_ns", CONTEXT_NET_NS },
 	{ (char *) "pid_ns", CONTEXT_PID_NS },
+	{ (char *) "time_ns", CONTEXT_TIME_NS },
 	{ (char *) "user_ns", CONTEXT_USER_NS },
 	{ (char *) "uts_ns", CONTEXT_UTS_NS },
 	{ (char *) "uid", CONTEXT_UID },
@@ -556,7 +558,7 @@ enum lttng_domain_type get_domain(void)
 	} else if (opt_log4j) {
 		return LTTNG_DOMAIN_LOG4J;
 	} else {
-		assert(0);
+		abort();
 	}
 }
 
@@ -808,11 +810,13 @@ static int add_context(char *session_name)
 		} else {
 			if (opt_channel_name) {
 				MSG("%s context %s added to channel %s",
-						get_domain_str(dom.type), type->opt->symbol,
+						lttng_domain_type_str(dom.type),
+						type->opt->symbol,
 						opt_channel_name);
 			} else {
 				MSG("%s context %s added to all channels",
-						get_domain_str(dom.type), type->opt->symbol);
+						lttng_domain_type_str(dom.type),
+						type->opt->symbol);
 			}
 			success = 1;
 		}
@@ -1147,8 +1151,8 @@ int cmd_add_context(int argc, const char **argv)
 		goto end;
 	}
 
-	ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace +
-			opt_jul + opt_log4j);
+	ret = print_missing_or_multiple_domains(
+			opt_kernel + opt_userspace + opt_jul + opt_log4j, true);
 	if (ret) {
 		ret = CMD_ERROR;
 		goto end;