X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ustctl%2Fustctl.c;h=b9f2dce83b43913bc6aaedd766d160d9a81accdb;hb=b9318b35947bbd6d3b2998b28d974c5e5bfabcf6;hp=ae7e318a1907e800d13dc9ca89c3b87c961cca3b;hpb=4ed9f99d71822f829c47a5f9b85a1c9f6eb1f32e;p=ust.git

diff --git a/ustctl/ustctl.c b/ustctl/ustctl.c
index ae7e318..b9f2dce 100644
--- a/ustctl/ustctl.c
+++ b/ustctl/ustctl.c
@@ -38,6 +38,11 @@ enum command {
 	GET_ONLINE_PIDS,
 	SET_SUBBUF_SIZE,
 	SET_SUBBUF_NUM,
+	GET_SUBBUF_SIZE,
+	GET_SUBBUF_NUM,
+	GET_SOCK_PATH,
+	SET_SOCK_PATH,
+	FORCE_SWITCH,
 	UNKNOWN
 };
 
@@ -62,9 +67,14 @@ Commands:\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\
 \
 ");
 }
@@ -91,6 +101,11 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
 			{ "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 }
 		};
 
@@ -113,6 +128,9 @@ int parse_opts_long(int argc, char **argv, struct ust_opts *opts)
 		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;
 
@@ -153,6 +171,7 @@ int main(int argc, char *argv[])
 {
 	pid_t *pidit;
 	int result;
+	char *tmp;
 	struct ust_opts opts;
 
 	progname = argv[0];
@@ -271,6 +290,26 @@ int main(int argc, char *argv[])
 				ustcmd_set_subbuf_num(opts.regex, *pidit);
 				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);
+					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);
+					break;
+				}
+
+				printf("the number of subbufers is %d\n", result);
+				break;
+
 			case ALLOC_TRACE:
 				result = ustcmd_alloc_trace(*pidit);
 				if (result) {
@@ -279,6 +318,30 @@ int main(int argc, char *argv[])
 				}
 				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);
+					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);
+				}
+				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);
+				}
+				break;
+
 			default:
 				ERR("unknown command\n");
 			break;