X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=4ce2d43fab11159d5ebb64ae4b9147769558ecc7;hb=4e6581a7740c292be662d108a21a80e478b42a71;hp=6f824bf316811c2fa486cb4a661abcca5c5b4c3f;hpb=b02f5986773579a5a331d3e108ba52ec9acde2e1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 6f824bf31..4ce2d43fa 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1442,12 +1442,14 @@ error:
 }
 
 /*
- * Command LTTNG_TRACK_PID processed by the client thread.
+ * Command LTTNG_TRACK_ID processed by the client thread.
  *
  * Called with session lock held.
  */
-int cmd_track_pid(struct ltt_session *session, enum lttng_domain_type domain,
-		int pid)
+int cmd_track_id(struct ltt_session *session,
+		enum lttng_tracker_type tracker_type,
+		enum lttng_domain_type domain,
+		const struct lttng_tracker_id *id)
 {
 	int ret;
 
@@ -1460,7 +1462,7 @@ int cmd_track_pid(struct ltt_session *session, enum lttng_domain_type domain,
 
 		ksess = session->kernel_session;
 
-		ret = kernel_track_pid(ksess, pid);
+		ret = kernel_track_id(tracker_type, ksess, id);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1474,7 +1476,7 @@ int cmd_track_pid(struct ltt_session *session, enum lttng_domain_type domain,
 
 		usess = session->ust_session;
 
-		ret = trace_ust_track_pid(usess, pid);
+		ret = trace_ust_track_id(tracker_type, usess, id);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1493,12 +1495,14 @@ error:
 }
 
 /*
- * Command LTTNG_UNTRACK_PID processed by the client thread.
+ * Command LTTNG_UNTRACK_ID processed by the client thread.
  *
  * Called with session lock held.
  */
-int cmd_untrack_pid(struct ltt_session *session, enum lttng_domain_type domain,
-		int pid)
+int cmd_untrack_id(struct ltt_session *session,
+		enum lttng_tracker_type tracker_type,
+		enum lttng_domain_type domain,
+		const struct lttng_tracker_id *id)
 {
 	int ret;
 
@@ -1511,7 +1515,7 @@ int cmd_untrack_pid(struct ltt_session *session, enum lttng_domain_type domain,
 
 		ksess = session->kernel_session;
 
-		ret = kernel_untrack_pid(ksess, pid);
+		ret = kernel_untrack_id(tracker_type, ksess, id);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1525,7 +1529,7 @@ int cmd_untrack_pid(struct ltt_session *session, enum lttng_domain_type domain,
 
 		usess = session->ust_session;
 
-		ret = trace_ust_untrack_pid(usess, pid);
+		ret = trace_ust_untrack_id(tracker_type, usess, id);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -2573,15 +2577,16 @@ ssize_t cmd_list_syscalls(struct lttng_event **events)
 }
 
 /*
- * Command LTTNG_LIST_TRACKER_PIDS processed by the client thread.
+ * Command LTTNG_LIST_TRACKER_IDS processed by the client thread.
  *
  * Called with session lock held.
  */
-ssize_t cmd_list_tracker_pids(struct ltt_session *session,
-		enum lttng_domain_type domain, int32_t **pids)
+int cmd_list_tracker_ids(enum lttng_tracker_type tracker_type,
+		struct ltt_session *session,
+		enum lttng_domain_type domain,
+		struct lttng_tracker_ids **ids)
 {
-	int ret;
-	ssize_t nr_pids = 0;
+	int ret = LTTNG_OK;
 
 	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
@@ -2589,9 +2594,9 @@ ssize_t cmd_list_tracker_pids(struct ltt_session *session,
 		struct ltt_kernel_session *ksess;
 
 		ksess = session->kernel_session;
-		nr_pids = kernel_list_tracker_pids(ksess, pids);
-		if (nr_pids < 0) {
-			ret = LTTNG_ERR_KERN_LIST_FAIL;
+		ret = kernel_list_tracker_ids(tracker_type, ksess, ids);
+		if (ret != LTTNG_OK) {
+			ret = -LTTNG_ERR_KERN_LIST_FAIL;
 			goto error;
 		}
 		break;
@@ -2601,9 +2606,9 @@ ssize_t cmd_list_tracker_pids(struct ltt_session *session,
 		struct ltt_ust_session *usess;
 
 		usess = session->ust_session;
-		nr_pids = trace_ust_list_tracker_pids(usess, pids);
-		if (nr_pids < 0) {
-			ret = LTTNG_ERR_UST_LIST_FAIL;
+		ret = trace_ust_list_tracker_ids(tracker_type, usess, ids);
+		if (ret != LTTNG_OK) {
+			ret = -LTTNG_ERR_UST_LIST_FAIL;
 			goto error;
 		}
 		break;
@@ -2612,15 +2617,13 @@ ssize_t cmd_list_tracker_pids(struct ltt_session *session,
 	case LTTNG_DOMAIN_JUL:
 	case LTTNG_DOMAIN_PYTHON:
 	default:
-		ret = LTTNG_ERR_UND;
+		ret = -LTTNG_ERR_UND;
 		goto error;
 	}
 
-	return nr_pids;
-
 error:
 	/* Return negative value to differentiate return code */
-	return -ret;
+	return ret;
 }
 
 /*
@@ -3328,9 +3331,7 @@ int cmd_destroy_session(struct ltt_session *session,
 		session->rotate_size = 0;
 	}
 
-	if (session->most_recent_chunk_id.is_set &&
-			session->most_recent_chunk_id.value != 0 &&
-			session->current_trace_chunk && session->output_traces) {
+	if (session->rotated && session->current_trace_chunk && session->output_traces) {
 		/*
 		 * Perform a last rotation on destruction if rotations have
 		 * occurred during the session's lifetime.
@@ -4715,7 +4716,13 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 		}
 	}
 
-	if (session_close_trace_chunk(session, session->current_trace_chunk,
+	if (session_set_trace_chunk(session, NULL, &snapshot_trace_chunk)) {
+		ERR("Failed to release the current trace chunk of session \"%s\"",
+				session->name);
+		ret_code = LTTNG_ERR_UNK;
+	}
+
+	if (session_close_trace_chunk(session, snapshot_trace_chunk,
 			LTTNG_TRACE_CHUNK_COMMAND_TYPE_NO_OPERATION, NULL)) {
 		/*
 		 * Don't goto end; make sure the chunk is closed for the session
@@ -4725,11 +4732,6 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 				session->name);
 		ret_code = LTTNG_ERR_CLOSE_TRACE_CHUNK_FAIL_CONSUMER;
 	}
-	if (session_set_trace_chunk(session, NULL, NULL)) {
-		ERR("Failed to release the current trace chunk of session \"%s\"",
-				session->name);
-		ret_code = LTTNG_ERR_UNK;
-	}
 error:
 	if (original_ust_consumer_output) {
 		session->ust_session->consumer = original_ust_consumer_output;