X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust-comm.h;h=fb0c0bbc773b854bfc97af19b93a18e5e7c1b914;hb=4c70c05ca1c085156eba1c61c06f858885c63755;hp=efebbb2a73f830eb5f86adb6c247c528ce89ab19;hpb=c785c634a51956094130218c2bffeff32756cb69;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index efebbb2a..fb0c0bbc 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -40,7 +40,7 @@
  * variable "LTTNG_UST_REGISTER_TIMEOUT". Note that if the sessiond is not
  * found, the application proceeds directly without any delay.
  */
-#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS	3000
+#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS	CONFIG_LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS
 
 #define LTTNG_DEFAULT_RUNDIR				LTTNG_SYSTEM_RUNDIR
 #define LTTNG_DEFAULT_HOME_RUNDIR			".lttng"
@@ -260,6 +260,7 @@ int ustcomm_register_enum(int sock,
  * Returns -EPIPE or -ECONNRESET if other end has hung up.
  */
 int ustcomm_register_channel(int sock,
+	struct lttng_session *session,
 	int session_objd,		/* session descriptor */
 	int channel_objd,		/* channel descriptor */
 	size_t nr_ctx_fields,