X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=2536dc72da28051f9edb6204c834a3b179a5c8fd;hb=33fbd46910b681a74b2493cff8c86979ec35ccc9;hp=8dd3fcc60c914c9df4979ac46150aea1c518c147;hpb=3c6a091f88fa6b237729cab17d6f6d227da82f59;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 8dd3fcc60..2536dc72d 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -166,6 +166,8 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
 			channels[i].attr.read_timer_interval =
 				uchan->attr.read_timer_interval;
 			channels[i].enabled = uchan->enabled;
+			channels[i].attr.tracefile_size = uchan->tracefile_size;
+			channels[i].attr.tracefile_count = uchan->tracefile_count;
 			switch (uchan->attr.output) {
 			case LTTNG_UST_MMAP:
 			default:
@@ -305,6 +307,9 @@ static int list_lttng_ust_global_events(char *channel_name,
 		if (uevent->filter) {
 			tmp[i].filter = 1;
 		}
+		if (uevent->exclusion) {
+			tmp[i].exclusion = 1;
+		}
 		i++;
 	}
 
@@ -455,6 +460,7 @@ static int add_uri_to_consumer(struct consumer_output *consumer,
 			 * URI was the same in the consumer so we do not append the subdir
 			 * again so to not duplicate output dir.
 			 */
+			ret = LTTNG_OK;
 			goto error;
 		}
 
@@ -819,7 +825,7 @@ static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
 	/* Quiescent wait after starting trace */
 	kernel_wait_quiescent(kernel_tracer_fd);
 
-	ksess->started = 1;
+	ksess->active = 1;
 
 	ret = LTTNG_OK;
 
@@ -912,7 +918,7 @@ int cmd_enable_channel(struct ltt_session *session,
 	 * Don't try to enable a channel if the session has been started at
 	 * some point in time before. The tracer does not allow it.
 	 */
-	if (session->started) {
+	if (session->has_been_started) {
 		ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
 		goto error;
 	}
@@ -927,6 +933,16 @@ int cmd_enable_channel(struct ltt_session *session,
 		attr->attr.switch_timer_interval = 0;
 	}
 
+	/*
+	 * The ringbuffer (both in user space and kernel) behave badly in overwrite
+	 * mode and with less than 2 subbuf so block it right away and send back an
+	 * invalid attribute error.
+	 */
+	if (attr->attr.overwrite && attr->attr.num_subbuf < 2) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
 	switch (domain->type) {
 	case LTTNG_DOMAIN_KERNEL:
 	{
@@ -935,15 +951,6 @@ int cmd_enable_channel(struct ltt_session *session,
 		kchan = trace_kernel_get_channel_by_name(attr->name,
 				session->kernel_session);
 		if (kchan == NULL) {
-			/*
-			 * Don't try to create a channel if the session
-			 * has been started at some point in time
-			 * before. The tracer does not allow it.
-			 */
-			if (session->started) {
-				ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
-				goto error;
-			}
 			ret = channel_kernel_create(session->kernel_session, attr, wpipe);
 			if (attr->name[0] != '\0') {
 				session->kernel_session->has_non_default_channel = 1;
@@ -967,15 +974,6 @@ int cmd_enable_channel(struct ltt_session *session,
 
 		uchan = trace_ust_find_channel_by_name(chan_ht, attr->name);
 		if (uchan == NULL) {
-			/*
-			 * Don't try to create a channel if the session
-			 * has been started at some point in time
-			 * before. The tracer does not allow it.
-			 */
-			if (session->started) {
-				ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
-				goto error;
-			}
 			ret = channel_ust_create(usess, attr, domain->buf_type);
 			if (attr->name[0] != '\0') {
 				usess->has_non_default_channel = 1;
@@ -1306,7 +1304,10 @@ error:
  */
 int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
-		struct lttng_filter_bytecode *filter, int wpipe)
+		char *filter_expression,
+		struct lttng_filter_bytecode *filter,
+		struct lttng_event_exclusion *exclusion,
+		int wpipe)
 {
 	int ret, channel_created = 0;
 	struct lttng_channel *attr;
@@ -1419,7 +1420,8 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		}
 
 		/* At this point, the session and channel exist on the tracer */
-		ret = event_ust_enable_tracepoint(usess, uchan, event, filter);
+		ret = event_ust_enable_tracepoint(usess, uchan, event,
+				filter_expression, filter, exclusion);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1434,9 +1436,16 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		assert(usess);
 
 		/* Create the default JUL tracepoint. */
+		memset(&uevent, 0, sizeof(uevent));
 		uevent.type = LTTNG_EVENT_TRACEPOINT;
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-		strncpy(uevent.name, DEFAULT_JUL_EVENT_NAME, sizeof(uevent.name));
+		if (is_root) {
+			strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		} else {
+			strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		}
 		uevent.name[sizeof(uevent.name) - 1] = '\0';
 
 		/*
@@ -1448,14 +1457,14 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		tmp_dom.type = LTTNG_DOMAIN_UST;
 
 		ret = cmd_enable_event(session, &tmp_dom, DEFAULT_JUL_CHANNEL_NAME,
-				&uevent, NULL, wpipe);
+			&uevent, filter_expression, filter, NULL, wpipe);
 		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
 			goto error;
 		}
 
 		/* The wild card * means that everything should be enabled. */
 		if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
-			ret = event_jul_enable_all(usess);
+			ret = event_jul_enable_all(usess, event);
 		} else {
 			ret = event_jul_enable(usess, event);
 		}
@@ -1487,6 +1496,7 @@ error:
  */
 int cmd_enable_event_all(struct ltt_session *session,
 		struct lttng_domain *domain, char *channel_name, int event_type,
+		char *filter_expression,
 		struct lttng_filter_bytecode *filter, int wpipe)
 {
 	int ret;
@@ -1620,7 +1630,8 @@ int cmd_enable_event_all(struct ltt_session *session,
 		switch (event_type) {
 		case LTTNG_EVENT_ALL:
 		case LTTNG_EVENT_TRACEPOINT:
-			ret = event_ust_enable_all_tracepoints(usess, uchan, filter);
+			ret = event_ust_enable_all_tracepoints(usess, uchan,
+				filter_expression, filter);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
@@ -1639,7 +1650,7 @@ int cmd_enable_event_all(struct ltt_session *session,
 	}
 	case LTTNG_DOMAIN_JUL:
 	{
-		struct lttng_event uevent;
+		struct lttng_event uevent, event;
 		struct lttng_domain tmp_dom;
 		struct ltt_ust_session *usess = session->ust_session;
 
@@ -1648,7 +1659,13 @@ int cmd_enable_event_all(struct ltt_session *session,
 		/* Create the default JUL tracepoint. */
 		uevent.type = LTTNG_EVENT_TRACEPOINT;
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-		strncpy(uevent.name, DEFAULT_JUL_EVENT_NAME, sizeof(uevent.name));
+		if (is_root) {
+			strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		} else {
+			strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		}
 		uevent.name[sizeof(uevent.name) - 1] = '\0';
 
 		/*
@@ -1660,12 +1677,17 @@ int cmd_enable_event_all(struct ltt_session *session,
 		tmp_dom.type = LTTNG_DOMAIN_UST;
 
 		ret = cmd_enable_event(session, &tmp_dom, DEFAULT_JUL_CHANNEL_NAME,
-				&uevent, NULL, wpipe);
+			&uevent, NULL, NULL, NULL, wpipe);
 		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
 			goto error;
 		}
 
-		ret = event_jul_enable_all(usess);
+		event.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+		event.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+		strncpy(event.name, "*", sizeof(event.name));
+		event.name[sizeof(event.name) - 1] = '\0';
+
+		ret = event_jul_enable_all(usess, &event);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1768,6 +1790,7 @@ error:
 int cmd_start_trace(struct ltt_session *session)
 {
 	int ret;
+	unsigned long nb_chan = 0;
 	struct ltt_kernel_session *ksession;
 	struct ltt_ust_session *usess;
 
@@ -1777,13 +1800,26 @@ int cmd_start_trace(struct ltt_session *session)
 	ksession = session->kernel_session;
 	usess = session->ust_session;
 
-	if (session->enabled) {
-		/* Already started. */
+	/* Is the session already started? */
+	if (session->active) {
 		ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
 		goto error;
 	}
 
-	session->enabled = 1;
+	/*
+	 * Starting a session without channel is useless since after that it's not
+	 * possible to enable channel thus inform the client.
+	 */
+	if (usess && usess->domain_global.channels) {
+		nb_chan += lttng_ht_get_count(usess->domain_global.channels);
+	}
+	if (ksession) {
+		nb_chan += ksession->channel_count;
+	}
+	if (!nb_chan) {
+		ret = LTTNG_ERR_NO_CHANNEL;
+		goto error;
+	}
 
 	/* Kernel tracing */
 	if (ksession != NULL) {
@@ -1795,7 +1831,11 @@ int cmd_start_trace(struct ltt_session *session)
 
 	/* Flag session that trace should start automatically */
 	if (usess) {
-		usess->start_trace = 1;
+		/*
+		 * Even though the start trace might fail, flag this session active so
+		 * other application coming in are started by default.
+		 */
+		usess->active = 1;
 
 		ret = ust_app_start_trace_all(usess);
 		if (ret < 0) {
@@ -1804,7 +1844,9 @@ int cmd_start_trace(struct ltt_session *session)
 		}
 	}
 
-	session->started = 1;
+	/* Flag this after a successful start. */
+	session->has_been_started = 1;
+	session->active = 1;
 
 	ret = LTTNG_OK;
 
@@ -1828,15 +1870,14 @@ int cmd_stop_trace(struct ltt_session *session)
 	ksession = session->kernel_session;
 	usess = session->ust_session;
 
-	if (!session->enabled) {
+	/* Session is not active. Skip everythong and inform the client. */
+	if (!session->active) {
 		ret = LTTNG_ERR_TRACE_ALREADY_STOPPED;
 		goto error;
 	}
 
-	session->enabled = 0;
-
 	/* Kernel tracer */
-	if (ksession && ksession->started) {
+	if (ksession && ksession->active) {
 		DBG("Stop kernel tracing");
 
 		/* Flush metadata if exist */
@@ -1863,11 +1904,15 @@ int cmd_stop_trace(struct ltt_session *session)
 
 		kernel_wait_quiescent(kernel_tracer_fd);
 
-		ksession->started = 0;
+		ksession->active = 0;
 	}
 
-	if (usess && usess->start_trace) {
-		usess->start_trace = 0;
+	if (usess && usess->active) {
+		/*
+		 * Even though the stop trace might fail, flag this session inactive so
+		 * other application coming in are not started by default.
+		 */
+		usess->active = 0;
 
 		ret = ust_app_stop_trace_all(usess);
 		if (ret < 0) {
@@ -1876,6 +1921,8 @@ int cmd_stop_trace(struct ltt_session *session)
 		}
 	}
 
+	/* Flag inactive after a successful stop. */
+	session->active = 0;
 	ret = LTTNG_OK;
 
 error:
@@ -1897,8 +1944,8 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 	assert(uris);
 	assert(nb_uri > 0);
 
-	/* Can't enable consumer after session started. */
-	if (session->enabled) {
+	/* Can't set consumer URI if the session is active. */
+	if (session->active) {
 		ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
 		goto error;
 	}
@@ -2142,7 +2189,14 @@ int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
 	{
 		struct lttng_kernel_calibrate kcalibrate;
 
-		kcalibrate.type = calibrate->type;
+		switch (calibrate->type) {
+		case LTTNG_CALIBRATE_FUNCTION:
+		default:
+			/* Default and only possible calibrate option. */
+			kcalibrate.type = LTTNG_KERNEL_CALIBRATE_KRETPROBE;
+			break;
+		}
+
 		ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate);
 		if (ret < 0) {
 			ret = LTTNG_ERR_KERN_ENABLE_FAIL;
@@ -2154,7 +2208,14 @@ int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
 	{
 		struct lttng_ust_calibrate ucalibrate;
 
-		ucalibrate.type = calibrate->type;
+		switch (calibrate->type) {
+		case LTTNG_CALIBRATE_FUNCTION:
+		default:
+			/* Default and only possible calibrate option. */
+			ucalibrate.type = LTTNG_UST_CALIBRATE_TRACEPOINT;
+			break;
+		}
+
 		ret = ust_app_calibrate_glb(&ucalibrate);
 		if (ret < 0) {
 			ret = LTTNG_ERR_UST_CALIBRATE_FAIL;
@@ -2451,8 +2512,9 @@ void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
 
 		strncpy(sessions[i].name, session->name, NAME_MAX);
 		sessions[i].name[NAME_MAX - 1] = '\0';
-		sessions[i].enabled = session->enabled;
+		sessions[i].enabled = session->active;
 		sessions[i].snapshot_mode = session->snapshot_mode;
+		sessions[i].live_timer_interval = session->live_timer;
 		i++;
 	}
 }
@@ -2470,9 +2532,24 @@ int cmd_data_pending(struct ltt_session *session)
 	assert(session);
 
 	/* Session MUST be stopped to ask for data availability. */
-	if (session->enabled) {
+	if (session->active) {
 		ret = LTTNG_ERR_SESSION_STARTED;
 		goto error;
+	} else {
+		/*
+		 * If stopped, just make sure we've started before else the above call
+		 * will always send that there is data pending.
+		 *
+		 * The consumer assumes that when the data pending command is received,
+		 * the trace has been started before or else no output data is written
+		 * by the streams which is a condition for data pending. So, this is
+		 * *VERY* important that we don't ask the consumer before a start
+		 * trace.
+		 */
+		if (!session->has_been_started) {
+			ret = 0;
+			goto error;
+		}
 	}
 
 	if (ksess && ksess->consumer) {
@@ -2738,7 +2815,7 @@ error:
 /*
  * Record a kernel snapshot.
  *
- * Return 0 on success or a LTTNG_ERR code.
+ * Return LTTNG_OK on success or a LTTNG_ERR code.
  */
 static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
 		struct snapshot_output *output, struct ltt_session *session,
@@ -2827,12 +2904,17 @@ static int record_ust_snapshot(struct ltt_ust_session *usess,
 
 	ret = ust_app_snapshot_record(usess, output, wait, nb_streams);
 	if (ret < 0) {
-		if (ret == -EINVAL) {
+		switch (-ret) {
+		case EINVAL:
 			ret = LTTNG_ERR_INVALID;
-			goto error_snapshot;
+			break;
+		case ENODATA:
+			ret = LTTNG_ERR_SNAPSHOT_NODATA;
+			break;
+		default:
+			ret = LTTNG_ERR_SNAPSHOT_FAIL;
+			break;
 		}
-
-		ret = LTTNG_ERR_SNAPSHOT_FAIL;
 		goto error_snapshot;
 	}
 
@@ -2898,7 +2980,7 @@ int cmd_snapshot_record(struct ltt_session *session,
 	}
 
 	/* The session needs to be started at least once. */
-	if (!session->started) {
+	if (!session->has_been_started) {
 		ret = LTTNG_ERR_START_SESSION_ONCE;
 		goto error;
 	}