X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ustctl%2Fustctl.c;h=35bea7ae6b3d84f17c1493e378593149f4b6e90c;hb=1e620c5350cfbd0b0be4122547115dd4da503bcf;hp=3ff2fb78e16398ee78a9a6be60a5955a1aca1298;hpb=62ec620f40891af46d0ee4768992275dc7b28433;p=ust.git

diff --git a/ustctl/ustctl.c b/ustctl/ustctl.c
index 3ff2fb7..35bea7a 100644
--- a/ustctl/ustctl.c
+++ b/ustctl/ustctl.c
@@ -22,20 +22,26 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#include "ustcomm.h"
-#include "ustcmd.h"
+#include "ust/ustcmd.h"
 #include "usterr.h"
 
 enum command {
-	CREATE_TRACE,
+	CREATE_TRACE=1000,
+	ALLOC_TRACE,
 	START_TRACE,
 	STOP_TRACE,
-	START,
-	DESTROY,
+	DESTROY_TRACE,
 	LIST_MARKERS,
 	ENABLE_MARKER,
 	DISABLE_MARKER,
 	GET_ONLINE_PIDS,
+	SET_SUBBUF_SIZE,
+	SET_SUBBUF_NUM,
+	GET_SUBBUF_SIZE,
+	GET_SUBBUF_NUM,
+	GET_SOCK_PATH,
+	SET_SOCK_PATH,
+	FORCE_SWITCH,
 	UNKNOWN
 };
 
@@ -54,12 +60,20 @@ void usage(void)
 \n\
 Commands:\n\
     --create-trace\t\t\tCreate trace\n\
+    --alloc-trace\t\t\tAlloc trace\n\
     --start-trace\t\t\tStart tracing\n\
     --stop-trace\t\t\tStop tracing\n\
     --destroy-trace\t\t\tDestroy the trace\n\
+    --set-subbuf-size \"CHANNEL/bytes\"\tSet the size of subbuffers per channel\n\
+    --set-subbuf-num \"CHANNEL/n\"\tSet the number of subbuffers per channel\n\
+    --set-sock-path\t\t\tSet the path of the daemon socket\n\
+    --get-subbuf-size \"CHANNEL\"\t\tGet the size of subbuffers per channel\n\
+    --get-subbuf-num \"CHANNEL\"\t\tGet the number of subbuffers per channel\n\
+    --get-sock-path\t\t\tGet the path of the daemon socket\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\
+    --force-switch\t\t\tForce a subbuffer switch\n\
 \
 ");
 }
