Fix: ustcomm: application name uses the '-ust'-suffixed thread name

[lttng-ust.git] / src / common / ustcomm.h

diff --git a/src/common/ustcomm.h b/src/common/ustcomm.h
index 81ce885dc460cb76b3eb6208627f3ece0009757d..734757c3a65acfde66072152119adee4e364775f 100644 (file)
--- a/src/common/ustcomm.h
+++ b/src/common/ustcomm.h
@@ -11,8 +11,8 @@
  * These declarations should NOT be considered stable API.
  */
 
-#ifndef _UST_COMMON_USTCOMM_H
-#define _UST_COMMON_USTCOMM_H
+#ifndef _UST_COMMON_UST_COMM_H
+#define _UST_COMMON_UST_COMM_H
 
 #include <stdint.h>
 #include <limits.h>
@@ -43,7 +43,7 @@ struct lttng_ust_enum_entry;
 struct lttng_integer_type;
 struct lttng_ust_session;
 
-struct ustctl_reg_msg {
+struct lttng_ust_ctl_reg_msg {
        uint32_t magic;
        uint32_t major;
        uint32_t minor;
@@ -57,7 +57,7 @@ struct ustctl_reg_msg {
        uint32_t uint32_t_alignment;
        uint32_t uint64_t_alignment;
        uint32_t long_alignment;
-       uint32_t socket_type;                   /* enum ustctl_socket_type */
+       uint32_t socket_type;                   /* enum lttng_ust_ctl_socket_type */
        char name[LTTNG_UST_ABI_PROCNAME_LEN];  /* process name */
        char padding[LTTNG_UST_COMM_REG_MSG_PADDING];
 } __attribute__((packed));
@@ -185,7 +185,7 @@ struct ustcomm_notify_channel_msg {
 struct ustcomm_notify_channel_reply {
        int32_t ret_code;       /* 0: ok, negative: error code */
        uint32_t chan_id;
-       uint32_t header_type;   /* enum ustctl_channel_header */
+       uint32_t header_type;   /* enum lttng_ust_ctl_channel_header */
        char padding[USTCOMM_NOTIFY_CHANNEL_REPLY_PADDING];
 } __attribute__((packed));
 
@@ -207,6 +207,9 @@ int ustcomm_accept_unix_sock(int sock)
 int ustcomm_listen_unix_sock(int sock)
        __attribute__((visibility("hidden")));
 
+int ustcomm_shutdown_unix_sock(int sock)
+       __attribute__((visibility("hidden")));
+
 int ustcomm_close_unix_sock(int sock)
        __attribute__((visibility("hidden")));
 
@@ -266,13 +269,14 @@ int ustcomm_recv_counter_shm_from_sessiond(int sock,
  * Returns -EPIPE or -ECONNRESET if other end has hung up.
  */
 int ustcomm_send_reg_msg(int sock,
-               enum ustctl_socket_type type,
+               enum lttng_ust_ctl_socket_type type,
                uint32_t bits_per_long,
                uint32_t uint8_t_alignment,
                uint32_t uint16_t_alignment,
                uint32_t uint32_t_alignment,
                uint32_t uint64_t_alignment,
-               uint32_t long_alignment)
+               uint32_t long_alignment,
+               const char *procname)
        __attribute__((visibility("hidden")));
 
 /*
@@ -287,7 +291,7 @@ int ustcomm_register_event(int sock,
        int loglevel,
        const char *signature,          /* event signature (input) */
        size_t nr_fields,               /* fields */
-       const struct lttng_ust_event_field **fields,
+       const struct lttng_ust_event_field * const *fields,
        const char *model_emf_uri,
        uint32_t *id)                   /* event id (output) */
        __attribute__((visibility("hidden")));
@@ -300,7 +304,7 @@ int ustcomm_register_enum(int sock,
        int session_objd,               /* session descriptor */
        const char *enum_name,          /* enum name (input) */
        size_t nr_entries,              /* entries */
-       const struct lttng_ust_enum_entry **entries,
+       const struct lttng_ust_enum_entry * const *entries,
        uint64_t *id)                   /* enum id (output) */
        __attribute__((visibility("hidden")));
 
@@ -324,4 +328,4 @@ int ustcomm_setsockopt_rcv_timeout(int sock, unsigned int msec)
 int ustcomm_setsockopt_snd_timeout(int sock, unsigned int msec)
        __attribute__((visibility("hidden")));
 
-#endif /* _UST_COMMON_USTCOMM_H */
+#endif /* _UST_COMMON_UST_COMM_H */