X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ust%2Fust.c;h=d8916653ad1722b00bfec8df45a40e1bc5c8a7d1;hb=772030fed323e388da467735cf4b5e8781acb710;hp=1fb7d098c521da7d085d857e598deefeccacd802;hpb=fbd8191b00521bbe7e52a6d1ff4bb814708f06ba;p=ust.git

diff --git a/ust/ust.c b/ust/ust.c
index 1fb7d09..d891665 100644
--- a/ust/ust.c
+++ b/ust/ust.c
@@ -1,128 +1,346 @@
+/* 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 <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#define UNIX_PATH_MAX 108
-#define SOCK_DIR "/tmp/socks"
-#define UST_SIGNAL SIGIO
-
-struct ust_msg {
-	char *raw;
+#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
 };
 
-void parse_opts(int argc, char **argv)
+struct ust_opts {
+	enum command cmd;
+	pid_t *pids;
+	char* regex;
+	regex_t preg;
+	int regex_state;
+};
+
+char *progname = NULL;
+
+void usage(void)
 {
-	int flags, opt;
-	int nsecs, tfnd;
-
-	nsecs = 0;
-	tfnd = 0;
-	flags = 0;
-	while ((opt = getopt(argc, argv, "nt:")) != -1) {
-		switch (opt) {
-		case 'n':
-			flags = 1;
-			break;
-		case 't':
-			nsecs = atoi(optarg);
-			tfnd = 1;
-			break;
-		default:	/* '?' */
-			fprintf(stderr, "Usage: %s [-t nsecs] [-n] name\n",
-				argv[0]);
-			exit(EXIT_FAILURE);
-		}
-	}
+	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\
+\
+");
+}
 
-	printf("flags=%d; tfnd=%d; optind=%d\n", flags, tfnd, optind);
+int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
+{
+	int c;
 
-	if (optind >= argc) {
-		fprintf(stderr, "Expected argument after options\n");
-		exit(EXIT_FAILURE);
+	opts->pids = NULL;
+	opts->regex = NULL;
+	opts->regex_state = -1;
+
+	while (1) {
+		int option_index = 0;
+		static struct option long_options[] = {
+			{"start-trace", 0, 0, 1000},
+			{"stop-trace", 0, 0, 1001},
+			{"destroy-trace", 0, 0, 1002},
+			{"list-markers", 0, 0, 1004},
+			{"print-markers", 0, 0, 1005},
+			{"pid", 1, 0, 1006},
+			{"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, "h", long_options, &option_index);
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 0:
+			printf("option %s", long_options[option_index].name);
+			if (optarg)
+				printf(" with arg %s", optarg);
+			printf("\n");
+			break;
+
+		case 1000:
+			opts->cmd = START_TRACE;
+			break;
+		case 1001:
+			opts->cmd = STOP_TRACE;
+			break;
+		case 1009:
+			opts->cmd = START;
+			break;
+		case 1002:
+			opts->cmd = DESTROY;
+			break;
+		case 1004:
+			opts->cmd = LIST_MARKERS;
+			break;
+		case 1007:
+			opts->cmd = ENABLE_MARKER;
+			opts->regex = strdup(optarg);
+			break;
+		case 1008:
+			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 */
+			opts->cmd = UNKNOWN;
+			return 1;
+		}
 	}
 
-	printf("name argument = %s\n", argv[optind]);
+	if (argc - optind > 0 && opts->cmd != GET_ONLINE_PIDS) {
+		int i;
+		int pididx=0;
+		opts->pids = malloc((argc-optind+1) * sizeof(pid_t));
 
-	/* Other code omitted */
+		for(i=optind; i<argc; i++) {
+			opts->pids[pididx++] = atoi(argv[i]);
+		}
+		opts->pids[pididx] = -1;
+	}
 
-	exit(EXIT_SUCCESS);
+	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;
 }
 
-void signal_process(pid_t pid)
-{
-	int result;
+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);
 
-	result = kill(pid, UST_SIGNAL);
-	if(result == -1) {
-		perror("kill");
+	if (opts->regex_state != 0) {
 		return;
 	}
 
-	sleep(1);
+	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 send_message(pid_t pid, const char *msg)
+int main(int argc, char *argv[])
 {
-	int fd;
+	pid_t *pidit;
+	struct ustcomm_connection conn;
 	int result;
-	struct sockaddr_un addr;
+	struct ust_opts opts;
 
-	result = fd = socket(PF_UNIX, SOCK_DGRAM, 0);
-	if(result == -1) {
-		perror("socket");
-		return 1;
-	}
+	progname = argv[0];
 
-	addr.sun_family = AF_UNIX;
+	if(argc <= 1) {
+		fprintf(stderr, "No operation specified.\n");
+		usage();
+		exit(EXIT_FAILURE);
+	}
 
-	result = snprintf(addr.sun_path, UNIX_PATH_MAX, "%s/%d", SOCK_DIR, pid);
-	if(result >= UNIX_PATH_MAX) {
-		fprintf(stderr, "string overflow allocating socket name");
-		return 1;
+	result = parse_opts_long(argc, argv, &opts);
+	if(result) {
+		usage();
+		exit(EXIT_FAILURE);
 	}
 
-	char buf[] = "print_markers\n";
+	if(opts.pids == NULL && opts.cmd != GET_ONLINE_PIDS) {
+		fprintf(stderr, "No pid specified.\n");
+		usage();
+		exit(EXIT_FAILURE);
+	}
+	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;
 
-	signal_process(pid);
+		if (pp) {
+			while (pp[i] != 0) {
+				printf("%u\n", (unsigned int) pp[i]);
+				++i;
+			}
+			free(pp);
+		}
 
-	result = sendto(fd, buf, sizeof(buf), 0, (struct sockaddr *)&addr, sizeof(addr));
-	if(result == -1) {
-		perror("sendto");
-		return 1;
+		exit(EXIT_SUCCESS);
 	}
 
-//	result = fd = open(sockfile, O_RDWR);
-//	if(result == -1 && errno == ENXIO) {
-//		fprintf(stderr, "signalling process\n");
-//
-//		result = fd = open(sockfile, O_RDWR);
-//		if(result == -1) {
-//			perror("open");
-//			return 1;
-//		}
-//	}
-//	else if(result == -1) {
-//		perror("open");
-//		return 1;
-//	}
+	pidit = opts.pids;
+	struct USTcmd_cmsf* cmsf = NULL;
 
-}
+	while(*pidit != -1) {
+		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;
 
-int main(int argc, char *argv[])
-{
-	pid_t pid = atoi(argv[1]);
+			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;
 
-	char *msg = argv[2];
+			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;
 
-	send_message(pid, msg);
+			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;
+		}
+
+		pidit++;
+	}
+
+	exit_free:
+	if (opts.pids != NULL) {
+		free(opts.pids);
+	}
+	if (opts.regex != NULL) {
+		free(opts.regex);
+	}
 
 	return 0;
 }
+