X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libustcmd%2Fustcmd.h;h=a494bcff3b94068ff5595ea76a8546cac881a544;hb=27e84572611e54fa1158f72bdd18482e0385ae47;hp=ad6c531864f3134fdb3eb552c133eafc393f96c5;hpb=ab33e65c8f105124ed19855105ed7196845616f6;p=ust.git

diff --git a/libustcmd/ustcmd.h b/libustcmd/ustcmd.h
index ad6c531..a494bcf 100644
--- a/libustcmd/ustcmd.h
+++ b/libustcmd/ustcmd.h
@@ -10,34 +10,35 @@
 #include "ustcomm.h"
 #include "ustcmd.h"
 
-#define USTCMD_ERR_CONN		1 // Process connection error 
-#define USTCMD_ERR_ARG		2 // Invalid function argument
-#define USTCMD_ERR_GEN		3 // General ustcmd error
-
-#define USTCMD_MS_CHR_OFF	'0' // Marker state 'on' character
-#define USTCMD_MS_CHR_ON	'1' // Marker state 'on' character
-#define USTCMD_MS_OFF		0 // Marker state 'on' value
-#define USTCMD_MS_ON		1 // Marker state 'on' value
-
-#define USTCMD_SOCK_PATH	"/tmp/socks/" // UST sockets directory
-
-// Channel/marker/state/format string (cmsf) info. structure
-struct USTcmd_cmsf {
-	char* channel; // Channel name (end of USTcmd_cmsf array if NULL)
-	char* marker; // Marker name (end of USTcmd_cmsf array if NULL)
-	int state; // State (0 := marker disabled, 1 := marker enabled)
-	char* fs; // Format string (end of USTcmd_cmsf array if NULL)
+#define USTCMD_ERR_CONN		1 /* Process connection error */
+#define USTCMD_ERR_ARG		2 /* Invalid function argument */
+#define USTCMD_ERR_GEN		3 /* General ustcmd error */
+
+#define USTCMD_MS_CHR_OFF	'0' /* Marker state 'on' character */
+#define USTCMD_MS_CHR_ON	'1' /* Marker state 'on' character */
+#define USTCMD_MS_OFF		0   /* Marker state 'on' value */
+#define USTCMD_MS_ON		1   /* Marker state 'on' value */
+
+#define USTCMD_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) */
+	int state; /* State (0 := marker disabled, 1 := marker enabled) */
+	char *fs; /* Format string (end of marker_status array if NULL) */
 };
 
-pid_t* ustcmd_get_online_pids(void);
-int ustcmd_set_marker_state(const char*, int, pid_t);
-int ustcmd_destroy_trace(pid_t);
-int ustcmd_setup_and_start(pid_t);
-int ustcmd_stop_trace(pid_t);
-int ustcmd_start_trace(pid_t);
-int ustcmd_free_cmsf(struct USTcmd_cmsf*);
-unsigned int ustcmd_count_nl(const char*);
-int ustcmd_shoot(const char*, pid_t, char**);
-int ustcmd_get_cmsf(struct USTcmd_cmsf**, pid_t);
-
-#endif // _USTCMD_H
+extern pid_t *ustcmd_get_online_pids(void);
+extern int ustcmd_set_marker_state(const char *, int, pid_t);
+extern int ustcmd_destroy_trace(pid_t);
+extern int ustcmd_setup_and_start(pid_t);
+extern int ustcmd_stop_trace(pid_t);
+extern int ustcmd_create_trace(pid_t);
+extern int ustcmd_start_trace(pid_t);
+extern int ustcmd_free_cmsf(struct marker_status *);
+extern unsigned int ustcmd_count_nl(const char *);
+extern int ustcmd_send_cmd(const char *, pid_t, char **);
+extern int ustcmd_get_cmsf(struct marker_status **, pid_t);
+
+#endif /* _USTCMD_H */