X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ustctl%2Fchannel_cmds.c;h=315fd56f0a50211e031ff52ba77d8e561c47919f;hb=dc6c486b9ac1c9db99050f9d9d1919f9cb651027;hp=51f7d504a636e9b758cbd986f1fa94e121cdf9a0;hpb=0c89df6cb75f1d967003137e7fc334af1128a42f;p=ust.git

diff --git a/ustctl/channel_cmds.c b/ustctl/channel_cmds.c
index 51f7d50..315fd56 100644
--- a/ustctl/channel_cmds.c
+++ b/ustctl/channel_cmds.c
@@ -17,19 +17,18 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <ust/ustcmd.h>
+#include <ust/ustctl.h>
 #include "scanning_functions.h"
 #include "usterr.h"
 #include "cli.h"
 
 static int set_subbuf_size(int argc, char *argv[])
 {
-	int result = 0;
-	pid_t pid;
+	int sock, result = 0;
 	char *channel = NULL;
 	unsigned int size;
 
-	pid = parse_pid(argv[1]);
+	sock = parse_and_connect_pid(argv[1]);
 
 	if (scan_ch_and_num(argv[3], &channel, &size)) {
 		fprintf(stderr, "Failed to scan channel and size from"
@@ -38,10 +37,10 @@ static int set_subbuf_size(int argc, char *argv[])
 			free(channel);
 		return -1;
 	}
-	if (ustcmd_set_subbuf_size(argv[2], channel, size, pid)) {
+	if (ustctl_set_subbuf_size(sock, argv[2], channel, size)) {
 		ERR("error while trying to set the size of subbuffers "
-		    "for PID %u\n",
-		    pid);
+		    "for PID %s\n",
+		    argv[1]);
 		result = -1;
 	}
 
@@ -52,12 +51,11 @@ static int set_subbuf_size(int argc, char *argv[])
 
 static int set_subbuf_num(int argc, char *argv[])
 {
-	int result = 0;
-	pid_t pid;
+	int sock, result = 0;
 	char *channel = NULL;
 	unsigned int num;
 
-	pid = parse_pid(argv[1]);
+	sock = parse_and_connect_pid(argv[1]);
 
 	if (scan_ch_and_num(argv[3], &channel, &num)) {
 		fprintf(stderr, "Failed to scan channel and number from"
@@ -66,9 +64,9 @@ static int set_subbuf_num(int argc, char *argv[])
 			free(channel);
 		return -1;
 	}
-	if (ustcmd_set_subbuf_num(argv[2], channel, num, pid)) {
-		ERR("error while trying to set the number of subbuffers for PID %u\n",
-		    pid);
+	if (ustctl_set_subbuf_num(sock, argv[2], channel, num)) {
+		ERR("error while trying to set the number of subbuffers for PID %s\n",
+		    argv[1]);
 		result = -1;
 	}
 
@@ -79,14 +77,14 @@ static int set_subbuf_num(int argc, char *argv[])
 
 static int get_subbuf_size(int argc, char *argv[])
 {
-	pid_t pid;
+	int sock;
 	unsigned int size;
 
-	pid = parse_pid(argv[1]);
+	sock = parse_and_connect_pid(argv[1]);
 
-	if ((size = ustcmd_get_subbuf_size(argv[2], argv[3], pid)) < 0) {
-		ERR("error while trying to get the subbuffer size from PID %u\n",
-		    pid);
+	if ((size = ustctl_get_subbuf_size(sock, argv[2], argv[3])) < 0) {
+		ERR("error while trying to get the subbuffer size from PID %s\n",
+		    argv[1]);
 		return -1;
 	}
 
@@ -97,14 +95,14 @@ static int get_subbuf_size(int argc, char *argv[])
 
 static int get_subbuf_num(int argc, char *argv[])
 {
-	pid_t pid;
+	int sock;
 	unsigned int num;
 
-	pid = parse_pid(argv[1]);
+	sock = parse_and_connect_pid(argv[1]);
 
-	if ((num = ustcmd_get_subbuf_num(argv[2], argv[3], pid)) < 0) {
-		ERR("error while trying to get the subbuffer size from PID %u\n",
-		    pid);
+	if ((num = ustctl_get_subbuf_num(sock, argv[2], argv[3])) < 0) {
+		ERR("error while trying to get the subbuffer size from PID %s\n",
+		    argv[1]);
 		return -1;
 	}