diff options
Diffstat (limited to 'src/nm-logging.h')
| -rw-r--r-- | src/nm-logging.h | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/src/nm-logging.h b/src/nm-logging.h index 21263c7b..a824890a 100644 --- a/src/nm-logging.h +++ b/src/nm-logging.h @@ -54,10 +54,12 @@ LOGD_IP_from_af (int addr_family) /* A wrapper for the _nm_log_impl() function that adds call site information. * Contrary to nm_log(), it unconditionally calls the function without * checking whether logging for the given level and domain is enabled. */ -#define _nm_log(level, domain, error, ifname, con_uuid, ...) \ +#define _nm_log_mt(mt_require_locking, level, domain, error, ifname, con_uuid, ...) \ G_STMT_START { \ - _nm_log_impl (__FILE__, __LINE__, \ + _nm_log_impl (__FILE__, \ + __LINE__, \ _NM_LOG_FUNC, \ + (mt_require_locking), \ (level), \ (domain), \ (error), \ @@ -66,6 +68,9 @@ LOGD_IP_from_af (int addr_family) ""__VA_ARGS__); \ } G_STMT_END +#define _nm_log(level, domain, error, ifname, con_uuid, ...) \ + _nm_log_mt (!(NM_THREAD_SAFE_ON_MAIN_THREAD), level, domain, error, ifname, con_uuid, __VA_ARGS__) + /* nm_log() only evaluates its argument list after checking * whether logging for the given level/domain is enabled. */ #define nm_log(level, domain, ifname, con_uuid, ...) \ @@ -138,15 +143,35 @@ _nm_log_ptr_is_debug (NMLogLevel level) const char *nm_logging_level_to_string (void); const char *nm_logging_domains_to_string (void); +/*****************************************************************************/ + extern NMLogDomain _nm_logging_enabled_state[_LOGL_N_REAL]; + static inline gboolean -nm_logging_enabled (NMLogLevel level, NMLogDomain domain) +_nm_logging_enabled_lockfree (NMLogLevel level, NMLogDomain domain) { nm_assert (((guint) level) < G_N_ELEMENTS (_nm_logging_enabled_state)); return (((guint) level) < G_N_ELEMENTS (_nm_logging_enabled_state)) && !!(_nm_logging_enabled_state[level] & domain); } +gboolean _nm_logging_enabled_locking (NMLogLevel level, NMLogDomain domain); + +static inline gboolean +nm_logging_enabled_mt (gboolean mt_require_locking, NMLogLevel level, NMLogDomain domain) +{ + if (mt_require_locking) + return _nm_logging_enabled_locking (level, domain); + + NM_ASSERT_ON_MAIN_THREAD (); + return _nm_logging_enabled_lockfree (level, domain); +} + +#define nm_logging_enabled(level, domain) \ + nm_logging_enabled_mt (!(NM_THREAD_SAFE_ON_MAIN_THREAD), level, domain) + +/*****************************************************************************/ + NMLogLevel nm_logging_get_level (NMLogDomain domain); const char *nm_logging_all_levels_to_string (void); @@ -157,10 +182,11 @@ gboolean nm_logging_setup (const char *level, char **bad_domains, GError **error); -void nm_logging_set_syslog_identifier (const char *domain); -void nm_logging_set_prefix (const char *format, ...) _nm_printf (1, 2); +void nm_logging_init_pre (const char *syslog_identifier, + char *prefix_take); + +void nm_logging_init (const char *logging_backend, gboolean debug); -void nm_logging_syslog_openlog (const char *logging_backend, gboolean debug); gboolean nm_logging_syslog_enabled (void); /*****************************************************************************/ @@ -271,8 +297,6 @@ gboolean nm_logging_syslog_enabled (void); #define _LOG3t_err(errsv, ...) G_STMT_START { if (FALSE) { _NMLOG3_err (errsv, LOGL_TRACE, __VA_ARGS__); } } G_STMT_END #endif -extern void (*_nm_logging_clear_platform_logging_cache) (void); - /*****************************************************************************/ #define __NMLOG_DEFAULT(level, domain, prefix, ...) \ @@ -292,4 +316,8 @@ extern void (*_nm_logging_clear_platform_logging_cache) (void); _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ } G_STMT_END +/*****************************************************************************/ + +extern void _nm_logging_clear_platform_logging_cache (void); + #endif /* __NETWORKMANAGER_LOGGING_H__ */ |