X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustcmd%2Fustcmd.c;h=62c117f8cfa87de2d162370acc35f9e91242e572;hb=eb78cc5f9e75f620e9037708874f88b0a17e4ed8;hp=9d0d116042a1a6a4d4f783834b24d2d827a3df67;hpb=ef290fcae477f5717256af47b4342c0f59948d7a;p=ust.git

diff --git a/libustcmd/ustcmd.c b/libustcmd/ustcmd.c
index 9d0d116..62c117f 100644
--- a/libustcmd/ustcmd.c
+++ b/libustcmd/ustcmd.c
@@ -23,16 +23,70 @@
 #include <fcntl.h>
 #include <string.h>
 #include <dirent.h>
-#
 
 #include "ustcomm.h"
-#include "ustcmd.h"
+#include "ust/ustcmd.h"
+#include "usterr.h"
+
+static int do_cmd(const pid_t pid,
+		  const struct ustcomm_header *req_header,
+		  const char *req_data,
+		  struct ustcomm_header *res_header,
+		  char **res_data)
+{
+	int app_fd, result, saved_errno = 0;
+	char *recv_buf;
 
-#define _GNU_SOURCE
+	if (ustcomm_connect_app(pid, &app_fd)) {
+		ERR("could not connect to PID %u", (unsigned int) pid);
+		errno = ENOTCONN;
+		return -1;
+	}
+
+	recv_buf = zmalloc(USTCOMM_BUFFER_SIZE);
+	if (!recv_buf) {
+		saved_errno = ENOMEM;
+		goto close_app_fd;
+	}
+
+	result = ustcomm_req(app_fd, req_header, req_data, res_header, recv_buf);
+	if (result > 0) {
+		saved_errno = -res_header->result;
+		if (res_header->size == 0 || saved_errno > 0) {
+			free(recv_buf);
+		} else {
+			if (res_data) {
+				*res_data = recv_buf;
+			} else {
+				free(recv_buf);
+			}
+		}
+	} else {
+		ERR("ustcomm req failed");
+		if (result == 0) {
+			saved_errno = ENOTCONN;
+		} else {
+			saved_errno = -result;
+		}
+		free(recv_buf);
+	}
+
+close_app_fd:
+	close(app_fd);
+
+	errno = saved_errno;
 
-pid_t* ustcmd_get_online_pids(void) {
-	struct dirent* dirent;
-	DIR* dir;
+	if (errno) {
+		return -1;
+	}
+
+	return 0;
+}
+
+pid_t *ustcmd_get_online_pids(void)
+{
+	struct dirent *dirent;
+	DIR *dir;
 	unsigned int ret_size = 1 * sizeof(pid_t), i = 0;
 
 	dir = opendir(SOCK_DIR);
@@ -40,22 +94,27 @@ pid_t* ustcmd_get_online_pids(void) {
 		return NULL;
 	}
 
-	pid_t* ret = (pid_t*) malloc(ret_size);
+	pid_t *ret = (pid_t *) malloc(ret_size);
 
-	while (dirent = readdir(dir)) {
+	while ((dirent = readdir(dir))) {
 		if (!strcmp(dirent->d_name, ".") ||
-			!strcmp(dirent->d_name, "..")) {
+		    !strcmp(dirent->d_name, "..")) {
 
 			continue;
 		}
 
 		if (dirent->d_type != DT_DIR &&
-			!!strcmp(dirent->d_name, "ustd")) {
-
-			sscanf(dirent->d_name, "%u", (unsigned int*) &ret[i]);
-			if (pid_is_online(ret[i])) {
+		    !!strcmp(dirent->d_name, "ust-consumer")) {
+
+			sscanf(dirent->d_name, "%u", (unsigned int *) &ret[i]);
+			/* FIXME: Here we previously called pid_is_online, which
+			 * always returned 1, now I replaced it with just 1.
+			 * We need to figure out an intelligent way of solving
+			 * this, maybe connect-disconnect.
+			 */
+			if (1) {
 				ret_size += sizeof(pid_t);
-				ret = (pid_t*) realloc(ret, ret_size);
+				ret = (pid_t *) realloc(ret, ret_size);
 				++i;
 			}
 		}
@@ -63,7 +122,8 @@ pid_t* ustcmd_get_online_pids(void) {
 
 	ret[i] = 0; /* Array end */
 
-	if (ret[0] == 0) { /* No PID at all.. */
+	if (ret[0] == 0) {
+		/* No PID at all */
 		free(ret);
 		return NULL;
 	}
@@ -80,90 +140,249 @@ pid_t* ustcmd_get_online_pids(void) {
  * @param pid	Traced process ID
  * @return	0 if successful, or errors {USTCMD_ERR_GEN, USTCMD_ERR_ARG}
  */
-int ustcmd_set_marker_state(const char* mn, int state, pid_t pid)
+int ustcmd_set_marker_state(const char *trace, const char *channel,
+			    const char *marker, int state, pid_t pid)
 {
-	char* cmd_str [] = {"disable_marker", "enable_marker"};
-	char* cmd;
+	struct ustcomm_header req_header, res_header;
+	struct ustcomm_marker_info marker_inf;
 	int result;
 
-	if (mn == NULL) {
-		return USTCMD_ERR_ARG;
+	result = ustcomm_pack_marker_info(&req_header,
+					  &marker_inf,
+					  trace,
+					  channel,
+					  marker);
+	if (result < 0) {
+		errno = -result;
+		return -1;
 	}
 
-	asprintf(&cmd, "%s %s", cmd_str[state], mn);
+	req_header.command = state ? ENABLE_MARKER : DISABLE_MARKER;
+
+	return do_cmd(pid, &req_header, (char *)&marker_inf,
+		      &res_header, NULL);
+}
+
+/**
+ * Set subbuffer size.
+ *
+ * @param channel_size	Channel name and size
+ * @param pid		Traced process ID
+ * @return		0 if successful, or error
+ */
+int ustcmd_set_subbuf_size(const char *trace, const char *channel,
+			   unsigned int subbuf_size, pid_t pid)
+{
+	struct ustcomm_header req_header, res_header;
+	struct ustcomm_channel_info ch_inf;
+	int result;
 
-	result = ustcmd_shoot(cmd, pid, NULL);
-	if (result) {
-		free(cmd);
-		return USTCMD_ERR_GEN;
+	result = ustcomm_pack_channel_info(&req_header,
+					   &ch_inf,
+					   trace,
+					   channel);
+	if (result < 0) {
+		errno = -result;
+		return -1;
 	}
 
-	free(cmd);
-	return 0;
+	req_header.command = SET_SUBBUF_SIZE;
+	ch_inf.subbuf_size = subbuf_size;
+
+	return do_cmd(pid, &req_header, (char *)&ch_inf,
+		      &res_header, NULL);
 }
 
 /**
- * Destroys an UST trace according to a PID.
+ * Set subbuffer num.
  *
- * @param pid	Traced process ID
- * @return	0 if successful, or error USTCMD_ERR_GEN
+ * @param channel_num	Channel name and num
+ * @param pid		Traced process ID
+ * @return		0 if successful, or error
  */
-int ustcmd_destroy_trace(pid_t pid) {
-	int tres;
+int ustcmd_set_subbuf_num(const char *trace, const char *channel,
+			  unsigned int num, pid_t pid)
+{
+	struct ustcomm_header req_header, res_header;
+	struct ustcomm_channel_info ch_inf;
+	int result;
+
+	result = ustcomm_pack_channel_info(&req_header,
+					   &ch_inf,
+					   trace,
+					   channel);
+	if (result < 0) {
+		errno = -result;
+		return -1;
+	}
+
+	req_header.command = SET_SUBBUF_NUM;
+	ch_inf.subbuf_num = num;
+
+	return do_cmd(pid, &req_header, (char *)&ch_inf,
+		      &res_header, NULL);
+
+}
+
+static int ustcmd_get_subbuf_num_size(const char *trace, const char *channel,
+				      pid_t pid, int *num, int *size)
+{
+	struct ustcomm_header req_header, res_header;
+	struct ustcomm_channel_info ch_inf, *ch_inf_res;
+	int result;
+
+
+	result = ustcomm_pack_channel_info(&req_header,
+					   &ch_inf,
+					   trace,
+					   channel);
+	if (result < 0) {
+		errno = -result;
+		return -1;
+	}
+
+	req_header.command = GET_SUBBUF_NUM_SIZE;
 
-	if (tres = ustcmd_shoot("destroy", pid, NULL)) {
-		return USTCMD_ERR_GEN;
+	result = do_cmd(pid, &req_header, (char *)&ch_inf,
+			&res_header, (char **)&ch_inf_res);
+	if (result < 0) {
+		return -1;
 	}
 
+	*num = ch_inf_res->subbuf_num;
+	*size = ch_inf_res->subbuf_size;
+
+	free(ch_inf_res);
+
 	return 0;
 }
 
 /**
- * Starts an UST trace (and setups it) according to a PID.
+ * Get subbuffer num.
  *
- * @param pid	Traced process ID
- * @return	0 if successful, or error USTCMD_ERR_GEN
+ * @param channel	Channel name
+ * @param pid		Traced process ID
+ * @return		subbuf cnf if successful, or error
  */
-int ustcmd_setup_and_start(pid_t pid) {
-	int tres;
+int ustcmd_get_subbuf_num(const char *trace, const char *channel, pid_t pid)
+{
+	int num, size, result;
 
-	if (tres = ustcmd_shoot("start", pid, NULL)) {
-		return USTCMD_ERR_GEN;
+	result = ustcmd_get_subbuf_num_size(trace, channel, pid,
+					    &num, &size);
+	if (result < 0) {
+		errno = -result;
+		return -1;
 	}
 
-	return 0;
+	return num;
 }
 
 /**
- * Starts an UST trace according to a PID.
+ * Get subbuffer size.
+ *
+ * @param channel	Channel name
+ * @param pid		Traced process ID
+ * @return		subbuf size if successful, or error
+ */
+int ustcmd_get_subbuf_size(const char *trace, const char *channel, pid_t pid)
+{
+	int num, size, result;
+
+	result = ustcmd_get_subbuf_num_size(trace, channel, pid,
+					    &num, &size);
+	if (result < 0) {
+		errno = -result;
+		return -1;
+	}
+
+	return size;
+}
+
+
+static int do_trace_cmd(const char *trace, pid_t pid, int command)
+{
+	struct ustcomm_header req_header, res_header;
+	struct ustcomm_single_field trace_inf;
+	int result;
+
+	result = ustcomm_pack_single_field(&req_header,
+					   &trace_inf,
+					   trace);
+	if (result < 0) {
+		errno = -result;
+		return -1;
+	}
+
+	req_header.command = command;
+
+	return do_cmd(pid, &req_header, (char *)&trace_inf, &res_header, NULL);
+}
+
+/**
+ * Destroys an UST trace according to a PID.
  *
  * @param pid	Traced process ID
  * @return	0 if successful, or error USTCMD_ERR_GEN
  */
-int ustcmd_start_trace(pid_t pid) {
-	int tres;
+int ustcmd_destroy_trace(const char *trace, pid_t pid)
+{
+	return do_trace_cmd(trace, pid, DESTROY_TRACE);
+}
 
-	if (tres = ustcmd_shoot("trace_start", pid, NULL)) {
-		return USTCMD_ERR_GEN;
-	}
+/**
+ * Starts an UST trace (and setups it) according to a PID.
+ *
+ * @param pid	Traced process ID
+ * @return	0 if successful, or error USTCMD_ERR_GEN
+ */
+int ustcmd_setup_and_start(const char *trace, pid_t pid)
+{
+	return do_trace_cmd(trace, pid, START);
+}
 
-	return 0;
+/**
+ * Creates an UST trace according to a PID.
+ *
+ * @param pid	Traced process ID
+ * @return	0 if successful, or error USTCMD_ERR_GEN
+ */
+int ustcmd_create_trace(const char *trace, pid_t pid)
+{
+	return do_trace_cmd(trace, pid, CREATE_TRACE);
 }
 
 /**
- * Stops an UST trace according to a PID.
+ * Starts an UST trace according to a PID.
  *
  * @param pid	Traced process ID
  * @return	0 if successful, or error USTCMD_ERR_GEN
  */
-int ustcmd_stop_trace(pid_t pid) {
-	int tres;
+int ustcmd_start_trace(const char *trace, pid_t pid)
+{
+	return do_trace_cmd(trace, pid, START_TRACE);
+}
 
-	if (tres = ustcmd_shoot("trace_stop", pid, NULL)) {
-		return USTCMD_ERR_GEN;
-	}
+/**
+ * Alloc an UST trace according to a PID.
+ *
+ * @param pid	Traced process ID
+ * @return	0 if successful, or error USTCMD_ERR_GEN
+ */
+int ustcmd_alloc_trace(const char *trace, pid_t pid)
+{
+	return do_trace_cmd(trace, pid, ALLOC_TRACE);
+}
 
-	return 0;
+/**
+ * Stops an UST trace according to a PID.
+ *
+ * @param pid	Traced process ID
+ * @return	0 if successful, or error USTCMD_ERR_GEN
+ */
+int ustcmd_stop_trace(const char *trace, pid_t pid)
+{
+	return do_trace_cmd(trace, pid, STOP_TRACE);
 }
 
 /**
@@ -172,7 +391,8 @@ int ustcmd_stop_trace(pid_t pid) {
  * @param str	String to search in
  * @return	Total newlines count
  */
-unsigned int ustcmd_count_nl(const char* str) {
+unsigned int ustcmd_count_nl(const char *str)
+{
 	unsigned int i = 0, tot = 0;
 
 	while (str[i] != '\0') {
@@ -191,7 +411,8 @@ unsigned int ustcmd_count_nl(const char* str) {
  * @param cmsf	CMSF array to free
  * @return	0 if successful, or error USTCMD_ERR_ARG
  */
-int ustcmd_free_cmsf(struct USTcmd_cmsf* cmsf) {
+int ustcmd_free_cmsf(struct marker_status *cmsf)
+{
 	if (cmsf == NULL) {
 		return USTCMD_ERR_ARG;
 	}
@@ -214,44 +435,60 @@ int ustcmd_free_cmsf(struct USTcmd_cmsf* cmsf) {
  * @param cmsf	Pointer to CMSF array to be filled (callee allocates, caller
  *		frees with `ustcmd_free_cmsf')
  * @param pid	Targeted PID
- * @return	0 if successful, or errors {USTCMD_ERR_ARG, USTCMD_ERR_GEN}
+ * @return	0 if successful, or -1 on error
  */
-int ustcmd_get_cmsf(struct USTcmd_cmsf** cmsf, const pid_t pid) {
-	char* big_str = NULL;
-	int result;
-	struct USTcmd_cmsf* tmp_cmsf = NULL;
+int ustcmd_get_cmsf(struct marker_status **cmsf, const pid_t pid)
+{
+	struct ustcomm_header req_header, res_header;
+	char *big_str = NULL;
+	int result, app_fd;
+	struct marker_status *tmp_cmsf = NULL;
 	unsigned int i = 0, cmsf_ind = 0;
 
 	if (cmsf == NULL) {
-		return USTCMD_ERR_ARG;
+		return -1;
 	}
-	result = ustcmd_shoot("list_markers", pid, &big_str);
-	if (result) {
-		return USTCMD_ERR_GEN;
+
+	if (ustcomm_connect_app(pid, &app_fd)) {
+		ERR("could not connect to PID %u", (unsigned int) pid);
+		return -1;
 	}
 
-	if (big_str == NULL) {
-		fprintf(stderr, "ustcmd: error while getting markers list\n");
-		return USTCMD_ERR_GEN;
+	req_header.command = LIST_MARKERS;
+	req_header.size = 0;
+
+	result = ustcomm_send(app_fd, &req_header, NULL);
+	if (result <= 0) {
+		PERROR("error while requesting markers list for process %d", pid);
+		return -1;
+	}
+
+	result = ustcomm_recv_alloc(app_fd, &res_header, &big_str);
+	if (result <= 0) {
+		ERR("error while receiving markers list");
+		return -1;
 	}
 
-	tmp_cmsf = (struct USTcmd_cmsf*) malloc(sizeof(struct USTcmd_cmsf) *
-		(ustcmd_count_nl(big_str) + 1));
+	close(app_fd);
+
+	tmp_cmsf = (struct marker_status *) zmalloc(sizeof(struct marker_status) *
+						    (ustcmd_count_nl(big_str) + 1));
 	if (tmp_cmsf == NULL) {
-		return USTCMD_ERR_GEN;
+		ERR("Failed to allocate CMSF array");
+		return -1;
 	}
 
 	/* Parse received reply string (format: "[chan]/[mark] [st] [fs]"): */
 	while (big_str[i] != '\0') {
 		char state;
 
-		sscanf(big_str + i, "%a[^/]/%a[^ ] %c %a[^\n]",
-			&tmp_cmsf[cmsf_ind].channel,
-			&tmp_cmsf[cmsf_ind].marker,
-			&state,
-			&tmp_cmsf[cmsf_ind].fs);
+		sscanf(big_str + i, "marker: %a[^/]/%a[^ ] %c %a[^\n]",
+		       &tmp_cmsf[cmsf_ind].channel,
+		       &tmp_cmsf[cmsf_ind].marker,
+		       &state,
+		       &tmp_cmsf[cmsf_ind].fs);
 		tmp_cmsf[cmsf_ind].state = (state == USTCMD_MS_CHR_ON ?
-			USTCMD_MS_ON : USTCMD_MS_OFF); /* Marker state */
+					    USTCMD_MS_ON : USTCMD_MS_OFF); /* Marker state */
 
 		while (big_str[i] != '\n') {
 			++i; /* Go to next '\n' */
@@ -269,27 +506,166 @@ int ustcmd_get_cmsf(struct USTcmd_cmsf** cmsf, const pid_t pid) {
 	return 0;
 }
 
+
 /**
- * Shoots a given command using ustcomm.
+ * Frees a TES array.
  *
- * @param cmd	Null-terminated command to shoot
- * @param pid	Targeted PID
- * @param reply	Pointer to string to be filled with a reply string (must
- *		be NULL if no reply is needed for the given command).
- * @return	0 if successful, or errors {USTCMD_ERR_ARG, USTCMD_ERR_CONN}
+ * @param tes	TES array to free
+ * @return	0 if successful, or error USTCMD_ERR_ARG
  */
-int ustcmd_shoot(const char* cmd, const pid_t pid, char** reply) {
-	if (cmd == NULL) {
+int ustcmd_free_tes(struct trace_event_status *tes)
+{
+	if (tes == NULL) {
 		return USTCMD_ERR_ARG;
 	}
 
-	if (ustcomm_connect_app(pid, &conn)) {
-		fprintf(stderr, "ustcmd_shoot: could not connect to PID %u\n",
-			(unsigned int) pid);
-		return USTCMD_ERR_CONN;
+	unsigned int i = 0;
+	while (tes[i].name != NULL) {
+		free(tes[i].name);
+		++i;
+	}
+	free(tes);
+
+	return 0;
+}
+
+/**
+ * Gets trace_events string for a given PID.
+ *
+ * @param tes	Pointer to TES array to be filled (callee allocates, caller
+ *		frees with `ustcmd_free_tes')
+ * @param pid	Targeted PID
+ * @return	0 if successful, or -1 on error
+ */
+int ustcmd_get_tes(struct trace_event_status **tes,
+		   const pid_t pid)
+{
+	struct ustcomm_header req_header, res_header;
+	char *big_str = NULL;
+	int result, app_fd;
+	struct trace_event_status *tmp_tes = NULL;
+	unsigned int i = 0, tes_ind = 0;
+
+	if (tes == NULL) {
+		return -1;
+	}
+
+	if (ustcomm_connect_app(pid, &app_fd)) {
+		ERR("could not connect to PID %u", (unsigned int) pid);
+		return -1;
+	}
+
+	req_header.command = LIST_TRACE_EVENTS;
+	req_header.size = 0;
+
+	result = ustcomm_send(app_fd, &req_header, NULL);
+	if (result != 1) {
+		ERR("error while requesting trace_event list");
+		return -1;
+	}
+
+	result = ustcomm_recv_alloc(app_fd, &res_header, &big_str);
+	if (result != 1) {
+		ERR("error while receiving markers list");
+		return -1;
+	}
+
+	close(app_fd);
+
+	tmp_tes = (struct trace_event_status *)
+		zmalloc(sizeof(struct trace_event_status) *
+			(ustcmd_count_nl(big_str) + 1));
+	if (tmp_tes == NULL) {
+		ERR("Failed to allocate TES array");
+		return -1;
+	}
+
+	/* Parse received reply string (format: "[name]"): */
+	while (big_str[i] != '\0') {
+		sscanf(big_str + i, "trace_event: %a[^\n]",
+		       &tmp_tes[tes_ind].name);
+		while (big_str[i] != '\n') {
+			++i; /* Go to next '\n' */
+		}
+		++i; /* Skip current pointed '\n' */
+		++tes_ind;
 	}
+	tmp_tes[tes_ind].name = NULL;
 
-	ustcomm_send_request(&conn, cmd, reply);
+	*tes = tmp_tes;
 
+	free(big_str);
 	return 0;
 }
+
+/**
+ * Set socket path
+ *
+ * @param sock_path	Socket path
+ * @param pid		Traced process ID
+ * @return		0 if successful, or error
+ */
+int ustcmd_set_sock_path(const char *sock_path, pid_t pid)
+{
+	int result;
+	struct ustcomm_header req_header, res_header;
+	struct ustcomm_single_field sock_path_msg;
+
+	result = ustcomm_pack_single_field(&req_header,
+					   &sock_path_msg,
+					   sock_path);
+	if (result < 0) {
+		errno = -result;
+		return -1;
+	}
+
+	req_header.command = SET_SOCK_PATH;
+
+	return do_cmd(pid, &req_header, (char *)&sock_path_msg,
+		      &res_header, NULL);
+}
+
+/**
+ * Get socket path
+ *
+ * @param sock_path	Pointer to where the socket path will be returned
+ * @param pid		Traced process ID
+ * @return		0 if successful, or error
+ */
+int ustcmd_get_sock_path(char **sock_path, pid_t pid)
+{
+	int result;
+	struct ustcomm_header req_header, res_header;
+	struct ustcomm_single_field *sock_path_msg;
+
+	req_header.command = GET_SOCK_PATH;
+	req_header.size = 0;
+
+	result = do_cmd(pid, &req_header, NULL, &res_header,
+			(char **)&sock_path_msg);
+	if (result < 0) {
+		return -1;
+	}
+
+	result = ustcomm_unpack_single_field(sock_path_msg);
+	if (result < 0) {
+		return result;
+	}
+
+	*sock_path = strdup(sock_path_msg->field);
+
+	free(sock_path_msg);
+
+	return 0;
+}
+
+int ustcmd_force_switch(pid_t pid)
+{
+	struct ustcomm_header req_header, res_header;
+
+	req_header.command = FORCE_SUBBUF_SWITCH;
+	req_header.size = 0;
+
+	return do_cmd(pid, &req_header, NULL, &res_header, NULL);
+}
+