put shared variables into thread-local storage

This doesn't solve the general design problem of the log.c (eg; some log lines got lost or scattered into multiple files) but at least prevent multithreaded code from crashing. Before this change something like following; sudo src/tests/lxc-test-concurrent -i 10 -j 20 was crashing nearly all the time due to 3afbcc46 as we started to set lxc.loglevel and lxc.logfile with that commit. Signed-off-by: S.Çağlar Onur <caglar@10ur.org> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

put shared variables into thread-local storage
6485e01d · S.Çağlar Onur · Stéphane Graber · 88895aba · 6485e01d
Commit 6485e01d authored Mar 06, 2014 by S.Çağlar Onur Committed by Stéphane Graber Mar 07, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

log.c src/lxc/log.c +10 -0

No files found.
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -41,6 +41,15 @@
 #define LXC_LOG_BUFFER_SIZE	512
 int lxc_log_fd = -1;
+#ifdef HAVE_TLS
+static __thread char log_prefix[LXC_LOG_PREFIX_SIZE] = "lxc";
+static __thread char *log_fname = NULL;
+/* command line values for logfile or logpriority should always override
+ * values from the configuration file or defaults
+ */
+static __thread int lxc_logfile_specified = 0;
+static __thread int lxc_loglevel_specified = 0;
+#else
 static char log_prefix[LXC_LOG_PREFIX_SIZE] = "lxc";
 static char *log_fname = NULL;
 /* command line values for logfile or logpriority should always override
@@ -48,6 +57,7 @@ static char *log_fname = NULL;
 */
 static int lxc_logfile_specified = 0;
 static int lxc_loglevel_specified = 0;
+#endif
 lxc_log_define(lxc_log, lxc);