Commit 2c529221 by S.Çağlar Onur Committed by Stéphane Graber

add shared lxc_log_fd into TLS

parent 6485e01d
......@@ -40,8 +40,8 @@
#define LXC_LOG_PREFIX_SIZE 32
#define LXC_LOG_BUFFER_SIZE 512
int lxc_log_fd = -1;
#ifdef HAVE_TLS
__thread int lxc_log_fd = -1;
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
......@@ -50,6 +50,7 @@ static __thread char *log_fname = NULL;
static __thread int lxc_logfile_specified = 0;
static __thread int lxc_loglevel_specified = 0;
#else
int lxc_log_fd = -1;
static char log_prefix[LXC_LOG_PREFIX_SIZE] = "lxc";
static char *log_fname = NULL;
/* command line values for logfile or logpriority should always override
......
......@@ -24,6 +24,8 @@
#ifndef _log_h
#define _log_h
#include "config.h"
#include <stdarg.h>
#include <stdio.h>
#include <sys/time.h>
......@@ -285,7 +287,11 @@ static inline void LXC_##PRIORITY(struct lxc_log_locinfo* locinfo, \
ERROR("%s - " format, strerror(errno), ##__VA_ARGS__); \
} while (0)
#ifdef HAVE_TLS
extern __thread int lxc_log_fd;
#else
extern int lxc_log_fd;
#endif
extern int lxc_log_init(const char *name, const char *file,
const char *priority, const char *prefix, int quiet,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment