X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=6cc04efc939359a139c900867a71778db776bd77;hp=838afedba2a712297f73687b44e446a17fec4537;hb=99bab54fa13c66d7237f03d899650ad73e49c230;hpb=990570edd474b304d4c935d82be6201d872025e4

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 838afedba..6cc04efc9 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -28,10 +28,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/lttngerr.h>
 #include <common/common.h>
 #include <common/defaults.h>
+#include <common/sessiond-comm/sessiond-comm.h>
 #include <lttng/lttng.h>
 
 /* Socket to session daemon for communication */
@@ -67,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:
@@ -301,7 +302,7 @@ static int disconnect_sessiond(void)
 /*
  * Ask the session daemon a specific command and put the data into buf.
  *
- * Return size of data (only payload, not header).
+ * Return size of data (only payload, not header) or a negative error code.
  */
 static int ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 {
@@ -461,6 +462,8 @@ int lttng_stop_tracing(const char *session_name)
 
 /*
  * Add context to event or/and channel.
+ *
+ * Returns the size of the returned payload data or a negative error code.
  */
 int lttng_add_context(struct lttng_handle *handle,
 		struct lttng_event_context *ctx, const char *event_name,
@@ -806,7 +809,7 @@ int lttng_set_tracing_group(const char *name)
 }
 
 /*
- *  lttng_calibrate
+ * Returns size of returned session payload data or a negative error code.
  */
 int lttng_calibrate(struct lttng_handle *handle,
 		struct lttng_calibrate *calibrate)
@@ -848,9 +851,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;
@@ -903,5 +908,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);
 }