Fix: support -std=c99 in tracepoint macros

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

diff --git a/include/ust-comm.h b/include/ust-comm.h
index deb0438bedd577179196c803dc7316243bcb7f53..9d2643df129c373176f994c4d4131fb6dd1e4036 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,10 +151,15 @@ 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;
 };
 
+/*
+ * LTTNG_UST_TRACEPOINT_FIELD_LIST reply is followed by a
+ * struct lttng_ust_field_iter field.
+ */
+
 extern int ustcomm_create_unix_sock(const char *pathname);
 extern int ustcomm_connect_unix_sock(const char *pathname);
 extern int ustcomm_accept_unix_sock(int sock);