X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fdefaults.h;h=2232d5d402f6eb43b6ee4cb00bfafbb53e498d3a;hb=d73c58020df7ccd20d1edd250b0f00f0d7d25b5b;hp=0682af63df6eb4904698c5aa0b9b99f8f5a61027;hpb=0475c50c4d3d2cea973fe4d1f17875d231dea96c;p=lttng-tools.git

diff --git a/src/common/defaults.h b/src/common/defaults.h
index 0682af63d..2232d5d40 100644
--- a/src/common/defaults.h
+++ b/src/common/defaults.h
@@ -88,6 +88,7 @@
 #define DEFAULT_LTTNG_RUNDIR                    CONFIG_LTTNG_SYSTEM_RUNDIR
 #define DEFAULT_LTTNG_HOME_RUNDIR               "%s/.lttng"
 #define DEFAULT_LTTNG_SESSIOND_PIDFILE          "lttng-sessiond.pid"
+#define DEFAULT_LTTNG_SESSIOND_JULPORT_FILE     "jul.port"
 
 /* Default unix socket path */
 #define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK         DEFAULT_LTTNG_RUNDIR "/client-lttng-sessiond"
@@ -107,6 +108,13 @@
 #define DEFAULT_GLOBAL_RELAY_HEALTH_UNIX_SOCK		DEFAULT_LTTNG_RUNDIR "/relayd/health-%d"
 #define DEFAULT_HOME_RELAY_HEALTH_UNIX_SOCK		DEFAULT_LTTNG_HOME_RUNDIR "/relayd/health-%d"
 
+/* Default daemon configuration file path */
+#define DEFAULT_DAEMON_CONFIG_FILE              "lttng.conf"
+#define DEFAULT_DAEMON_HOME_CONFIGPATH          DEFAULT_LTTNG_HOME_RUNDIR "/" \
+	DEFAULT_DAEMON_CONFIG_FILE
+#define DEFAULT_DAEMON_SYSTEM_CONFIGPATH        CONFIG_LTTNG_SYSTEM_CONFIGDIR \
+	"/lttng/" DEFAULT_DAEMON_CONFIG_FILE
+
 #define DEFAULT_GLOBAL_APPS_UNIX_SOCK \
 	DEFAULT_LTTNG_RUNDIR "/" LTTNG_UST_SOCK_FILENAME
 #define DEFAULT_HOME_APPS_UNIX_SOCK \
@@ -133,7 +141,9 @@
 /* Default channel attributes */
 #define DEFAULT_CHANNEL_NAME            "channel0"
 /* Default JUL domain channel name. */
-#define DEFAULT_JUL_CHANNEL_NAME        "jul_channel"
+#define DEFAULT_JUL_CHANNEL_NAME        "lttng_jul_channel"
+/* Default JUL tracepoint name. This is a wildcard for the JUL domain. */
+#define DEFAULT_JUL_EVENT_NAME          "lttng_jul*"
 /* JUL default channel name. */
 #define DEFAULT_CHANNEL_OVERWRITE       0
 #define DEFAULT_CHANNEL_TRACEFILE_SIZE  0
@@ -203,6 +213,9 @@
 #define DEFAULT_NETWORK_DATA_PORT           5343
 #define DEFAULT_NETWORK_VIEWER_PORT         5344
 
+/* JUL registration TCP port. */
+#define DEFAULT_JUL_TCP_PORT                5345
+
 /*
  * If a thread stalls for this amount of time, it will be considered bogus (bad
  * health).
@@ -244,6 +257,9 @@
 #define DEFAULT_INDEX_FILE_SUFFIX			".idx"
 #define DEFAULT_INDEX_DIR					"index"
 
+/* Default lttng command live timer value in usec. */
+#define DEFAULT_LTTNG_LIVE_TIMER			1000000
+
 extern size_t default_channel_subbuf_size;
 extern size_t default_metadata_subbuf_size;
 extern size_t default_ust_pid_channel_subbuf_size;