Cleanup: use tabs in ust-abi.h

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

diff --git a/include/ust-comm.h b/include/ust-comm.h
index fb0c0bbc773b854bfc97af19b93a18e5e7c1b914..49a55d2109e31b6ceca45a8fc09002b2f0e45220 100644 (file)
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -26,13 +26,17 @@
  * These declarations should NOT be considered stable API.
  */
 
+#include <stdint.h>
 #include <limits.h>
 #include <unistd.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-ctl.h>
-#include <config.h>
+
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
 
 /*
  * Default timeout the application waits for the sessiond to send its
@@ -84,6 +88,7 @@ struct ustcomm_ust_msg {
        uint32_t cmd;
        char padding[USTCOMM_MSG_PADDING1];
        union {
+               struct lttng_ust_event_notifier event_notifier;
                struct lttng_ust_channel channel;
                struct lttng_ust_stream stream;
                struct lttng_ust_event event;
@@ -98,6 +103,14 @@ struct ustcomm_ust_msg {
                struct {
                        uint32_t count; /* how many names follow */
                } LTTNG_PACKED exclusion;
+               struct {
+                       uint32_t data_size;     /* following capture data */
+                       uint32_t reloc_offset;
+                       uint64_t seqnum;
+               } LTTNG_PACKED capture;
+               struct lttng_ust_counter counter;
+               struct lttng_ust_counter_global counter_global;
+               struct lttng_ust_counter_cpu counter_cpu;
                char padding[USTCOMM_MSG_PADDING2];
        } u;
 } LTTNG_PACKED;
@@ -190,7 +203,8 @@ struct ustcomm_notify_channel_reply {
  */
 
 extern int ustcomm_create_unix_sock(const char *pathname);
-extern int ustcomm_connect_unix_sock(const char *pathname);
+extern int ustcomm_connect_unix_sock(const char *pathname,
+               long timeout);
 extern int ustcomm_accept_unix_sock(int sock);
 extern int ustcomm_listen_unix_sock(int sock);
 extern int ustcomm_close_unix_sock(int sock);
@@ -214,6 +228,13 @@ ssize_t ustcomm_recv_channel_from_sessiond(int sock,
 int ustcomm_recv_stream_from_sessiond(int sock,
                uint64_t *memory_map_size,
                int *shm_fd, int *wakeup_fd);
+ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock,
+               int *event_notifier_notif_fd);
+
+ssize_t ustcomm_recv_counter_from_sessiond(int sock,
+               void **counter_data, uint64_t len);
+int ustcomm_recv_counter_shm_from_sessiond(int sock,
+               int *shm_fd);
 
 /*
  * Returns 0 on success, negative error value on error.