X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust-comm.h;h=10dbca2148c9e3f178c97517aa6cd501516b8099;hb=db56acaff475812dfd774a52b3d54eae5c115315;hp=7f363d402f7c57b9e7ebc179acc29fc35b08970c;hpb=53569322d40ed45abe0368ddb08eb4a2738afc37;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index 7f363d40..10dbca21 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -34,13 +34,17 @@
 #include <lttng/ust-ctl.h>
 #include <config.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 /*
  * Default timeout the application waits for the sessiond to send its
  * "register done" command. Can be overridden with the environment
  * 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"
@@ -190,7 +194,8 @@ struct ustcomm_notify_channel_reply {
  */
 
 extern int ustcomm_create_unix_sock(const char *pathname);
-extern int ustcomm_connect_unix_sock(const char *pathname);
+extern int ustcomm_connect_unix_sock(const char *pathname,
+		long timeout);
 extern int ustcomm_accept_unix_sock(int sock);
 extern int ustcomm_listen_unix_sock(int sock);
 extern int ustcomm_close_unix_sock(int sock);