libustctl: use direct socket communication

[ust.git] / ustctl / marker_cmds.c

diff --git a/ustctl/marker_cmds.c b/ustctl/marker_cmds.c
index 20222dd1cdb3678c7d2a2f792888431baf7c0c8c..da1435872c77149db9771ea6a168f455d3295b50 100644 (file)
--- a/ustctl/marker_cmds.c
+++ b/ustctl/marker_cmds.c
@@ -17,7 +17,7 @@
 #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"
@@ -25,35 +25,33 @@
 static int list_markers(int argc, char *argv[])
 {
        struct marker_status *cmsf = NULL;
-       int i;
-       pid_t pid;
+       int i, sock;
 
-       pid = parse_pid(argv[1]);
+       sock = parse_and_connect_pid(argv[1]);
 
-       if (ustcmd_get_cmsf(&cmsf, pid)) {
-               ERR("error while trying to list markers for PID %u\n", pid);
+       if (ustctl_get_cmsf(sock, &cmsf)) {
+               ERR("error while trying to list markers for PID %s\n", argv[1]);
                return -1;
        }
        for (i = 0; cmsf[i].channel; i++) {
-               printf("{PID: %u, channel/marker: %s/%s, "
+               printf("{PID: %s, channel/marker: %s/%s, "
                       "state: %u, fmt: %s}\n",
-                      (unsigned int) pid,
+                      argv[1],
                       cmsf[i].channel,
                       cmsf[i].marker,
                       cmsf[i].state,
                       cmsf[i].fs);
        }
-       ustcmd_free_cmsf(cmsf);
+       ustctl_free_cmsf(cmsf);
        return 0;
 }
 
 static int enable_marker(int argc, char *argv[])
 {
-       int i, result = 0;
-       pid_t pid;
+       int i, sock, result = 0;
        char *channel, *marker;
 
-       pid = parse_pid(argv[1]);
+       sock = parse_and_connect_pid(argv[1]);
 
        for (i = 3; i < argc; i++) {
                channel = NULL;
@@ -68,9 +66,9 @@ static int enable_marker(int argc, char *argv[])
                        if (marker)
                                free(marker);
                }
-               if (ustcmd_set_marker_state(argv[2], channel, marker, 1, pid)) {
-                       PERROR("error while trying to enable marker %s with PID %u",
-                              argv[i], pid);
+               if (ustctl_set_marker_state(sock, argv[2], channel, marker, 1)) {
+                       PERROR("error while trying to enable marker %s with PID %s",
+                              argv[i], argv[1]);
                        result = -1;
                }
                free(channel);
@@ -82,11 +80,10 @@ static int enable_marker(int argc, char *argv[])
 
 static int disable_marker(int argc, char *argv[])
 {
-       int i, result = 0;
-       pid_t pid;
+       int i, sock, result = 0;
        char *channel, *marker;
 
-       pid = parse_pid(argv[1]);
+       sock = parse_and_connect_pid(argv[1]);
 
        for (i = 3; i < argc; i++) {
                channel = NULL;
@@ -101,9 +98,9 @@ static int disable_marker(int argc, char *argv[])
                                free(marker);
                        return -1;
                }
-               if (ustcmd_set_marker_state(argv[2], channel, marker, 0, pid)) {
-                       PERROR("error while trying to disable marker %s with PID %u",
-                              argv[i], pid);
+               if (ustctl_set_marker_state(sock, argv[2], channel, marker, 0)) {
+                       PERROR("error while trying to disable marker %s with PID %s",
+                              argv[i], argv[1]);
                        result = -1;
                }
                free(channel);