@@ -74,26 +88,33 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
 	while (1) {
 		int option_index = 0;
 		static struct option long_options[] = {
-			{"create-trace", 0, 0, 1012},
-			{"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}
+			{ "create-trace", 0, 0, CREATE_TRACE },
+			{ "alloc-trace", 0, 0, ALLOC_TRACE },
+			{ "start-trace", 0, 0, START_TRACE },
+			{ "stop-trace", 0, 0, STOP_TRACE },
+			{ "destroy-trace", 0, 0, DESTROY_TRACE },
+			{ "list-markers", 0, 0, LIST_MARKERS },
+			{ "enable-marker", 1, 0, ENABLE_MARKER },
+			{ "disable-marker", 1, 0, DISABLE_MARKER },
+			{ "help", 0, 0, 'h' },
+			{ "online-pids", 0, 0, GET_ONLINE_PIDS },
+			{ "set-subbuf-size", 1, 0, SET_SUBBUF_SIZE },
+			{ "set-subbuf-num", 1, 0, SET_SUBBUF_NUM },
+			{ "get-subbuf-size", 1, 0, GET_SUBBUF_SIZE },
+			{ "get-subbuf-num", 1, 0, GET_SUBBUF_NUM },
+			{ "get-sock-path", 0, 0, GET_SOCK_PATH },
+			{ "set-sock-path", 1, 0, SET_SOCK_PATH },
+			{ "force-switch", 0, 0, FORCE_SWITCH },
+			{ 0, 0, 0, 0 }
 		};
 
 		c = getopt_long(argc, argv, "h", long_options, &option_index);
 		if (c == -1)
 			break;
 
+		if(c >= 1000)
+			opts->cmd = c;
+
 		switch (c) {
 		case 0:
 			printf("option %s", long_options[option_index].name);
@@ -102,53 +123,31 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
 			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;
+		case ENABLE_MARKER:
+		case DISABLE_MARKER:
+		case SET_SUBBUF_SIZE:
+		case SET_SUBBUF_NUM:
+		case GET_SUBBUF_SIZE:
+		case GET_SUBBUF_NUM:
+		case SET_SOCK_PATH:
 			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");
-			break;
-		case 1012:
-			opts->cmd = CREATE_TRACE;
-			break;
-		default:
-			/* unknown option or other error; error is
-			printed by getopt, just return */
-			opts->cmd = UNKNOWN;
-			return 1;
+
+		case '?':
+			fprintf(stderr, "Invalid argument\n\n");
+			usage();
+			exit(1);
 		}
 	}
 
 	if (argc - optind > 0 && opts->cmd != GET_ONLINE_PIDS) {
 		int i;
 		int pididx=0;
-		opts->pids = malloc((argc-optind+1) * sizeof(pid_t));
+		opts->pids = zmalloc((argc-optind+1) * sizeof(pid_t));
 
 		for(i=optind; i<argc; i++) {
 			/* don't take any chances, use a long long */
@@ -171,6 +170,8 @@ int main(int argc, char *argv[])
 {
 	pid_t *pidit;
 	int result;
+	int retval = EXIT_SUCCESS;
+	char *tmp;
 	struct ust_opts opts;
 
 	progname = argv[0];
@@ -222,6 +223,7 @@ int main(int argc, char *argv[])
 				result = ustcmd_create_trace(*pidit);
 				if (result) {
 					ERR("error while trying to create trace with PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
 					break;
 				}
 				break;
@@ -230,44 +232,34 @@ int main(int argc, char *argv[])
 				result = ustcmd_start_trace(*pidit);
 				if (result) {
 					ERR("error while trying to for trace with PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
 					break;
 				}
-				//printf("sucessfully started trace for PID %u\n", (unsigned int) *pidit);
 				break;
 
 			case STOP_TRACE:
 				result = ustcmd_stop_trace(*pidit);
 				if (result) {
 					ERR("error while trying to stop trace for PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
 					break;
 				}
-				//printf("sucessfully stopped trace for PID %u\n", (unsigned int) *pidit);
 				break;
 
-			case START:
-				result = ustcmd_setup_and_start(*pidit);
-				if (result) {
-					ERR("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:
+			case DESTROY_TRACE:
 				result = ustcmd_destroy_trace(*pidit);
 				if (result) {
 					ERR("error while trying to destroy trace with PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
 					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);
+					ERR("error while trying to list markers for PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
 					break;
 				}
 				unsigned int i = 0;
@@ -285,17 +277,105 @@ int main(int argc, char *argv[])
 				break;
 
 			case ENABLE_MARKER:
-				if(opts.regex)
-					ustcmd_set_marker_state(opts.regex, 1, *pidit);
+				if (opts.regex) {
+					if (ustcmd_set_marker_state(opts.regex, 1, *pidit)) {
+						ERR("error while trying to enable marker %s with PID %u\n",
+								opts.regex, (unsigned int) *pidit);
+						retval = EXIT_FAILURE;
+					}
+				}
 				break;
 			case DISABLE_MARKER:
-				if(opts.regex)
-					ustcmd_set_marker_state(opts.regex, 0, *pidit);
+				if (opts.regex) {
+					if (ustcmd_set_marker_state(opts.regex, 0, *pidit)) {
+						ERR("error while trying to disable marker %s with PID %u\n",
+								opts.regex, (unsigned int) *pidit);
+						retval = EXIT_FAILURE;
+					}
+				}
+				break;
+
+			case SET_SUBBUF_SIZE:
+				if (opts.regex) {
+					if (ustcmd_set_subbuf_size(opts.regex, *pidit)) {
+						ERR("error while trying to set the size of subbuffers with PID %u\n",
+								(unsigned int) *pidit);
+						retval = EXIT_FAILURE;
+					}
+				}
+				break;
+
+			case SET_SUBBUF_NUM:
+				if (opts.regex) {
+					if (ustcmd_set_subbuf_num(opts.regex, *pidit)) {
+						ERR("error while trying to set the number of subbuffers with PID %u\n",
+								(unsigned int) *pidit);
+						retval = EXIT_FAILURE;
+					}
+				}
+				break;
+
+			case GET_SUBBUF_SIZE:
+				result = ustcmd_get_subbuf_size(opts.regex, *pidit);
+				if (result == -1) {
+					ERR("error while trying to get_subuf_size with PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
+					break;
+				}
+
+				printf("the size of subbufers is %d\n", result);
+				break;
+
+			case GET_SUBBUF_NUM:
+				result = ustcmd_get_subbuf_num(opts.regex, *pidit);
+				if (result == -1) {
+					ERR("error while trying to get_subuf_num with PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
+					break;
+				}
+
+				printf("the number of subbufers is %d\n", result);
+				break;
+
+			case ALLOC_TRACE:
+				result = ustcmd_alloc_trace(*pidit);
+				if (result) {
+					ERR("error while trying to alloc trace with PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
+				}
+				break;
+
+			case GET_SOCK_PATH:
+				result = ustcmd_get_sock_path(&tmp, *pidit);
+				if (result) {
+					ERR("error while trying to get sock path for PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
+					break;
+				}
+				printf("the socket path is %s\n", tmp);
+				free(tmp);
+				break;
+
+			case SET_SOCK_PATH:
+				result = ustcmd_set_sock_path(opts.regex, *pidit);
+				if (result) {
+					ERR("error while trying to set sock path for PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
+				}
+				break;
+
+			case FORCE_SWITCH:
+				result = ustcmd_force_switch(*pidit);
+				if (result) {
+					ERR("error while trying to force switch for PID %u\n", (unsigned int) *pidit);
+					retval = EXIT_FAILURE;
+				}
 				break;
 
 			default:
 				ERR("unknown command\n");
-			break;
+				retval = EXIT_FAILURE;
+				break;
 		}
 
 		pidit++;
@@ -308,6 +388,6 @@ int main(int argc, char *argv[])
 		free(opts.regex);
 	}
 
-	return 0;
+	return retval;
 }