X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libustcomm%2Fustcomm.h;h=052c896aca17ad6561e4d84910e617d04ca8ae07;hb=b7619a864595a5511a498345635affe2547b91a0;hp=91ac80d442c80c16719b4c175ac797ab1eb1fb69;hpb=811e4b93ba6acb72226a9243ae9a525f444e7e80;p=lttng-ust.git

diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h
index 91ac80d4..052c896a 100644
--- a/libustcomm/ustcomm.h
+++ b/libustcomm/ustcomm.h
@@ -11,6 +11,7 @@ struct ustcomm_connection {
 	int fd;
 };
 
+/* ustcomm_server must be shallow-copyable */
 struct ustcomm_server {
 	/* the "server" socket for serving the external requests */
 	int listen_fd;
@@ -27,20 +28,26 @@ struct ustcomm_app {
 	struct ustcomm_server server;
 };
 
+/* ustcomm_source must be shallow-copyable */
 struct ustcomm_source {
 	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_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 nth_token_is(char *str, char *token, int tok_no);
 
 char *nth_token(char *str, int tok_no);