Merge branch 'master' of git://git.lttng.org/lttng-tools

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

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index d7fbcd5d0ee4378355e0b5492fe894e3e252c7aa..5bfecdb47deb0a8e2b2be9d872a5072f286cba3b 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -23,6 +23,10 @@
 
 #include "trace-ust.h"
 
+/* lttng-ust supported version. */
+#define LTTNG_UST_COMM_MAJOR          2        /* comm protocol major version */
+#define UST_APP_MAJOR_VERSION         2 /* UST version supported */
+
 #define UST_APP_EVENT_LIST_SIZE 32
 
 extern int ust_consumerd64_fd, ust_consumerd32_fd;
@@ -107,6 +111,10 @@ struct ust_app {
        uid_t uid;           /* User ID that owns the apps */
        gid_t gid;           /* Group ID that owns the apps */
        int bits_per_long;
+       int compatible; /* If the lttng-ust tracer version does not match the
+                                          supported version of the session daemon, this flag is
+                                          set to 0 (NOT compatible) else 1. */
+       struct lttng_ust_tracer_version version;
        uint32_t v_major;    /* Verion major number */
        uint32_t v_minor;    /* Verion minor number */
        char name[17];       /* Process name (short) */
@@ -165,6 +173,8 @@ void ust_app_clean_list(void);
 void ust_app_ht_alloc(void);
 struct lttng_ht *ust_app_get_ht(void);
 struct ust_app *ust_app_find_by_pid(pid_t pid);
+int ust_app_validate_version(int sock);
+int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
@@ -320,6 +330,16 @@ int ust_app_disable_event_pid(struct ltt_ust_session *usess,
 {
        return 0;
 }
+static inline
+int ust_app_validate_version(int sock)
+{
+       return 0;
+}
+static inline
+int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
+{
+       return 0;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */