X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fustctl.h;h=33d7ade088b3dec0b6f1b7c4f49bfa4fe52d46ef;hb=b27f8e75a6e762ed01b889560431476516786d9f;hp=195ee26c13c2486ad3bbe8cb652f8d5de2c983b7;hpb=cacf036243594e11fc8a7e0f47f07af97a79042f;p=ust.git

diff --git a/include/ust/ustctl.h b/include/ust/ustctl.h
index 195ee26..33d7ade 100644
--- a/include/ust/ustctl.h
+++ b/include/ust/ustctl.h
@@ -36,11 +36,11 @@
 #define USTCTL_SOCK_PATH	"/tmp/socks/"
 
 /* Channel/marker/state/format string (cmsf) info. structure */
-struct marker_status {
-	char *channel; /* Channel name (end of marker_status array if NULL) */
-	char *marker; /* Marker name (end of marker_status array if NULL) */
+struct ust_marker_status {
+	char *channel; /* Channel name (end of ust_marker_status array if NULL) */
+	char *ust_marker; /* Marker name (end of ust_marker_status array if NULL) */
 	int state; /* State (0 := marker disabled, 1 := marker enabled) */
-	char *fs; /* Format string (end of marker_status array if NULL) */
+	char *fs; /* Format string (end of ust_marker_status array if NULL) */
 };
 
 struct trace_event_status {
@@ -48,29 +48,51 @@ struct trace_event_status {
 };
 
 extern pid_t *ustctl_get_online_pids(void);
-extern int ustctl_set_marker_state(const char *trace, const char *channel,
-				   const char *marker, int state, pid_t pid);
-extern int ustctl_set_subbuf_size(const char *trace, const char *channel,
-				  unsigned int subbuf_size, pid_t pid);
-extern int ustctl_set_subbuf_num(const char *trace, const char *channel,
-				 unsigned int num, pid_t pid);
-extern int ustctl_get_subbuf_size(const char *trace, const char *channel,
-				  pid_t pid);
-extern int ustctl_get_subbuf_num(const char *trace, const char *channel,
-				 pid_t pid);
-extern int ustctl_destroy_trace(const char *trace, pid_t pid);
-extern int ustctl_setup_and_start(const char *trace, pid_t pid);
-extern int ustctl_stop_trace(const char *trace, pid_t pid);
-extern int ustctl_create_trace(const char *trace, pid_t pid);
-extern int ustctl_start_trace(const char *trace, pid_t pid);
-extern int ustctl_alloc_trace(const char *trace, pid_t pid);
-extern int ustctl_free_cmsf(struct marker_status *);
-extern unsigned int ustctl_count_nl(const char *);
-extern int ustctl_get_cmsf(struct marker_status **, pid_t);
+
+extern int ustctl_connect_pid(pid_t pid);
+
+extern int ustctl_set_ust_marker_state(int sock, const char *trace,
+				   const char *channel, const char *ust_marker,
+				   int state);
+
+extern int ustctl_set_subbuf_size(int sock, const char *trace,
+				  const char *channel,
+				  unsigned int subbuf_size);
+
+extern int ustctl_set_subbuf_num(int sock, const char *trace,
+				 const char *channel,
+				 unsigned int num);
+
+extern int ustctl_get_subbuf_size(int sock, const char *trace,
+				  const char *channel);
+
+extern int ustctl_get_subbuf_num(pid_t pid, const char *trace,
+				 const char *channel);
+
+extern int ustctl_destroy_trace(int sock, const char *trace);
+
+extern int ustctl_setup_and_start(int sock, const char *trace);
+
+extern int ustctl_stop_trace(int sock, const char *trace);
+
+extern int ustctl_create_trace(int sock, const char *trace);
+
+extern int ustctl_start_trace(int sock, const char *trace);
+
+extern int ustctl_alloc_trace(int sock, const char *trace);
+
+extern int ustctl_free_cmsf(struct ust_marker_status *);
 extern int ustctl_free_tes(struct trace_event_status *);
-extern int ustctl_get_tes(struct trace_event_status **, pid_t);
-extern int ustctl_set_sock_path(const char *sock_path, pid_t pid);
-extern int ustctl_get_sock_path(char **sock_path, pid_t pid);
-extern int ustctl_force_switch(pid_t pid);
+extern unsigned int ustctl_count_nl(const char *);
+
+extern int ustctl_get_cmsf(int sock, struct ust_marker_status **);
+
+extern int ustctl_get_tes(int sock, struct trace_event_status **);
+
+extern int ustctl_set_sock_path(int sock, const char *sock_path);
+
+extern int ustctl_get_sock_path(int sock, char **sock_path);
+
+extern int ustctl_force_switch(int sock, const char *trace);
 
 #endif /* _USTCTL_H */