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

diff --git a/libustcmd/ustcmd.c b/libustcmd/ustcmd.c
index bffd3c2..62c117f 100644
--- a/libustcmd/ustcmd.c
+++ b/libustcmd/ustcmd.c
@@ -104,7 +104,7 @@ pid_t *ustcmd_get_online_pids(void)
 		}
 
 		if (dirent->d_type != DT_DIR &&
-		    !!strcmp(dirent->d_name, "ustd")) {
+		    !!strcmp(dirent->d_name, "ust-consumer")) {
 
 			sscanf(dirent->d_name, "%u", (unsigned int *) &ret[i]);
 			/* FIXME: Here we previously called pid_is_online, which
@@ -303,12 +303,12 @@ int ustcmd_get_subbuf_size(const char *trace, const char *channel, pid_t pid)
 static int do_trace_cmd(const char *trace, pid_t pid, int command)
 {
 	struct ustcomm_header req_header, res_header;
-	struct ustcomm_trace_info trace_inf;
+	struct ustcomm_single_field trace_inf;
 	int result;
 
-	result = ustcomm_pack_trace_info(&req_header,
-					 &trace_inf,
-					 trace);
+	result = ustcomm_pack_single_field(&req_header,
+					   &trace_inf,
+					   trace);
 	if (result < 0) {
 		errno = -result;
 		return -1;
@@ -607,20 +607,19 @@ int ustcmd_get_tes(struct trace_event_status **tes,
  */
 int ustcmd_set_sock_path(const char *sock_path, pid_t pid)
 {
-	int offset = 0;
+	int result;
 	struct ustcomm_header req_header, res_header;
-	struct ustcomm_sock_path sock_path_msg;
+	struct ustcomm_single_field sock_path_msg;
 
-	sock_path_msg.sock_path = ustcomm_print_data(sock_path_msg.data,
-						     sizeof(sock_path_msg.data),
-						     &offset,
-						     sock_path);
-	if (sock_path_msg.sock_path == USTCOMM_POISON_PTR) {
+	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;
-	req_header.size = COMPUTE_MSG_SIZE(&sock_path_msg, offset);
 
 	return do_cmd(pid, &req_header, (char *)&sock_path_msg,
 		      &res_header, NULL);
@@ -637,7 +636,7 @@ int ustcmd_get_sock_path(char **sock_path, pid_t pid)
 {
 	int result;
 	struct ustcomm_header req_header, res_header;
-	struct ustcomm_sock_path *sock_path_msg;
+	struct ustcomm_single_field *sock_path_msg;
 
 	req_header.command = GET_SOCK_PATH;
 	req_header.size = 0;
@@ -648,12 +647,12 @@ int ustcmd_get_sock_path(char **sock_path, pid_t pid)
 		return -1;
 	}
 
-	result = ustcomm_unpack_sock_path(sock_path_msg);
+	result = ustcomm_unpack_single_field(sock_path_msg);
 	if (result < 0) {
 		return result;
 	}
 
-	*sock_path = strdup(sock_path_msg->sock_path);
+	*sock_path = strdup(sock_path_msg->field);
 
 	free(sock_path_msg);