switch from kcompat lists to urcu lists

[ust.git] / libustcomm / ustcomm.h

diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h
index fed2335904d90b5038efbcf1a64e2b47057290ca..841d67872027786e7d6ec319ea4fed763568bee9 100644 (file)
--- a/libustcomm/ustcomm.h
+++ b/libustcomm/ustcomm.h
@@ -20,15 +20,21 @@
 
 #include <sys/types.h>
 #include <sys/un.h>
+#include <urcu/list.h>
 
 #include "kcompat.h"
+#include "multipoll.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 +60,38 @@ struct ustcomm_source {
        void *priv;
 };
 
-char *strdup_malloc(const char *s);
+struct ustcomm_multipoll_conn_info {
+       struct ustcomm_connection *conn;
+       int (*cb)(char *msg, struct ustcomm_source *src);
+};
+
+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);
+extern void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(struct ustcomm_connection *conn, char *msg));
 
-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 */