X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=4c1609fd20366f95438b240504e1ab20ca8229b5;hb=3646a0515bbdc4aac3853f2a464e73dd99783b34;hp=cdc58b8cf1d4b534d959a5e4eb408bfe637c0f09;hpb=00e1dfc4fa7f9c46567f16ef2212fad2a4795996;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index cdc58b8cf..4c1609fd2 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -912,11 +912,106 @@ int cmd_disable_channel(struct ltt_session *session, int domain,
 		}
 		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-#endif
+	default:
+		ret = LTTNG_ERR_UNKNOWN_DOMAIN;
+		goto error;
+	}
+
+	ret = LTTNG_OK;
+
+error:
+	rcu_read_unlock();
+	return ret;
+}
+
+/*
+ * Command LTTNG_TRACK_PID processed by the client thread.
+ *
+ * Called with session lock held.
+ */
+int cmd_track_pid(struct ltt_session *session, int domain, int pid)
+{
+	int ret;
+
+	rcu_read_lock();
+
+	switch (domain) {
+	case LTTNG_DOMAIN_KERNEL:
+	{
+		struct ltt_kernel_session *ksess;
+
+		ksess = session->kernel_session;
+
+		ret = kernel_track_pid(ksess, pid);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		kernel_wait_quiescent(kernel_tracer_fd);
+		break;
+	}
+	case LTTNG_DOMAIN_UST:
+	{
+		struct ltt_ust_session *usess;
+
+		usess = session->ust_session;
+
+		ret = trace_ust_track_pid(usess, pid);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+		break;
+	}
+	default:
+		ret = LTTNG_ERR_UNKNOWN_DOMAIN;
+		goto error;
+	}
+
+	ret = LTTNG_OK;
+
+error:
+	rcu_read_unlock();
+	return ret;
+}
+
+/*
+ * Command LTTNG_UNTRACK_PID processed by the client thread.
+ *
+ * Called with session lock held.
+ */
+int cmd_untrack_pid(struct ltt_session *session, int domain, int pid)
+{
+	int ret;
+
+	rcu_read_lock();
+
+	switch (domain) {
+	case LTTNG_DOMAIN_KERNEL:
+	{
+		struct ltt_kernel_session *ksess;
+
+		ksess = session->kernel_session;
+
+		ret = kernel_untrack_pid(ksess, pid);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		kernel_wait_quiescent(kernel_tracer_fd);
+		break;
+	}
+	case LTTNG_DOMAIN_UST:
+	{
+		struct ltt_ust_session *usess;
+
+		usess = session->ust_session;
+
+		ret = trace_ust_untrack_pid(usess, pid);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UNKNOWN_DOMAIN;
 		goto error;
@@ -1186,11 +1281,6 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
 		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
 	default:
 		ret = LTTNG_ERR_UND;
 		goto error;
@@ -1330,11 +1420,6 @@ int cmd_add_context(struct ltt_session *session, int domain,
 		}
 		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
 	default:
 		ret = LTTNG_ERR_UND;
 		goto error;
@@ -1661,11 +1746,6 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 
 		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
 	default:
 		ret = LTTNG_ERR_UND;
 		goto error;
@@ -1869,8 +1949,61 @@ ssize_t cmd_list_syscalls(struct lttng_event **events)
 	return syscall_table_list(events);
 }
 
+/*
+ * Command LTTNG_LIST_TRACKER_PIDS processed by the client thread.
+ *
+ * Called with session lock held.
+ */
+ssize_t cmd_list_tracker_pids(struct ltt_session *session,
+		int domain, int32_t **pids)
+{
+	int ret;
+	ssize_t nr_pids = 0;
+
+	switch (domain) {
+	case LTTNG_DOMAIN_KERNEL:
+	{
+		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;
+			goto error;
+		}
+		break;
+	}
+	case LTTNG_DOMAIN_UST:
+	{
+		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;
+			goto error;
+		}
+		break;
+	}
+	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_PYTHON:
+	default:
+		ret = LTTNG_ERR_UND;
+		goto error;
+	}
+
+	return nr_pids;
+
+error:
+	/* Return negative value to differentiate return code */
+	return -ret;
+}
+
 /*
  * Command LTTNG_START_TRACE processed by the client thread.
+ *
+ * Called with session mutex held.
  */
 int cmd_start_trace(struct ltt_session *session)
 {
@@ -2231,6 +2364,8 @@ error:
 
 /*
  * Command LTTNG_DESTROY_SESSION processed by the client thread.
+ *
+ * Called with session lock held.
  */
 int cmd_destroy_session(struct ltt_session *session, int wpipe)
 {
@@ -3333,6 +3468,29 @@ error:
 	return ret;
 }
 
+/*
+ * Command LTTNG_SET_SESSION_SHM_PATH processed by the client thread.
+ */
+int cmd_set_session_shm_path(struct ltt_session *session,
+		const char *shm_path)
+{
+	/* Safety net */
+	assert(session);
+
+	/*
+	 * Can only set shm path before session is started.
+	 */
+	if (session->has_been_started) {
+		return LTTNG_ERR_SESSION_STARTED;
+	}
+
+	strncpy(session->shm_path, shm_path,
+		sizeof(session->shm_path));
+	session->shm_path[sizeof(session->shm_path) - 1] = '\0';
+
+	return 0;
+}
+
 /*
  * Init command subsystem.
  */