X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fdefaults.h;h=78ac2c2d8711ea547ad076c6b70a99f4365a5fe8;hb=17136d8c6c88034daa1f214ee1716c59d6e4fd95;hp=5df5127b38a342890a6dddd523de1349d43c5cd0;hpb=e5148e25a481691b3278cd85a6ff25c1e25e4d2e;p=lttng-tools.git

diff --git a/src/common/defaults.h b/src/common/defaults.h
index 5df5127b3..78ac2c2d8 100644
--- a/src/common/defaults.h
+++ b/src/common/defaults.h
@@ -205,9 +205,10 @@
 #define DEFAULT_METADATA_SUBBUF_SIZE    CONFIG_DEFAULT_METADATA_SUBBUF_SIZE
 #define DEFAULT_METADATA_SUBBUF_NUM     CONFIG_DEFAULT_METADATA_SUBBUF_NUM
 #define DEFAULT_METADATA_CACHE_SIZE     CONFIG_DEFAULT_METADATA_CACHE_SIZE
-#define DEFAULT_METADATA_SWITCH_TIMER	CONFIG_DEFAULT_METADATA_SWITCH_TIMER
-#define DEFAULT_METADATA_READ_TIMER	CONFIG_DEFAULT_METADATA_READ_TIMER
-#define DEFAULT_METADATA_OUTPUT			_DEFAULT_CHANNEL_OUTPUT
+#define DEFAULT_METADATA_SWITCH_TIMER	0
+#define DEFAULT_METADATA_READ_TIMER	0
+#define DEFAULT_METADATA_OVERWRITE 	0
+#define DEFAULT_METADATA_OUTPUT		LTTNG_EVENT_MMAP
 
 /* Kernel has different defaults */
 
@@ -284,7 +285,7 @@
  * Wait period before retrying the lttng_data_pending command in the lttng
  * stop command of liblttng-ctl.
  */
-#define DEFAULT_DATA_AVAILABILITY_WAIT_TIME 200000  /* usec */
+#define DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US 200000  /* usec */
 
 /*
  * Wait period before retrying the lttng_consumer_flushed_cache when
@@ -333,6 +334,9 @@
 /* Default maximal size of message notification channel message payloads. */
 #define DEFAULT_MAX_NOTIFICATION_CLIENT_MESSAGE_PAYLOAD_SIZE	65536
 
+/* Default maximal size of trace archive location. */
+#define DEFAULT_MAX_TRACE_ARCHIVE_LOCATION_PAYLOAD_SIZE		65536
+
 /* Default maximal size of message notification channel message payloads. */
 #define DEFAULT_CLIENT_MAX_QUEUED_NOTIFICATIONS_COUNT		100