X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Flogging.c;h=39b515ff9a9368f4c6b19cc4fd186b5b237954b7;hb=81b2d23800224648edd5850dd43b78d00b668a5e;hp=9841c68dbdc286be2d4c508b005eb4c4054fd477;hpb=d8621b3ea82b7fc1937b0eefb2b1316b2ce361a5;p=lttng-ust.git

diff --git a/src/common/logging.c b/src/common/logging.c
index 9841c68d..39b515ff 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -4,24 +4,110 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#include <urcu/compiler.h>
+#include <urcu/system.h>
+
 #include "common/logging.h"
 
-volatile enum ust_err_loglevel ust_err_loglevel;
+int lttng_ust_log_level = LTTNG_UST_LOG_LEVEL_UNKNOWN;
+int lttng_ust_log_critical_action = LTTNG_UST_LOG_CRITICAL_ACTION_UNKNOWN;
+
+/*
+ * Initialize the global log level from the "LTTNG_UST_DEBUG" environment
+ * variable.
+ *
+ * This could end up being called concurrently by multiple threads but doesn't
+ * require a mutex since the input is invariant across threads and the result
+ * will be the same.
+ */
+static
+void lttng_ust_logging_log_level_init(void)
+{
+	char *lttng_ust_debug;
+	int current_log_level;
+
+	current_log_level = CMM_LOAD_SHARED(lttng_ust_log_level);
+
+	/*
+	 * Check early if we are initialized, this is unlikely as it's already tested
+	 * in lttng_ust_logging_debug_enabled before performing lazy initialization.
+	 */
+	if (caa_unlikely(current_log_level != LTTNG_UST_LOG_LEVEL_UNKNOWN))
+		return;
+
+	/*
+	 * This getenv is not part of lttng_ust_getenv() because logging is
+	 * used in the getenv initialization and thus logging must be
+	 * initialized prior to getenv.
+	 */
+	lttng_ust_debug = getenv("LTTNG_UST_DEBUG");
+
+	/*
+	 * If the LTTNG_UST_DEBUG environment variable is defined, print all
+	 * messages, otherwise print nothing.
+	 */
+	if (lttng_ust_debug)
+		current_log_level = LTTNG_UST_LOG_LEVEL_DEBUG;
+	else
+		current_log_level = LTTNG_UST_LOG_LEVEL_SILENT;
+
+	/* Initialize the log level */
+	CMM_STORE_SHARED(lttng_ust_log_level, current_log_level);
+}
+
+/*
+ * Initialize the global log critical action from the "LTTNG_UST_ABORT_ON_CRITICAL"
+ * environment variable.
+ *
+ * This could end up being called concurrently by multiple threads but doesn't
+ * require a mutex since the input is invariant across threads and the result
+ * will be the same.
+ */
+static
+void lttng_ust_logging_log_critical_action_init(void)
+{
+	char *lttng_ust_abort_on_critical;
+	int current_log_critical_action;
+
+	current_log_critical_action = CMM_LOAD_SHARED(lttng_ust_log_critical_action);
+
+	/*
+	 * Check early if we are initialized, this is unlikely as it's already tested
+	 * in lttng_ust_logging_abort_on_critical_enabled before performing lazy initialization.
+	 */
+	if (caa_unlikely(current_log_critical_action != LTTNG_UST_LOG_CRITICAL_ACTION_UNKNOWN))
+		return;
+
+	/*
+	 * This getenv is not part of lttng_ust_getenv() because logging is
+	 * used in the getenv initialization and thus logging must be
+	 * initialized prior to getenv.
+	 */
+	lttng_ust_abort_on_critical = getenv("LTTNG_UST_ABORT_ON_CRITICAL");
 
-void ust_err_init(void)
+	/*
+	 * If the LTTNG_UST_ABORT_ON_CRITICAL environment variable is defined,
+	 * call abort() on CRIT(), otherwise take no action.
+	 */
+	if (lttng_ust_abort_on_critical)
+		current_log_critical_action = LTTNG_UST_LOG_CRITICAL_ACTION_ABORT;
+	else
+		current_log_critical_action = LTTNG_UST_LOG_CRITICAL_ACTION_NONE;
+
+	/* Initialize the log critical action */
+	CMM_STORE_SHARED(lttng_ust_log_critical_action, current_log_critical_action);
+}
+
+/*
+ * Initialize the global log level from the "LTTNG_UST_DEBUG" environment
+ * variable and the global log critical action from "LTTNG_UST_ABORT_ON_CRITICAL".
+ *
+ * This could end up being called concurrently by multiple threads but doesn't
+ * require a mutex since the input is invariant across threads and the result
+ * will be the same.
+ */
+void lttng_ust_logging_init(void)
 {
-	char *ust_debug;
-
-	if (ust_err_loglevel == UST_ERR_LOGLEVEL_UNKNOWN) {
-		/*
-		 * This getenv is not part of lttng_ust_getenv() because it
-		 * is required to print ERR() performed during getenv
-		 * initialization.
-		 */
-		ust_debug = getenv("LTTNG_UST_DEBUG");
-		if (ust_debug)
-			ust_err_loglevel = UST_ERR_LOGLEVEL_DEBUG;
-		else
-			ust_err_loglevel = UST_ERR_LOGLEVEL_NORMAL;
-	}
+	lttng_ust_logging_log_level_init();
+	lttng_ust_logging_log_critical_action_init();
 }