Implement 32/64 bit consumer support

[lttng-tools.git] / lttng-sessiond / ust-app.h

diff --git a/lttng-sessiond/ust-app.h b/lttng-sessiond/ust-app.h
index 14e04c121510157ebbfa896ffed43794c84513d7..ec6bafdfed38aaabafeeca25a71b3fcd484d5cea 100644 (file)
--- a/lttng-sessiond/ust-app.h
+++ b/lttng-sessiond/ust-app.h
@@ -26,7 +26,7 @@
 
 #define UST_APP_EVENT_LIST_SIZE 32
 
-extern int ust_consumer_fd;
+extern int ust_consumerd64_fd, ust_consumerd32_fd;
 
 /*
  * Application registration data structure.
@@ -38,6 +38,7 @@ struct ust_register_msg {
        pid_t ppid;
        uid_t uid;
        gid_t gid;
+       uint32_t bits_per_long;
        char name[16];
 };
 
@@ -78,12 +79,14 @@ struct ust_app_channel {
 
 struct ust_app_session {
        int enabled;
+       /* started: has the session been in started state at any time ? */
+       int started;  /* allows detection of start vs restart. */
        int handle;   /* Used has unique identifier */
        unsigned int uid;
        struct ltt_ust_metadata *metadata;
-       struct lttng_ust_object_data *obj;
        struct cds_lfht *channels; /* Registered channels */
        struct cds_lfht_node node;
+       char path[PATH_MAX];
 };
 
 /*
@@ -93,14 +96,14 @@ struct ust_app_session {
 struct ust_app {
        pid_t ppid;
        uid_t uid;           /* User ID that owns the apps */
-       gid_t gid;           /* Group ID that owns the apps */
+       gid_t gid;           /* Group ID that owns the apps */  
+       int bits_per_long;
        uint32_t v_major;    /* Verion major number */
        uint32_t v_minor;    /* Verion minor number */
        char name[17];       /* Process name (short) */
        struct cds_lfht *sessions;
        struct cds_lfht_node node;
        struct ust_app_key key;
-       int sock_closed;
 };
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
@@ -113,7 +116,11 @@ int ust_app_create_event_all(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
 unsigned long ust_app_list_count(void);
 int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app);
+int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app);
 int ust_app_start_trace_all(struct ltt_ust_session *usess);
+int ust_app_stop_trace_all(struct ltt_ust_session *usess);
+int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app);
+int ust_app_destroy_trace_all(struct ltt_ust_session *usess);
 int ust_app_list_events(struct lttng_event **events);
 void ust_app_global_update(struct ltt_ust_session *usess, int sock);