X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=f152c1c2ed191269a19aace219679916a88e0cfb;hp=53850f74aae784b97a668f30c429c92cca8858be;hb=55c9e7cac24318259d4f2549c97f7577b7b52db4;hpb=a8c3ad3e850d45026f22ecdc7ea963b7e923bd08

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 53850f74a..f152c1c2e 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,12 +2577,14 @@ 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)
+ssize_t cmd_list_tracker_ids(enum lttng_tracker_type tracker_type,
+		struct ltt_session *session,
+		enum lttng_domain_type domain,
+		struct lttng_tracker_id **ids)
 {
 	int ret;
 	ssize_t nr_pids = 0;
@@ -2589,7 +2595,7 @@ 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);
+		nr_pids = kernel_list_tracker_ids(tracker_type, ksess, ids);
 		if (nr_pids < 0) {
 			ret = LTTNG_ERR_KERN_LIST_FAIL;
 			goto error;
@@ -2601,7 +2607,7 @@ 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);
+		nr_pids = trace_ust_list_tracker_ids(tracker_type, usess, ids);
 		if (nr_pids < 0) {
 			ret = LTTNG_ERR_UST_LIST_FAIL;
 			goto error;