Cygwin: Pass file paths instead of file descriptors over UNIX sockets

[lttng-ust.git] / include / ust-comm.h

diff --git a/include/ust-comm.h b/include/ust-comm.h
index deb0438bedd577179196c803dc7316243bcb7f53..0b80a0ce2d522c9381a716ee60b4253d67aee41e 100644 (file)
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -39,12 +39,13 @@
 #define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS       3000
 
 #define LTTNG_RUNDIR                        "/var/run/lttng"
+#define LTTNG_HOME_RUNDIR                   "%s/.lttng"
 
 /* Default unix socket path */
 #define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK     LTTNG_RUNDIR "/client-lttng-sessiond"
 #define DEFAULT_GLOBAL_APPS_UNIX_SOCK       LTTNG_RUNDIR "/apps-lttng-sessiond"
-#define DEFAULT_HOME_APPS_UNIX_SOCK         "%s/.apps-lttng-sessiond"
-#define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-lttng-sessiond"
+#define DEFAULT_HOME_APPS_UNIX_SOCK         LTTNG_HOME_RUNDIR "/apps-lttng-sessiond"
+#define DEFAULT_HOME_CLIENT_UNIX_SOCK       LTTNG_HOME_RUNDIR "/client-lttng-sessiond"
 
 #define DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH   "/lttng-ust-apps-wait"
 #define DEFAULT_HOME_APPS_WAIT_SHM_PATH     "/lttng-ust-apps-wait-%u"
@@ -129,7 +130,7 @@ struct ustcomm_ust_msg {
                struct lttng_ust_event event;
                struct lttng_ust_context context;
                struct lttng_ust_tracer_version version;
-               char tracepoint_list_entry[LTTNG_UST_SYM_NAME_LEN];
+               struct lttng_ust_tracepoint_iter tracepoint;
        } u;
 };
 
@@ -150,7 +151,7 @@ struct ustcomm_ust_reply {
                        uint64_t memory_map_size;
                } stream;
                struct lttng_ust_tracer_version version;
-               char tracepoint_list_entry[LTTNG_UST_SYM_NAME_LEN];
+               struct lttng_ust_tracepoint_iter tracepoint;
        } u;
 };
 
@@ -173,4 +174,8 @@ extern int ustcomm_send_app_cmd(int sock,
                struct ustcomm_ust_reply *lur);
 int ustcomm_recv_fd(int sock);
 
+/* Send/recv string over unix socket */
+extern ssize_t ustcomm_send_string(int sock, char *str, size_t len);
+extern char *ustcomm_recv_string(int sock);
+
 #endif /* _LTTNG_UST_COMM_H */