X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng-ust-comm.h;h=2e5c7173c40668e6ca76c78d156aa911f660c020;hb=193183fb924aef705f30358e54e7386a3a64c78d;hp=0ae99ab4d01c214025ab16943f959caee1f7104f;hpb=11ff9c7d186237bf04d14ca05b2071bc0f12cae3;p=lttng-ust.git

diff --git a/include/lttng-ust-comm.h b/include/lttng-ust-comm.h
index 0ae99ab4..2e5c7173 100644
--- a/include/lttng-ust-comm.h
+++ b/include/lttng-ust-comm.h
@@ -31,11 +31,12 @@
 #include <ust/lttng-ust-abi.h>
 
 /*
- * TODO: allow override of constructor timeout with an environment
- * variable.
+ * Default timeout the application waits for the sessiond to send its
+ * "register done" command. Can be overridden with the environment
+ * variable "UST_REGISTER_TIMEOUT". Note that if the sessiond is not
+ * found, the application proceeds directly without any delay.
  */
-#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_S		3
-#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_NS	0
+#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS	3000
 
 #define LTTNG_RUNDIR                        "/var/run/lttng"
 
@@ -45,6 +46,9 @@
 #define DEFAULT_HOME_APPS_UNIX_SOCK         "%s/.apps-ltt-sessiond"
 #define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-ltt-sessiond"
 
+#define DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH   "/lttng-ust-apps-wait"
+#define DEFAULT_HOME_APPS_WAIT_SHM_PATH     "/lttng-ust-apps-wait-%u"
+
 /* Queue size of listen(2) */
 #define MAX_LISTEN 10
 
@@ -122,6 +126,7 @@ struct lttcomm_ust_msg {
 	union {
 		struct lttng_ust_tracer_version version;
 		struct lttng_ust_channel channel;
+		struct lttng_ust_stream stream;
 		struct lttng_ust_event event;
 		struct lttng_ust_context context;
 	} u;
@@ -137,6 +142,12 @@ struct lttcomm_ust_reply {
 	uint32_t ret_code;	/* enum enum lttcomm_return_code */
 	uint32_t ret_val;	/* return value */
 	union {
+		struct {
+			uint64_t memory_map_size;
+		} channel;
+		struct {
+			uint64_t memory_map_size;
+		} stream;
 	} u;
 };