code cleanups
[ust.git] / ust / ust.c
index 2f7a6bd76c3f7ff6e202bd0dc43971dcd201050f..d8916653ad1722b00bfec8df45a40e1bc5c8a7d1 100644 (file)
--- a/ust/ust.c
+++ b/ust/ust.c
@@ -1,28 +1,78 @@
+/* Copyright (C) 2009  Pierre-Marc Fournier
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <fcntl.h>
+#include <regex.h>
 
 #include "ustcomm.h"
+#include "ustcmd.h"
+
+enum command {
+       START_TRACE,
+       STOP_TRACE,
+       START,
+       DESTROY,
+       LIST_MARKERS,
+       ENABLE_MARKER,
+       DISABLE_MARKER,
+       GET_ONLINE_PIDS,
+       UNKNOWN
+};
 
 struct ust_opts {
-       char *cmd;
+       enum command cmd;
        pid_t *pids;
-       int take_reply;
+       char* regex;
+       regex_t preg;
+       int regex_state;
 };
 
+char *progname = NULL;
+
+void usage(void)
+{
+       fprintf(stderr, "usage: %s COMMAND PIDs...\n", progname);
+       fprintf(stderr, "\nControl the tracing of a process that supports LTTng Userspace Tracing.\n\
+\n\
+Commands:\n\
+    --start-trace\t\t\tStart tracing\n\
+    --stop-trace\t\t\tStop tracing\n\
+    --destroy-trace\t\t\tDestroy the trace\n\
+    --enable-marker \"CHANNEL/MARKER\"\tEnable a marker\n\
+    --disable-marker \"CHANNEL/MARKER\"\tDisable a marker\n\
+    --list-markers\t\t\tList the markers of the process, their\n\t\t\t\t\t  state and format string\n\
+\
+");
+}
+
 int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
 {
        int c;
-       int digit_optind = 0;
 
-       opts->cmd = NULL;
        opts->pids = NULL;
-       opts->take_reply = 0;
+       opts->regex = NULL;
+       opts->regex_state = -1;
 
        while (1) {
-               int this_option_optind = optind ? optind : 1;
                int option_index = 0;
                static struct option long_options[] = {
                        {"start-trace", 0, 0, 1000},
@@ -34,10 +84,13 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
                        {"enable-marker", 1, 0, 1007},
                        {"disable-marker", 1, 0, 1008},
                        {"start", 0, 0, 1009},
+                       {"help", 0, 0, 'h'},
+                       {"version", 0, 0, 1010},
+                       {"online-pids", 0, 0, 1011},
                        {0, 0, 0, 0}
                };
 
-               c = getopt_long(argc, argv, "", long_options, &option_index);
+               c = getopt_long(argc, argv, "h", long_options, &option_index);
                if (c == -1)
                        break;
 
@@ -50,35 +103,46 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
                        break;
 
                case 1000:
-                       opts->cmd = strdup("trace_start");
+                       opts->cmd = START_TRACE;
                        break;
                case 1001:
-                       opts->cmd = strdup("trace_stop");
+                       opts->cmd = STOP_TRACE;
                        break;
                case 1009:
-                       opts->cmd = strdup("start");
+                       opts->cmd = START;
                        break;
                case 1002:
-                       opts->cmd = strdup("trace_destroy");
+                       opts->cmd = DESTROY;
                        break;
                case 1004:
-                       opts->cmd = strdup("list_markers");
-                       opts->take_reply = 1;
+                       opts->cmd = LIST_MARKERS;
                        break;
                case 1007:
-                       asprintf(&opts->cmd, "enable_marker %s", optarg);
+                       opts->cmd = ENABLE_MARKER;
+                       opts->regex = strdup(optarg);
                        break;
                case 1008:
-                       asprintf(&opts->cmd, "disable_marker %s", optarg);
+                       opts->cmd = DISABLE_MARKER;
+                       opts->regex = strdup(optarg);
+                       break;
+               case 1011:
+                       opts->cmd = GET_ONLINE_PIDS;
                        break;
+               case 'h':
+                       usage();
+                       exit(0);
+               case 1010:
+                       printf("Version 0.1\n");
 
                default:
-                       /* unknown option or other error; error is printed by getopt, just return */
+                       /* unknown option or other error; error is
+                       printed by getopt, just return */
+                       opts->cmd = UNKNOWN;
                        return 1;
                }
        }
 
