remove dependency on ustcomm.h where possible

[ust.git] / libustcmd / ustcmd.h

diff --git a/libustcmd/ustcmd.h b/libustcmd/ustcmd.h
index 8bca50974bb03c572422382eba5ead88b9f01210..60f5018b1076346856b1d6d2aa8dd2163f34ded4 100644 (file)
--- a/libustcmd/ustcmd.h
+++ b/libustcmd/ustcmd.h
@@ -1,3 +1,20 @@
+/* Copyright (C) 2009  Pierre-Marc Fournier
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
 #ifndef _USTCMD_H
 #define _USTCMD_H
 
@@ -7,9 +24,6 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#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 */
@@ -22,22 +36,31 @@
 #define USTCMD_SOCK_PATH       "/tmp/socks/"
 
 /* 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) */
+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 USTcmd_cmsf array if NULL) */
+       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);
+extern pid_t *ustcmd_get_online_pids(void);
+extern int ustcmd_set_marker_state(const char *, int, pid_t);
+extern int ustcmd_set_subbuf_size(const char *, pid_t);
+extern int ustcmd_set_subbuf_num(const char *, pid_t);
+extern int ustcmd_get_subbuf_size(const char *, pid_t);
+extern int ustcmd_get_subbuf_num(const char *, 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_alloc_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);
+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 */