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

diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h
index 53ced51..17bd9c1 100644
--- a/libustcomm/ustcomm.h
+++ b/libustcomm/ustcomm.h
@@ -1,34 +1,72 @@
+/* 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 USTCOMM_H
 #define USTCOMM_H
 
 #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);