-       if(argc - optind > 0) {
+       if (argc - optind > 0 && opts->cmd != GET_ONLINE_PIDS) {
                int i;
                int pididx=0;
                opts->pids = malloc((argc-optind+1) * sizeof(pid_t));
@@ -89,31 +153,57 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
                opts->pids[pididx] = -1;
        }
 
+       if (opts->cmd == ENABLE_MARKER || opts->cmd == DISABLE_MARKER) {
+               if (opts->regex_state = regcomp(&opts->preg, opts->regex, 0)) {
+                       fprintf(stderr, "Invalid regular expression.\n");
+               }
+       }
+
        return 0;
 }
 
-char *progname = NULL;
+static void regex_change_m_state(struct ust_opts* opts, pid_t pid) {
+       struct USTcmd_cmsf* cmsf = NULL;
+       unsigned int i = 0;
+       int e = (opts->cmd == ENABLE_MARKER);
 
-void usage(void)
-{
-       fprintf(stderr, "usage: %s [OPTIONS] OPERATION PID...\n", progname);
-       fprintf(stderr, "\nControl the tracing of a process that supports LTTng Userspace Tracing.\n\
-\n\
-Operations:\n\
-\t--start-trace\tStart tracing\n\
-\t--stop-trace\tStop tracing\n\
-\t--destroy-trace\tDestroy the trace\n\
-\t--enable-marker CHANNEL_NAME/MARKER_NAME\tEnable a marker\n\
-\t--disable-marker CHANNEL_NAME/MARKER_NAME\tDisable a marker\n\
-\t--list-markers\tList the markers of the process and their state\n\
-\n\
-");
+       if (opts->regex_state != 0) {
+               return;
+       }
+
+       if (ustcmd_get_cmsf(&cmsf, pid)) {
+               fprintf(stderr, "error while trying to get markers for PID "
+                       "%u\n", (unsigned int) pid);
+               return;
+       }
+       while (cmsf[i].channel != NULL) {
+               char* mc;
+               asprintf(&mc, "%s/%s", cmsf[i].channel, cmsf[i].marker);
+               if (regexec(&opts->preg, mc, 0, NULL, 0) == 0) {
+                       /* We got a match! */
+                       if (ustcmd_set_marker_state(mc,
+                       e ? USTCMD_MS_ON : USTCMD_MS_OFF, pid)) {
+                               fprintf(stderr,
+                                       "error while trying to %sable marker"
+                                       "\"%s\" for PID %u\n",
+                                       e ? "en" : "dis", mc,
+                                       (unsigned int) pid);
+                       } else {
+                               printf("sucessfully %sabled marker "
+                                       "\"%s\" for PID %u\n",
+                                       e ? "en" : "dis", mc,
+                                       (unsigned int) pid);
+                       }
+               }
+               free(mc);
+               ++i;
+       }
+       ustcmd_free_cmsf(cmsf);
 }
 
 int main(int argc, char *argv[])
 {
        pid_t *pidit;
-       //char *msg = argv[2];
        struct ustcomm_connection conn;
        int result;
        struct ust_opts opts;
@@ -132,42 +222,125 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       if(opts.pids == NULL) {
+       if(opts.pids == NULL && opts.cmd != GET_ONLINE_PIDS) {
                fprintf(stderr, "No pid specified.\n");
                usage();
                exit(EXIT_FAILURE);
        }
-       if(opts.cmd == NULL) {
+       if(opts.cmd == UNKNOWN) {
                fprintf(stderr, "No command specified.\n");
                usage();
                exit(EXIT_FAILURE);
        }
+       if (opts.cmd == GET_ONLINE_PIDS) {
+               pid_t* pp = ustcmd_get_online_pids();
+               unsigned int i = 0;
+
+               if (pp) {
+                       while (pp[i] != 0) {
+                               printf("%u\n", (unsigned int) pp[i]);
+                               ++i;
+                       }
+                       free(pp);
+               }
+
+               exit(EXIT_SUCCESS);
+       }
 
        pidit = opts.pids;
+       struct USTcmd_cmsf* cmsf = NULL;
 
        while(*pidit != -1) {
-               char *reply;
-               char **preply;
-
-               if(opts.take_reply)
-                       preply = &reply;
-               else
-                       preply = NULL;
-
-               result = ustcomm_connect_app(*pidit, &conn);
-               if(result) {
-                       fprintf(stderr, "error connecting to process\n");
-                       exit(EXIT_FAILURE);
+               switch (opts.cmd) {
+                       case START_TRACE:
+                       if (ustcmd_start_trace(*pidit)) {
+                               fprintf(stderr,
+                                       "error while trying to for trace "
+                                       "with PID %u\n", (unsigned int) *pidit);
+                               break;
+                       }
+                       printf("sucessfully started trace for PID %u\n",
+                               (unsigned int) *pidit);
+                       break;
+
+                       case STOP_TRACE:
+                       if (ustcmd_stop_trace(*pidit)) {
+                               fprintf(stderr,
+                                       "error while trying to stop trace "
+                                       "for PID %u\n", (unsigned int) *pidit);
+                               break;
+                       }
+                       printf("sucessfully stopped trace for PID %u\n",
+                               (unsigned int) *pidit);
+                       break;
+
+                       case START:
+                       if (ustcmd_setup_and_start(*pidit)) {
+                               fprintf(stderr,
+                                       "error while trying to setup/start "
+                                       "trace for PID %u\n",
+                                       (unsigned int) *pidit);
+                               break;
+                       }
+                       printf("sucessfully setup/started trace for PID %u\n",
+                               (unsigned int) *pidit);
+                       break;
+
+                       case DESTROY:
+                       if (ustcmd_destroy_trace(*pidit)) {
+                               fprintf(stderr,
+                                       "error while trying to destroy "
+                                       "trace with PID %u\n",
+                                       (unsigned int) *pidit);
+                               break;
+                       }
+                       printf("sucessfully destroyed trace for PID %u\n",
+                               (unsigned int) *pidit);
+                       break;
+
+                       case LIST_MARKERS:
+                       cmsf = NULL;
+                       if (ustcmd_get_cmsf(&cmsf, *pidit)) {
+                               fprintf(stderr,
+                                       "error while trying to list markers for"
+                                       " PID %u\n", (unsigned int) *pidit);
+                               break;
+                       }
+                       unsigned int i = 0;
+                       while (cmsf[i].channel != NULL) {
+                               printf("{PID: %u, channel/marker: %s/%s, "
+                                       "state: %u, fs: %s}\n",
+                                       (unsigned int) *pidit,
+                                       cmsf[i].channel,
+                                       cmsf[i].marker,
+                                       cmsf[i].state,
+                                       cmsf[i].fs);
+                               ++i;
+                       }
+                       ustcmd_free_cmsf(cmsf);
+                       break;
+
+                       case ENABLE_MARKER:
+                       case DISABLE_MARKER:
+                               regex_change_m_state(&opts, *pidit);
+                       break;
+
+                       default:
+                       fprintf(stderr, "error: unknown command...\n");
+                       break;
                }
-               ustcomm_send_request(&conn, opts.cmd, preply);
 
-               if(opts.take_reply)
-                       printf("%s", reply);
                pidit++;
        }
 
-       free(opts.pids);
-       free(opts.cmd);
+       exit_free:
+       if (opts.pids != NULL) {
+               free(opts.pids);
+       }
+       if (opts.regex != NULL) {
+               free(opts.regex);
+       }
 
        return 0;
 }
+
This page took 0.026304 seconds and 4 git commands to generate.