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

diff --git a/ustctl/ustctl.c b/ustctl/ustctl.c
index 50e0d01..35bea7a 100644
--- a/ustctl/ustctl.c
+++ b/ustctl/ustctl.c
@@ -22,8 +22,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#include "ustcomm.h"
-#include "ustcmd.h"
+#include "ust/ustcmd.h"
 #include "usterr.h"
 
 enum command {
@@ -42,6 +41,7 @@ enum command {
 	GET_SUBBUF_NUM,
 	GET_SOCK_PATH,
 	SET_SOCK_PATH,
+	FORCE_SWITCH,
 	UNKNOWN
 };
 
@@ -73,6 +73,7 @@ Commands:\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\
 \
 ");
 }
@@ -103,6 +104,7 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
 			{ "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 }
 		};
 
@@ -145,7 +147,7 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
 	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 */
@@ -168,6 +170,7 @@ int main(int argc, char *argv[])
 {
 	pid_t *pidit;
 	int result;
+	int retval = EXIT_SUCCESS;
 	char *tmp;
 	struct ust_opts opts;
 
@@ -220,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;
@@ -228,6 +232,7 @@ 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;
 				}
 				break;
@@ -236,6 +241,7 @@ int main(int argc, char *argv[])
 				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;
 				}
 				break;
@@ -244,6 +250,7 @@ int main(int argc, char *argv[])
 				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;
 				}
 				break;
@@ -251,9 +258,8 @@ int main(int argc, char *argv[])
 			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;
@@ -271,26 +277,49 @@ 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:
-				ustcmd_set_subbuf_size(opts.regex, *pidit);
+				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:
-				ustcmd_set_subbuf_num(opts.regex, *pidit);
+				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;
 				}
 
@@ -301,6 +330,7 @@ int main(int argc, char *argv[])
 				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;
 				}
 
@@ -311,7 +341,7 @@ int main(int argc, char *argv[])
 				result = ustcmd_alloc_trace(*pidit);
 				if (result) {
 					ERR("error while trying to alloc trace with PID %u\n", (unsigned int) *pidit);
-					break;
+					retval = EXIT_FAILURE;
 				}
 				break;
 
@@ -319,6 +349,7 @@ int main(int argc, char *argv[])
 				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);
@@ -329,12 +360,22 @@ int main(int argc, char *argv[])
 				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++;
@@ -347,6 +388,6 @@ int main(int argc, char *argv[])
 		free(opts.regex);
 	}
 
-	return 0;
+	return retval;
 }