X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.c;h=f2d223f86d95878693996e8fadc48a2b2b320515;hp=44ff56f1e4ccf16aee5d097b39faa4d233d0f04c;hb=ebbf5ab7ebfa3774d5ca1a26d63013384f7e1407;hpb=8de4f9412d9681725c48f984c9e160773fdcf8c9

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index 44ff56f1e..f2d223f86 100644
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -78,8 +78,8 @@ const char * const mi_lttng_context_type_perf_thread_counter = "PERF_THREAD_COUN
 const char * const mi_lttng_element_perf_counter_context = "perf_counter_context";
 
 /* Strings related to pid */
-const char * const mi_lttng_element_pids = "pids";
-const char * const mi_lttng_element_pid = "pid";
+const char * const mi_lttng_element_processes = "processes";
+const char * const mi_lttng_element_process = "process";
 const char * const mi_lttng_element_pid_id = "id";
 
 /* Strings related to save command */
@@ -164,6 +164,12 @@ const char * const mi_lttng_element_snapshot_n_ptr = "n_ptr";
 const char * const mi_lttng_element_snapshot_session_name = "session_name";
 const char * const mi_lttng_element_snapshots = "snapshots";
 
+/* String related to track/untrack command */
+const char * const mi_lttng_element_track_untrack_targets = "targets";
+const char * const mi_lttng_element_track_untrack_pid_target = "pid_target";
+const char * const mi_lttng_element_track_untrack_all_wildcard = "*";
+
+
 /* This is a merge of jul loglevel and regular loglevel
  * Those should never overlap by definition
  * (see struct lttng_event loglevel)
@@ -1119,41 +1125,117 @@ end:
 	return ret;
 }
 
+LTTNG_HIDDEN
+int mi_lttng_trackers_open(struct mi_writer *writer)
+{
+	return mi_lttng_writer_open_element(writer, config_element_trackers);
+}
+
+LTTNG_HIDDEN
+int mi_lttng_pid_tracker_open(struct mi_writer *writer)
+{
+	int ret;
+
+	/* Open element pid_tracker */
+	ret = mi_lttng_writer_open_element(writer, config_element_pid_tracker);
+	if (ret) {
+		goto end;
+	}
+
+	/* Open targets element */
+	ret = mi_lttng_targets_open(writer);
+end:
+	return ret;
+}
+
 LTTNG_HIDDEN
 int mi_lttng_pids_open(struct mi_writer *writer)
 {
-	return mi_lttng_writer_open_element(writer, mi_lttng_element_pids);
+	return mi_lttng_writer_open_element(writer, config_element_pids);
+}
+
+LTTNG_HIDDEN
+int mi_lttng_processes_open(struct mi_writer *writer)
+{
+	return mi_lttng_writer_open_element(writer, mi_lttng_element_processes);
 }
 
 LTTNG_HIDDEN
-int mi_lttng_pid(struct mi_writer *writer, pid_t pid , const char *cmdline,
+int mi_lttng_process(struct mi_writer *writer, pid_t pid , const char *name,
 		int is_open)
 {
 	int ret;
 
-	/* Open element pid */
-	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_pid);
+	/* Open element process */
+	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_process);
 	if (ret) {
 		goto end;
 	}
 
 	/* Writing pid number */
 	ret = mi_lttng_writer_write_element_signed_int(writer,
-			mi_lttng_element_pid_id, (int)pid);
+			config_element_pid, (int)pid);
 	if (ret) {
 		goto end;
 	}
 
 	/* Writing name of the process */
-	ret = mi_lttng_writer_write_element_string(writer, config_element_name,
-			cmdline);
+	if (name) {
+		ret = mi_lttng_writer_write_element_string(writer, config_element_name,
+				name);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	if (!is_open) {
+		/* Closing Pid */
+		ret = mi_lttng_writer_close_element(writer);
+	}
+
+end:
+	return ret;
+}
+
+LTTNG_HIDDEN
+int mi_lttng_targets_open(struct mi_writer *writer)
+{
+	return mi_lttng_writer_open_element(writer,
+			mi_lttng_element_track_untrack_targets);
+}
+
+LTTNG_HIDDEN
+int mi_lttng_pid_target(struct mi_writer *writer, pid_t pid, int is_open)
+{
+	int ret;
+
+	ret = mi_lttng_writer_open_element(writer,
+			mi_lttng_element_track_untrack_pid_target);
+	if (ret) {
+		goto end;
+	}
+
+	/* Writing pid number
+	 * Special case for element all on track untrack command
+	 * All pid is represented as wildcard *
+	 */
+	if ((int) pid == -1) {
+		ret = mi_lttng_writer_write_element_string(writer,
+				config_element_pid,
+				mi_lttng_element_track_untrack_all_wildcard);
+	} else {
+		ret = mi_lttng_writer_write_element_signed_int(writer,
+				config_element_pid, (int) pid);
+	}
 	if (ret) {
 		goto end;
 	}
 
 	if (!is_open) {
-		/* Closing Pid */
 		ret = mi_lttng_writer_close_element(writer);
+		if (ret) {
+			goto end;
+		}
 	}
 
 end:
@@ -1241,8 +1323,6 @@ end:
 	return ret;
 }
 
-/* TODO: mi tracker */
-
 LTTNG_HIDDEN
 int mi_lttng_context(struct mi_writer *writer,
 		struct lttng_event_context *context, int is_open)