From b9318b35947bbd6d3b2998b28d974c5e5bfabcf6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20Hall=C3=A9?= <alexis.halle@polymtl.ca>
Date: Wed, 14 Jul 2010 14:52:00 -0400
Subject: [PATCH] add a command to force subbuffer switch

---
 libust/tracectl.c  | 12 ++++++++++++
 libustcmd/ustcmd.c | 12 ++++++++++++
 libustcmd/ustcmd.h |  1 +
 ustctl/ustctl.c    | 10 ++++++++++
 4 files changed, 35 insertions(+)

diff --git a/libust/tracectl.c b/libust/tracectl.c
index 1b68444..a82c107 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -788,6 +788,15 @@ static void listener_cleanup(void *ptr)
 	ustcomm_fini_app(&ustcomm_app, 0);
 }
 
+static void do_cmd_force_switch()
+{
+	struct blocked_consumer *bc;
+
+	list_for_each_entry(bc, &blocked_consumers, list) {
+		ltt_force_switch(bc->buf, FORCE_FLUSH);
+	}
+}
+
 int process_client_cmd(char *recvbuf, struct ustcomm_source *src)
 {
 	int result;
@@ -1013,6 +1022,9 @@ int process_client_cmd(char *recvbuf, struct ustcomm_source *src)
 		if(result)
 			ERR("cannot set UST_DAEMON_SOCKET environment variable");
 	}
+	else if(nth_token_is(recvbuf, "force_switch", 0) == 1) {
+		do_cmd_force_switch();
+	}
 	else {
 		ERR("unable to parse message: %s", recvbuf);
 	}
diff --git a/libustcmd/ustcmd.c b/libustcmd/ustcmd.c
index 1c5894b..46a9561 100644
--- a/libustcmd/ustcmd.c
+++ b/libustcmd/ustcmd.c
@@ -470,6 +470,18 @@ int ustcmd_get_sock_path(char **sock_path, pid_t pid)
 	return 0;
 }
 
+int ustcmd_force_switch(pid_t pid)
+{
+	int result;
+
+	result = ustcmd_send_cmd("force_switch", pid, NULL);
+	if (result != 1) {
+		return USTCMD_ERR_GEN;
+	}
+
+	return 0;
+}
+
 /**
  * Sends a given command to a traceable process
  *
diff --git a/libustcmd/ustcmd.h b/libustcmd/ustcmd.h
index 06e5345..2e40d72 100644
--- a/libustcmd/ustcmd.h
+++ b/libustcmd/ustcmd.h
@@ -64,5 +64,6 @@ extern int ustcmd_send_cmd(const char *, pid_t, char **);
 extern int ustcmd_get_cmsf(struct marker_status **, pid_t);
 extern int ustcmd_set_sock_path(const char *, pid_t);
 extern int ustcmd_get_sock_path(char **, pid_t);
+extern int ustcmd_force_switch(pid_t);
 
 #endif /* _USTCMD_H */
diff --git a/ustctl/ustctl.c b/ustctl/ustctl.c
index 50e0d01..b9f2dce 100644
--- a/ustctl/ustctl.c
+++ b/ustctl/ustctl.c
@@ -42,6 +42,7 @@ enum command {
 	GET_SUBBUF_NUM,
 	GET_SOCK_PATH,
 	SET_SOCK_PATH,
+	FORCE_SWITCH,
 	UNKNOWN
 };
 
@@ -73,6 +74,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 +105,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 }
 		};
 
@@ -332,6 +335,13 @@ int main(int argc, char *argv[])
 				}
 				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;
-- 
2.34.1