X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libustcomm%2Fustcomm.h;h=d48a115c896cf1ebe50f4669334468613ea9c646;hb=957f86e7e03c9cce749ac96e65749209247e4382;hp=53ced5140c962d604fc50992350db50dda48ba6b;hpb=b02e31e53039229b50d2f54ee31d68709aba1412;p=lttng-ust.git

diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h
index 53ced514..d48a115c 100644
--- a/libustcomm/ustcomm.h
+++ b/libustcomm/ustcomm.h
@@ -4,31 +4,52 @@
 #include <sys/types.h>
 #include <sys/un.h>
 
-struct ustcomm_app {
-	/* the "server" socket for serving the external requests */
+#include "kcompat.h"
+
+struct ustcomm_connection {
+	struct list_head list;
 	int fd;
-	char *socketpath;
 };
 
-struct ustcomm_ustd {
+/* ustcomm_server must be shallow-copyable */
+struct ustcomm_server {
 	/* the "server" socket for serving the external requests */
-	int fd;
+	int listen_fd;
 	char *socketpath;
+
+	struct list_head connections;
+};
+
+struct ustcomm_ustd {
+	struct ustcomm_server server;
+};
+
+struct ustcomm_app {
+	struct ustcomm_server server;
 };
 
+/* ustcomm_source must be shallow-copyable */
 struct ustcomm_source {
-	struct sockaddr_un addr;
+	int fd;
+	void *priv;
 };
 
-int send_message(pid_t pid, const char *msg, char **reply);
+char *strdup_malloc(const char *s);
 
-int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src);
-int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src);
+//int send_message_pid(pid_t pid, const char *msg, char **reply);
+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);
 
 int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle);
 
 int ustcomm_init_ustd(struct ustcomm_ustd *handle);
 
+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);
+
 int nth_token_is(char *str, char *token, int tok_no);
 
 char *nth_token(char *str, int tok_no);