X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng-ust-comm.h;h=0ae99ab4d01c214025ab16943f959caee1f7104f;hb=11ff9c7d186237bf04d14ca05b2071bc0f12cae3;hp=b594367ddd3b6a65c9f5fb1ccdc7e1a6b09b9f8e;hpb=1ea11eab9f65504b2d217ef16f53f52ff941c630;p=lttng-ust.git

diff --git a/include/lttng-ust-comm.h b/include/lttng-ust-comm.h
index b594367d..0ae99ab4 100644
--- a/include/lttng-ust-comm.h
+++ b/include/lttng-ust-comm.h
@@ -30,6 +30,13 @@
 #include <lttng/lttng.h>
 #include <ust/lttng-ust-abi.h>
 
+/*
+ * TODO: allow override of constructor timeout with an environment
+ * variable.
+ */
+#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_S		3
+#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_NS	0
+
 #define LTTNG_RUNDIR                        "/var/run/lttng"
 
 /* Default unix socket path */
@@ -46,32 +53,6 @@
  */
 #define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
 
-enum lttcomm_ust_command {
-	UST_CREATE_SESSION,
-	UST_VERSION,
-	UST_LIST_TRACEPOINTS,
-	UST_WAIT_QUIESCENT,
-	UST_CALIBRATE,
-
-	/* Apply on session handle */
-	UST_METADATA,	/* release with UST_RELEASE_CHANNEL */
-	UST_CHANNEL,
-	UST_SESSION_START,
-	UST_SESSION_STOP,
-
-	/* Apply on channel handle */
-	UST_STREAM,
-	UST_EVENT,
-
-	/* Apply on event and channel handle */
-	UST_CONTEXT,
-
-	/* Apply on event, channel and session handle */
-	UST_RELEASE,
-	UST_ENABLE,
-	UST_DISABLE,
-};
-
 /*
  * lttcomm error code.
  */
@@ -136,8 +117,8 @@ enum lttcomm_return_code {
  * Data structure for the commands sent from sessiond to UST.
  */
 struct lttcomm_ust_msg {
-	uint32_t cmd_type;    /* enum lttcomm_ust_command */
 	uint32_t handle;
+	uint32_t cmd;
 	union {
 		struct lttng_ust_tracer_version version;
 		struct lttng_ust_channel channel;
@@ -151,7 +132,8 @@ struct lttcomm_ust_msg {
  * cmd_type is sent back in the reply for validation.
  */
 struct lttcomm_ust_reply {
-	uint32_t cmd_type;	/* enum lttcomm_sessiond_command */
+	uint32_t handle;
+	uint32_t cmd;
 	uint32_t ret_code;	/* enum enum lttcomm_return_code */
 	uint32_t ret_val;	/* return value */
 	union {