X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=b7fc781610f9b214422d84bc5a9a34f97bb2b059;hp=2125c600ac3ba0244e949e6251f2a9c0a48899f8;hb=852fdd0c1f836d379f8985b8df3186dc6b7daa44;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 2125c600a..b7fc78161 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -28,9 +28,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <common/common.h>
+#include <common/defaults.h>
 #include <common/sessiond-comm/sessiond-comm.h>
-#include <common/lttng-share.h>
-#include <common/lttngerr.h>
 #include <lttng/lttng.h>
 
 /* Socket to session daemon for communication */
@@ -66,9 +66,11 @@ static void copy_lttng_domain(struct lttng_domain *dst, struct lttng_domain *src
 		switch (src->type) {
 			case LTTNG_DOMAIN_KERNEL:
 			case LTTNG_DOMAIN_UST:
+			/*
 			case LTTNG_DOMAIN_UST_EXEC_NAME:
 			case LTTNG_DOMAIN_UST_PID:
 			case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+			*/
 				memcpy(dst, src, sizeof(struct lttng_domain));
 				break;
 			default:
@@ -847,9 +849,11 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
 		attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
 		break;
 	case LTTNG_DOMAIN_UST:
+#if 0
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
 		attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
 		attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
 		attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
@@ -902,5 +906,5 @@ int lttng_session_daemon_alive(void)
 static void __attribute__((constructor)) init()
 {
 	/* Set default session group */
-	lttng_set_tracing_group(LTTNG_DEFAULT_TRACING_GROUP);
+	lttng_set_tracing_group(DEFAULT_TRACING_GROUP);
 }