X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.h;h=721d1ab08ce66cf7ebcdd5ef6021f4e5fc9f0f07;hb=f3b9955d630dabdd0a297c12b53d3c3055dc8599;hp=fed2335904d90b5038efbcf1a64e2b47057290ca;hpb=ab33e65c8f105124ed19855105ed7196845616f6;p=ust.git

diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h
index fed2335..721d1ab 100644
--- a/libustcomm/ustcomm.h
+++ b/libustcomm/ustcomm.h
@@ -23,12 +23,16 @@
 
 #include "kcompat.h"
 
-#define SOCK_DIR "/tmp/socks"
+#define SOCK_DIR "/tmp/ust-app-socks"
 #define UST_SIGNAL SIGIO
 
 struct ustcomm_connection {
 	struct list_head list;
 	int fd;
+	/* Data that has not yet been consumed: */
+	char *recv_buf;
+	int recv_buf_size;
+	int recv_buf_alloc;
 };
 
 /* ustcomm_server must be shallow-copyable */
@@ -54,26 +58,32 @@ struct ustcomm_source {
 	void *priv;
 };
 
-char *strdup_malloc(const char *s);
+extern char *strdup_malloc(const char *s);
 
 //int send_message_pid(pid_t pid, const char *msg, char **reply);
-int ustcomm_request_consumer(pid_t pid, const char *channel);
+extern int ustcomm_request_consumer(pid_t pid, const char *channel);
 
-int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src, int timeout);
-int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src, int timeout);
+extern int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src, int timeout);
+extern int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src, int timeout);
 
-int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle);
+extern int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle);
+extern void ustcomm_fini_app(struct ustcomm_app *handle, int keep_socket_file);
+extern void ustcomm_fini_ustd(struct ustcomm_ustd *handle);
 
-int ustcomm_init_ustd(struct ustcomm_ustd *handle);
+extern int ustcomm_init_ustd(struct ustcomm_ustd *handle, const char *sock_path);
 
-int ustcomm_connect_app(pid_t pid, struct ustcomm_connection *conn);
-int ustcomm_send_request(struct ustcomm_connection *conn, char *req, char **reply);
-int ustcomm_send_reply(struct ustcomm_server *server, char *msg, struct ustcomm_source *src);
+extern int ustcomm_connect_app(pid_t pid, struct ustcomm_connection *conn);
+extern int ustcomm_close_app(struct ustcomm_connection *conn);
+extern int ustcomm_connect_path(const char *path, struct ustcomm_connection *conn, pid_t signalpid);
+extern int ustcomm_send_request(struct ustcomm_connection *conn, const char *req, char **reply);
+extern int ustcomm_send_reply(struct ustcomm_server *server, char *msg, struct ustcomm_source *src);
+extern int ustcomm_disconnect(struct ustcomm_connection *conn);
+extern int ustcomm_close_all_connections(struct ustcomm_server *server);
 
-int nth_token_is(char *str, char *token, int tok_no);
+extern int nth_token_is(const char *str, const char *token, int tok_no);
 
-char *nth_token(char *str, int tok_no);
+extern char *nth_token(const char *str, int tok_no);
 
-int pid_is_online(pid_t);
+extern int pid_is_online(pid_t);
 
 #endif /* USTCOMM_H */