No OneTemporary
Actions

Size

70 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/include/qb/qblog.h b/include/qb/qblog.h
	index 0abb90e..4913c4b 100644
	--- a/include/qb/qblog.h
	+++ b/include/qb/qblog.h
	@@ -1,682 +1,713 @@
	/*
	* Copyright (C) 2010 Red Hat, Inc.
	*
	* All rights reserved.
	*
	* Author: Angus Salkeld <asalkeld@redhat.com>
	*
	* libqb is free software: you can redistribute it and/or modify
	* it under the terms of the GNU Lesser General Public License as published by
	* the Free Software Foundation, either version 2.1 of the License, or
	* (at your option) any later version.
	*
	* libqb is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU Lesser General Public License for more details.
	*
	* You should have received a copy of the GNU Lesser General Public License
	* along with libqb. If not, see <http://www.gnu.org/licenses/>.
	*/

	#ifndef QB_LOG_H_DEFINED
	#define QB_LOG_H_DEFINED

	/* INDENT-OFF */
	#ifdef __cplusplus
	extern "C" {
	#endif
	/* INDENT-ON */

	#include <stdint.h>
	#include <stdlib.h>
	#include <stdio.h>
	#include <stdarg.h>
	#include <errno.h>
	#include <syslog.h>
	#include <string.h>
	#include <qb/qbutil.h>
	#include <qb/qbconfig.h>

	#ifdef S_SPLINT_S
	#undef QB_HAVE_ATTRIBUTE_SECTION
	#endif /* S_SPLINT_S */

	/**
	* @file qblog.h
	* The logging API provides four main parts (basics, filtering, threading & blackbox).
	*
	* The idea behind this logging system is not to be prescriptive but to provide a
	* set of tools to help the developer achieve what they want quickly and easily.
	*
	* @par Basic logging API.
	* Call qb_log() to generate a log message. Then to write the message
	* somewhere meaningful call qb_log_ctl() to configure the targets.
	*
	- * Simplist possible use:
	+ * Simplest possible use:
	* @code
	* main() {
	* qb_log_init("simple-log", LOG_DAEMON, LOG_INFO);
	* // ...
	* qb_log(LOG_WARNING, "watch out");
	* // ...
	* qb_log_fini();
	* }
	* @endcode
	*
	* @par Configuring log targets.
	- * A log target can by syslog, stderr, the blackbox or a text file.
	+ * A log target can be syslog, stderr, the blackbox, stdout, or a text file.
	* By default only syslog is enabled.
	*
	- * To enable a target do the following
	+ * To enable a target do the following:
	* @code
	* qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_ENABLED, QB_TRUE);
	* @endcode
	*
	- * syslog, stderr and the blackbox are static (they don't need
	- * to be created, just enabled or disabled. However you can open multiple
	- * logfiles (32 - QB_LOG_BLACKBOX). To do this use the following code.
	+ * syslog, stderr, the blackbox, and stdout are static (they don't need
	+ * to be created, just enabled or disabled). However you can open multiple
	+ * logfiles (QB_LOG_TARGET_MAX - QB_LOG_TARGET_STATIC_MAX).
	+ * To do this, use the following code:
	* @code
	* mytarget = qb_log_file_open("/var/log/mylogfile");
	* qb_log_ctl(mytarget, QB_LOG_CONF_ENABLED, QB_TRUE);
	* @endcode
	*
	* Once your targets are enabled/opened you can configure them as follows:
	* Configure the size of blackbox
	* @code
	* qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_SIZE, 1024*10);
	* @endcode
	*
	* Make logging to file threaded:
	* @code
	* qb_log_ctl(mytarget, QB_LOG_CONF_THREADED, QB_TRUE);
	* @endcode
	*
	* To workaround your syslog daemon filtering all messages > LOG_INFO
	* @code
	* qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_PRIORITY_BUMP,
	* LOG_INFO - LOG_DEBUG);
	* @endcode
	*
	* To ensure all logs to file targets are fsync'ed (default QB_FALSE)
	* @code
	* qb_log_ctl(mytarget, QB_LOG_CONF_FILE_SYNC, QB_TRUE);
	* @endcode
	*
	*
	* @par Filtering messages.
	* To have more power over what log messages go to which target you can apply
	* filters to the targets. What happens is the desired callsites have the
	* correct bit set. Then when the log message is generated it gets sent to the
	* targets based on which bit is set in the callsite's "target" bitmap.
	* Messages can be filtered based on the:
	* -# filename + priority
	* -# function name + priority
	* -# format string + priority
	*
	- * So to make all logs from evil_fnunction() go to stderr do the following:
	+ * So to make all logs from evil_function() go to stderr, do the following:
	* @code
	* qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD,
	- * QB_LOG_FILTER_FUNCTION, "evil_fnunction", LOG_TRACE);
	+ * QB_LOG_FILTER_FUNCTION, "evil_function", LOG_TRACE);
	* @endcode
	*
	- * So to make all logs from totem* (with a priority <= LOG_INFO) go to stderr do the following:
	+ * So to make all logs from totem* (with a priority <= LOG_INFO) go to stderr,
	+ * do the following:
	* @code
	* qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD,
	* QB_LOG_FILTER_FILE, "totem", LOG_INFO);
	* @endcode
	*
	- * So to make all logs with the substring "ringbuffer" go to stderr do the following:
	+ * So to make all logs with the substring "ringbuffer" go to stderr,
	+ * do the following:
	* @code
	* qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD,
	* QB_LOG_FILTER_FORMAT, "ringbuffer", LOG_TRACE);
	* @endcode
	*
	* @par Thread safe non-blocking logging.
	* Logging is only thread safe when threaded logging is in use. If you plan
	* on logging from multiple threads, you must initialize libqb's logger thread
	* and use qg_log_filter_ctl to set the QB_LOG_CONF_THREADED flag on all the
	* logging targets in use.
	*
	- * To achieve non-blocking logging you can use threaded logging as well
	- * So any calls to write() or syslog() will not hold up your program.
	+ * To achieve non-blocking logging, so that any calls to write() or syslog()
	+ * will not hold up your program, you can use threaded logging as well.
	*
	* Threaded logging use:
	* @code
	* main() {
	* qb_log_init("simple-log", LOG_DAEMON, LOG_INFO);
	* qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_THREADED, QB_TRUE);
	* // ...
	* daemonize();
	* // call this after you fork()
	* qb_log_thread_start();
	* // ...
	* qb_log(LOG_WARNING, "watch out");
	* // ...
	* qb_log_fini();
	* }
	* @endcode
	*
	* @par A blackbox for in-field diagnosis.
	* This stores log messages in a ringbuffer so they can be written to
	* file if the program crashes (you will need to catch SIGSEGV). These
	* can then be easily printed out later.
	*
	* @note the blackbox is not enabled by default.
	*
	* Blackbox usage:
	* @code
	*
	* static void sigsegv_handler(int sig)
	* {
	* (void)signal (SIGSEGV, SIG_DFL);
	* qb_log_blackbox_write_to_file("simple-log.fdata");
	* qb_log_fini();
	* raise(SIGSEGV);
	* }
	*
	* main() {
	*
	* signal(SIGSEGV, sigsegv_handler);
	*
	* qb_log_init("simple-log", LOG_DAEMON, LOG_INFO);
	* qb_log_filter_ctl(QB_LOG_BLACKBOX, QB_LOG_FILTER_ADD,
	* QB_LOG_FILTER_FILE, "*", LOG_DEBUG);
	* qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_SIZE, 1024*10);
	* qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_ENABLED, QB_TRUE);
	* // ...
	* qb_log(LOG_WARNING, "watch out");
	* // ...
	* qb_log_fini();
	* }
	* @endcode
	*
	* @par Tagging messages.
	* You can tag messages using the second argument to qb_logt() or
	* by using qb_log_filter_ctl().
	* This can be used to add feature or sub-system information to the logs.
	*
	* @code
	* const char* my_tags_stringify(uint32_t tags) {
	* if (qb_bit_is_set(tags, QB_LOG_TAG_LIBQB_MSG_BIT) {
	* return "libqb";
	* } else if (tags == 3) {
	* return "three";
	* } else {
	* return "MAIN";
	* }
	* }
	* main() {
	* // ...
	* qb_log_tags_stringify_fn_set(my_tags_stringify);
	* qb_log_format_set(QB_LOG_STDERR, "[%5g] %p %b");
	* // ...
	* qb_logt(LOG_INFO, 3, "hello");
	* qb_logt(LOG_INFO, 0, "hello");
	* }
	* @endcode
	* The code above will produce:
	* @code
	* [libqb] some message
	* [three] info hello
	* [MAIN ] info hello
	* @endcode
	*
	* @example simplelog.c
	*/

	#undef LOG_TRACE
	#define LOG_TRACE (LOG_DEBUG + 1)

	#define QB_LOG_MAX_LEN 512
	#define QB_LOG_STRERROR_MAX_LEN 128

	typedef const char (qb_log_tags_stringify_fn)(uint32_t tags);

	/**
	* An instance of this structure is created in a special
	* ELF section at every dynamic debug callsite. At runtime,
	* the special section is treated as an array of these.
	*/
	struct qb_log_callsite {
	const char *function;
	const char *filename;
	const char *format;
	uint8_t priority;
	uint32_t lineno;
	uint32_t targets;
	uint32_t tags;
	} __attribute__((aligned(8)));

	typedef void (qb_log_filter_fn)(struct qb_log_callsite cs);

	/* will be assigned by ld linker magic */
	#ifdef QB_HAVE_ATTRIBUTE_SECTION
	extern struct qb_log_callsite __start___verbose[];
	extern struct qb_log_callsite __stop___verbose[];

	#define QB_LOG_INIT_DATA(name) \
	void name(void); \
	void name(void) { if (__start___verbose != __stop___verbose) {assert(1);} } \
	void __attribute__ ((constructor)) name(void);
	#else
	#define QB_LOG_INIT_DATA(name)
	#endif

	/**
	* Internal function: use qb_log() or qb_logt()
	*/
	void qb_log_real_(struct qb_log_callsite *cs, ...);
	void qb_log_real_va_(struct qb_log_callsite *cs, va_list ap);

	#define QB_LOG_TAG_LIBQB_MSG_BIT 31
	#define QB_LOG_TAG_LIBQB_MSG (1 << QB_LOG_TAG_LIBQB_MSG_BIT)

	/**
	* This function is to import logs from other code (like libraries)
	* that provide a callback with their logs.
	*
	* @note the performance of this will not impress you, as
	* the filtering is done on each log message, not
	- * before hand. So try doing basic pre-filtering.
	+ * beforehand. So try doing basic pre-filtering.
	*
	* @param function originating function name
	* @param filename originating filename
	* @param format format string
	* @param priority this takes syslog priorities.
	* @param lineno file line number
	* @param tags this is a uint32_t that you can use with
	* qb_log_tags_stringify_fn_set() to "tag" a log message
	* with a feature or sub-system then you can use "%g"
	* in the format specifer to print it out.
	*/
	void qb_log_from_external_source(const char *function,
	const char *filename,
	const char *format,
	uint8_t priority,
	uint32_t lineno,
	uint32_t tags,
	...)
	__attribute__ ((format (printf, 3, 7)));

	/**
	- * Get or create a callsite at the give position.
	+ * Get or create a callsite at the given position.
	*
	* The result can then be passed into qb_log_real_()
	*
	* @param function originating function name
	* @param filename originating filename
	* @param format format string
	* @param priority this takes syslog priorities.
	* @param lineno file line number
	* @param tags the tag
	*/
	struct qb_log_callsite* qb_log_callsite_get(const char *function,
	const char *filename,
	const char *format,
	uint8_t priority,
	uint32_t lineno,
	uint32_t tags);

	void qb_log_from_external_source_va(const char *function,
	const char *filename,
	const char *format,
	uint8_t priority,
	uint32_t lineno,
	uint32_t tags,
	va_list ap)
	__attribute__ ((format (printf, 3, 0)));

	/**
	* This is the function to generate a log message if you want to
	* manually add tags.
	*
	* @param priority this takes syslog priorities.
	* @param tags this is a uint32_t that you can use with
	* qb_log_tags_stringify_fn_set() to "tag" a log message
	* with a feature or sub-system then you can use "%g"
	* in the format specifer to print it out.
	* @param fmt usual printf style format specifiers
	* @param args usual printf style args
	*/
	#ifdef QB_HAVE_ATTRIBUTE_SECTION
	#define qb_logt(priority, tags, fmt, args...) do { \
	static struct qb_log_callsite descriptor \
	__attribute__((section("__verbose"), aligned(8))) = \
	{ __func__, __FILE__, fmt, priority, __LINE__, 0, tags }; \
	qb_log_real_(&descriptor, ##args); \
	} while(0)
	#else
	#define qb_logt(priority, tags, fmt, args...) do { \
	struct qb_log_callsite* descriptor_pt = \
	qb_log_callsite_get(__func__, __FILE__, fmt, \
	priority, __LINE__, tags); \
	qb_log_real_(descriptor_pt, ##args); \
	} while(0)
	#endif /* QB_HAVE_ATTRIBUTE_SECTION */


	/**
	* This is the main function to generate a log message.
	*
	* @param priority this takes syslog priorities.
	* @param fmt usual printf style format specifiers
	* @param args usual printf style args
	*/
	#define qb_log(priority, fmt, args...) qb_logt(priority, 0, fmt, ##args)

	/* Define the character used to mark the beginning of "extended" information;
	* a string equivalent is also defined so clients can use it like:
	* qb_log(level, "blah blah "QB_XS" yada yada", __func__);
	*/
	#define QB_XC '\a'
	#define QB_XS "\a"

	/**
	* This is similar to perror except it goes into the logging system.
	*
	* @param priority this takes syslog priorities.
	* @param fmt usual printf style format specifiers
	* @param args usual printf style args
	*
	* @note Because qb_perror() adds the system error message and error number onto
	* the end of the given fmt, that information will become extended
	* information if QB_XS is used inside fmt and will not show up in any
	* logs that strip extended information.
	*/
	#ifndef S_SPLINT_S
	#define qb_perror(priority, fmt, args...) do { \
	char _perr_buf_[QB_LOG_STRERROR_MAX_LEN]; \
	const char *_perr_str_ = qb_strerror_r(errno, _perr_buf_, sizeof(_perr_buf_)); \
	qb_logt(priority, 0, fmt ": %s (%d)", ##args, _perr_str_, errno); \
	} while(0)
	#else
	#define qb_perror
	#endif

	#define qb_enter() qb_log(LOG_TRACE, "ENTERING %s()", __func__)
	#define qb_leave() qb_log(LOG_TRACE, "LEAVING %s()", __func__)

	-#define QB_LOG_SYSLOG 0
	-#define QB_LOG_STDERR 1
	-#define QB_LOG_BLACKBOX 2
	-#define QB_LOG_STDOUT 3
	-
	-#define QB_LOG_TARGET_MAX 32
	+/*
	+ * Note that QB_LOG_TARGET_{STATIC_,}MAX are sentinel indexes
	+ * as non-inclusive higher bounds of the respective categories
	+ * (static and all the log targets) and also denote the number
	+ * of (reserved) items in the category. Both are possibly subject
	+ * of change, hence it is only adequate to always refer to them
	+ * via these defined values.
	+ * Similarly, there are QB_LOG_TARGET_{STATIC_,DYNAMIC_,}START
	+ * and QB_LOG_TARGET_{STATIC_,DYNAMIC_,}END values, but these
	+ * are inclusive lower and higher bounds, respectively.
	+ */
	+enum qb_log_target_slot {
	+ QB_LOG_TARGET_START,
	+
	+ /* static */
	+ QB_LOG_TARGET_STATIC_START = QB_LOG_TARGET_START,
	+ QB_LOG_SYSLOG = QB_LOG_TARGET_STATIC_START,
	+ QB_LOG_STDERR,
	+ QB_LOG_BLACKBOX,
	+ QB_LOG_STDOUT,
	+ QB_LOG_TARGET_STATIC_MAX,
	+ QB_LOG_TARGET_STATIC_END = QB_LOG_TARGET_STATIC_MAX - 1,
	+
	+ /* dynamic */
	+ QB_LOG_TARGET_DYNAMIC_START = QB_LOG_TARGET_STATIC_MAX,
	+
	+ QB_LOG_TARGET_MAX = 32,
	+ QB_LOG_TARGET_DYNAMIC_END = QB_LOG_TARGET_MAX - 1,
	+ QB_LOG_TARGET_END = QB_LOG_TARGET_DYNAMIC_END,
	+};

	enum qb_log_target_state {
	QB_LOG_STATE_UNUSED = 1,
	QB_LOG_STATE_DISABLED = 2,
	QB_LOG_STATE_ENABLED = 3,
	};

	enum qb_log_conf {
	QB_LOG_CONF_ENABLED,
	QB_LOG_CONF_FACILITY,
	QB_LOG_CONF_DEBUG,
	QB_LOG_CONF_SIZE,
	QB_LOG_CONF_THREADED,
	QB_LOG_CONF_PRIORITY_BUMP,
	QB_LOG_CONF_STATE_GET,
	QB_LOG_CONF_FILE_SYNC,
	QB_LOG_CONF_EXTENDED,
	QB_LOG_CONF_IDENT,
	};

	enum qb_log_filter_type {
	QB_LOG_FILTER_FILE,
	QB_LOG_FILTER_FUNCTION,
	QB_LOG_FILTER_FORMAT,
	QB_LOG_FILTER_FILE_REGEX,
	QB_LOG_FILTER_FUNCTION_REGEX,
	QB_LOG_FILTER_FORMAT_REGEX,
	};

	enum qb_log_filter_conf {
	QB_LOG_FILTER_ADD,
	QB_LOG_FILTER_REMOVE,
	QB_LOG_FILTER_CLEAR_ALL,
	QB_LOG_TAG_SET,
	QB_LOG_TAG_CLEAR,
	QB_LOG_TAG_CLEAR_ALL,
	};

	typedef void (*qb_log_logger_fn)(int32_t t,
	struct qb_log_callsite *cs,
	time_t timestamp,
	const char *msg);
	typedef void (*qb_log_vlogger_fn)(int32_t t,
	struct qb_log_callsite *cs,
	time_t timestamp,
	va_list ap);

	typedef void (*qb_log_close_fn)(int32_t t);
	typedef void (*qb_log_reload_fn)(int32_t t);

	/**
	* Init the logging system.
	*
	* @param name will be passed into openlog()
	* @param facility default for all new targets.
	* @param priority a basic filter with this priority will be added.
	*/
	void qb_log_init(const char *name,
	int32_t facility,
	uint8_t priority);

	/**
	* Logging system finalization function.
	*
	* It releases any shared memory.
	* Stops the logging thread if running.
	- * Flushes the last message to their destinations.
	+ * Flushes the last messages to their destinations.
	*/
	void qb_log_fini(void);

	/**
	* If you are using dynamically loadable modules via dlopen() and
	* you load them after qb_log_init() then after you load the module
	* you will need to do the following to get the filters to work
	- * in that module.
	+ * in that module:
	* @code
	* _start = dlsym (dl_handle, "__start___verbose");
	* _stop = dlsym (dl_handle, "__stop___verbose");
	* qb_log_callsites_register(_start, _stop);
	* @endcode
	*/
	int32_t qb_log_callsites_register(struct qb_log_callsite _start, struct qb_log_callsite _stop);

	/**
	* Dump the callsite info to stdout.
	*/
	void qb_log_callsites_dump(void);

	/**
	* Main logging control function.
	*
	* @param target QB_LOG_SYSLOG, QB_LOG_STDERR or result from qb_log_file_open()
	* @param conf_type what to configure
	* @param arg the new value
	* @see qb_log_conf
	*
	* @retval -errno on error
	* @retval 0 on success
	* @retval qb_log_target_state for QB_LOG_CONF_STATE_GET
	*/
	int32_t qb_log_ctl(int32_t target, enum qb_log_conf conf_type, int32_t arg);

	typedef union {
	int32_t i32;
	const char *s;
	} qb_log_ctl2_arg_t;

	/**
	* Extension of main logging control function accepting also strings.
	*
	* @param arg for QB_LOG_CONF_IDENT, 's' member as new identifier to openlog(),
	* for all original qb_log_ctl-compatible configuration directives,
	* 'i32' member is assumed (although a preferred way is to use
	* that original function directly as it allows for more type safety)
	* @see qb_log_ctl
	*
	* @note You can use <tt>QB_LOG_CTL2_I32</tt> and <tt>QB_LOG_CTL2_S</tt>
	* macros for a convenient on-the-fly construction of the object
	* to be passed as an <tt>arg</tt> argument.
	*/
	int32_t qb_log_ctl2(int32_t target, enum qb_log_conf conf_type,
	qb_log_ctl2_arg_t arg);

	#define QB_LOG_CTL2_I32(a) ((qb_log_ctl2_arg_t) { .i32 = (a) })
	#define QB_LOG_CTL2_S(a) ((qb_log_ctl2_arg_t) { .s = (a) })

	/**
	* This allows you modify the 'tags' and 'targets' callsite fields at runtime.
	*/
	int32_t qb_log_filter_ctl(int32_t value, enum qb_log_filter_conf c,
	enum qb_log_filter_type type, const char * text,
	uint8_t low_priority);


	/**
	* This extends qb_log_filter_ctl() by been able to provide a high_priority.
	*/
	int32_t qb_log_filter_ctl2(int32_t value, enum qb_log_filter_conf c,
	enum qb_log_filter_type type, const char * text,
	uint8_t high_priority, uint8_t low_priority);


	/**
	* Instead of using the qb_log_filter_ctl() functions you
	* can apply the filters manually by defining a callback
	* and setting the targets field using qb_bit_set() and
	- * qb_bit_clear() like the following below.
	+ * qb_bit_clear() like the following below:
	* @code
	* static void
	* m_filter(struct qb_log_callsite *cs)
	* {
	* if ((cs->priority >= LOG_ALERT &&
	* cs->priority <= LOG_DEBUG) &&
	* strcmp(cs->filename, "my_c_file.c") == 0) {
	* qb_bit_set(cs->targets, QB_LOG_SYSLOG);
	* } else {
	* qb_bit_clear(cs->targets, QB_LOG_SYSLOG);
	* }
	* }
	* @endcode
	*/
	int32_t qb_log_filter_fn_set(qb_log_filter_fn fn);

	/**
	* Set the callback to map the 'tags' bit map to a string.
	*/
	void qb_log_tags_stringify_fn_set(qb_log_tags_stringify_fn fn);

	/**
	* Set the format specifiers.
	*
	* %n FUNCTION NAME
	* %f FILENAME
	* %l FILELINE
	* %p PRIORITY
	* %t TIMESTAMP
	* %b BUFFER
	* %g TAGS
	* %N name (passed into qb_log_init)
	* %P PID
	* %H hostname
	*
	* any number between % and character specify field length to pad or chop
	*/
	void qb_log_format_set(int32_t t, const char* format);

	/**
	* Open a log file.
	*
	* @retval -errno on error
	- * @retval 3 to 31 (to be passed into other qb_log_* functions)
	+ * @retval value in inclusive range QB_LOG_TARGET_DYNAMIC_START
	+ * to QB_LOG_TARGET_DYNAMIC_END
	+ * (to be passed into other qb_log_* functions)
	*/
	int32_t qb_log_file_open(const char *filename);

	/**
	* Close a log file and release is resources.
	*/
	void qb_log_file_close(int32_t t);

	/**
	* When using threaded logging set the pthread policy and priority.
	*
	* @retval -errno on error
	* @retval 0 success
	*/
	int32_t qb_log_thread_priority_set(int32_t policy, int32_t priority);

	/**
	* Start the logging pthread.
	*/
	int32_t qb_log_thread_start(void);

	/**
	* Write the blackbox to file.
	*/
	ssize_t qb_log_blackbox_write_to_file(const char *filename);

	/**
	* Read the blackbox for file and print it out.
	*/
	void qb_log_blackbox_print_from_file(const char* filename);

	/**
	* Open a custom log target.
	*
	* @retval -errno on error
	- * @retval 3 to 31 (to be passed into other qb_log_* functions)
	+ * @retval value in inclusive range QB_LOG_TARGET_DYNAMIC_START
	+ * to QB_LOG_TARGET_DYNAMIC_END
	+ * (to be passed into other qb_log_* functions)
	*/
	int32_t qb_log_custom_open(qb_log_logger_fn log_fn,
	qb_log_close_fn close_fn,
	qb_log_reload_fn reload_fn,
	void *user_data);

	/**
	* Close a custom log target and release is resources.
	*/
	void qb_log_custom_close(int32_t t);

	/**
	* Retrieve the user data set by either qb_log_custom_open or
	* qb_log_target_user_data_set.
	*/
	void *qb_log_target_user_data_get(int32_t t);

	/**
	* Associate user data with this log target
	* @note only use this with custom targets
	*/
	int32_t qb_log_target_user_data_set(int32_t t, void *user_data);

	/**
	* format the callsite and timestamp info according to the format
	* set using qb_log_format_set()
	* It is intended to be used from your custom logger function.
	*/
	void qb_log_target_format(int32_t target,
	struct qb_log_callsite *cs,
	time_t timestamp,
	const char* formatted_message,
	char *output_buffer);

	/**
	* Convert string "auth" to equivalent number "LOG_AUTH" etc.
	*/
	int32_t qb_log_facility2int(const char *fname);

	/**
	* Convert number "LOG_AUTH" to equivalent string "auth" etc.
	*/
	const char * qb_log_facility2str(int32_t fnum);

	/* INDENT-OFF */
	#ifdef __cplusplus
	}
	#endif /* __cplusplus */
	/* INDENT-ON */
	#endif /* QB_LOG_H_DEFINED */
	diff --git a/lib/log.c b/lib/log.c
	index 076b8f0..c8a5680 100644
	--- a/lib/log.c
	+++ b/lib/log.c
	@@ -1,1146 +1,1146 @@
	/*
	* Copyright (C) 2011 Red Hat, Inc.
	*
	* All rights reserved.
	*
	* Author: Angus Salkeld <asalkeld@redhat.com>
	*
	* libqb is free software: you can redistribute it and/or modify
	* it under the terms of the GNU Lesser General Public License as published by
	* the Free Software Foundation, either version 2.1 of the License, or
	* (at your option) any later version.
	*
	* libqb is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU Lesser General Public License for more details.
	*
	* You should have received a copy of the GNU Lesser General Public License
	* along with libqb. If not, see <http://www.gnu.org/licenses/>.
	*/
	#include "os_base.h"
	#include <ctype.h>
	#ifdef HAVE_LINK_H
	#include <link.h>
	#endif /* HAVE_LINK_H */
	#include <stdarg.h>
	#include <pthread.h>
	#ifdef HAVE_DLFCN_H
	#include <dlfcn.h>
	#endif /* HAVE_DLFCN_H */
	#include <stdarg.h>
	#include <string.h>

	#include <qb/qbdefs.h>
	#include <qb/qblist.h>
	#include <qb/qblog.h>
	#include <qb/qbutil.h>
	#include <qb/qbarray.h>
	#include "log_int.h"
	#include "util_int.h"
	#include <regex.h>

	static struct qb_log_target conf[QB_LOG_TARGET_MAX];
	static uint32_t conf_active_max = 0;
	static int32_t in_logger = QB_FALSE;
	static int32_t logger_inited = QB_FALSE;
	static pthread_rwlock_t _listlock;
	static qb_log_filter_fn _custom_filter_fn = NULL;

	static QB_LIST_DECLARE(dlnames);
	static QB_LIST_DECLARE(tags_head);
	static QB_LIST_DECLARE(callsite_sections);

	struct dlname {
	char *dln_name;
	struct qb_list_head list;
	};

	struct callsite_section {
	struct qb_log_callsite *start;
	struct qb_log_callsite *stop;
	struct qb_list_head list;
	};

	static int32_t _log_target_enable(struct qb_log_target *t);
	static void _log_target_disable(struct qb_log_target *t);
	static void _log_filter_apply(struct callsite_section *sect,
	uint32_t t, enum qb_log_filter_conf c,
	enum qb_log_filter_type type,
	const char *text,
	regex_t *regex,
	uint8_t high_priority, uint8_t low_priority);
	static void _log_filter_apply_to_cs(struct qb_log_callsite *cs,
	uint32_t t, enum qb_log_filter_conf c,
	enum qb_log_filter_type type,
	const char *text,
	regex_t *regex,
	uint8_t high_priority, uint8_t low_priority);

	/* deprecated method of getting internal log messages */
	static qb_util_log_fn_t old_internal_log_fn = NULL;
	void
	qb_util_set_log_function(qb_util_log_fn_t fn)
	{
	old_internal_log_fn = fn;
	}

	static void
	_log_free_filter(struct qb_log_filter *flt)
	{
	if (flt->regex) {
	regfree(flt->regex);
	}
	free(flt->regex);
	free(flt->text);
	free(flt);
	}

	static int32_t
	_cs_matches_filter_(struct qb_log_callsite *cs,
	enum qb_log_filter_type type,
	const char *text,
	regex_t *regex,
	uint8_t high_priority,
	uint8_t low_priority)
	{
	int32_t match = QB_FALSE;
	const char *offset = NULL;
	const char *next = NULL;

	if (cs->priority > low_priority \|\|
	cs->priority < high_priority) {
	return QB_FALSE;
	}
	if (strcmp(text, "*") == 0) {
	return QB_TRUE;
	}

	switch (type) {
	case QB_LOG_FILTER_FILE:
	case QB_LOG_FILTER_FUNCTION:
	next = text;
	do {
	char token[500];
	offset = next;
	next = strchrnul(offset, ',');
	snprintf(token, 499, "%.*s", (int)(next - offset), offset);

	if (type == QB_LOG_FILTER_FILE) {
	match = (strcmp(cs->filename, token) == 0) ? 1 : 0;
	} else {
	match = (strcmp(cs->function, token) == 0) ? 1 : 0;
	}
	if (!match && next[0] != 0) {
	next++;
	}

	} while (match == QB_FALSE && next != NULL && next[0] != 0);
	break;
	case QB_LOG_FILTER_FILE_REGEX:
	next = next ? next : cs->filename;
	case QB_LOG_FILTER_FUNCTION_REGEX:
	next = next ? next : cs->function;
	case QB_LOG_FILTER_FORMAT_REGEX:
	next = next ? next : cs->format;

	if (regex == NULL) {
	return QB_FALSE;
	}
	match = regexec(regex, next, 0, NULL, 0);
	if (match == 0) {
	match = QB_TRUE;
	} else {
	match = QB_FALSE;
	}
	break;
	case QB_LOG_FILTER_FORMAT:
	if (strstr(cs->format, text)) {
	match = QB_TRUE;
	}
	break;
	}

	return match;
	}

	/**
	* @internal
	* @brief Format a log message into a string buffer
	*
	* @param[out] str Destination buffer to contain formatted string
	* @param[in] cs Callsite containing format to use
	* @param[in] ap Variable arguments for format
	*/
	/* suppress suggestion that we currently can do nothing better about
	as the format specification is hidden in cs argument */
	#ifdef HAVE_GCC_FORMAT_COMPLAINTS
	#pragma GCC diagnostic push
	#ifdef HAVE_GCC_MISSING_FORMAT_ATTRIBUTE
	#pragma GCC diagnostic ignored "-Wmissing-format-attribute"
	#endif
	#ifdef HAVE_GCC_SUGGEST_ATTRIBUTE_FORMAT
	#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"
	#endif
	#endif
	static inline void
	cs_format(char str, struct qb_log_callsite cs, va_list ap)
	{
	va_list ap_copy;
	int len;

	va_copy(ap_copy, ap);
	len = vsnprintf(str, QB_LOG_MAX_LEN, cs->format, ap_copy);
	va_end(ap_copy);
	if (len > QB_LOG_MAX_LEN) {
	len = QB_LOG_MAX_LEN;
	}
	if (str[len - 1] == '\n') {
	str[len - 1] = '\0';
	}
	}
	#ifdef HAVE_GCC_FORMAT_COMPLAINTS
	#pragma GCC diagnostic pop
	#endif

	void
	qb_log_real_va_(struct qb_log_callsite *cs, va_list ap)
	{
	int32_t found_threaded = QB_FALSE;
	struct qb_log_target *t;
	struct timespec tv;
	- int32_t pos;
	+ enum qb_log_target_slot pos;
	int32_t formatted = QB_FALSE;
	char buf[QB_LOG_MAX_LEN];
	char *str = buf;
	va_list ap_copy;

	if (in_logger \|\| cs == NULL) {
	return;
	}
	in_logger = QB_TRUE;

	if (old_internal_log_fn &&
	qb_bit_is_set(cs->tags, QB_LOG_TAG_LIBQB_MSG_BIT)) {
	if (formatted == QB_FALSE) {
	cs_format(str, cs, ap);
	formatted = QB_TRUE;
	}
	qb_do_extended(str, QB_TRUE,
	old_internal_log_fn(cs->filename, cs->lineno,
	cs->priority, str));
	}

	qb_util_timespec_from_epoch_get(&tv);

	/*
	* 1 if we can find a threaded target that needs this log then post it
	* 2 foreach non-threaded target call it's logger function
	*/
	- for (pos = 0; pos <= conf_active_max; pos++) {
	+ for (pos = QB_LOG_TARGET_START; pos <= conf_active_max; pos++) {
	t = &conf[pos];
	if ((t->state == QB_LOG_STATE_ENABLED)
	&& qb_bit_is_set(cs->targets, pos)) {
	if (t->threaded) {
	if (!found_threaded) {
	found_threaded = QB_TRUE;
	if (formatted == QB_FALSE) {
	cs_format(str, cs, ap);
	formatted = QB_TRUE;
	}
	}

	} else if (t->vlogger) {
	va_copy(ap_copy, ap);
	t->vlogger(t->pos, cs, tv.tv_sec, ap_copy);
	va_end(ap_copy);

	} else if (t->logger) {
	if (formatted == QB_FALSE) {
	cs_format(str, cs, ap);
	formatted = QB_TRUE;
	}
	qb_do_extended(str, t->extended,
	t->logger(t->pos, cs, tv.tv_sec, str));
	}
	}
	}

	if (found_threaded) {
	qb_log_thread_log_post(cs, tv.tv_sec, str);
	}
	in_logger = QB_FALSE;
	}

	void
	qb_log_real_(struct qb_log_callsite *cs, ...)
	{
	va_list ap;

	va_start(ap, cs);
	qb_log_real_va_(cs, ap);
	va_end(ap);
	}

	void
	qb_log_thread_log_write(struct qb_log_callsite *cs,
	time_t timestamp, const char *buffer)
	{
	struct qb_log_target *t;
	- int32_t pos;
	+ enum qb_log_target_slot pos;

	- for (pos = 0; pos <= conf_active_max; pos++) {
	+ for (pos = QB_LOG_TARGET_START; pos <= conf_active_max; pos++) {
	t = &conf[pos];
	if ((t->state == QB_LOG_STATE_ENABLED) && t->threaded
	&& qb_bit_is_set(cs->targets, t->pos)) {
	qb_do_extended(buffer, t->extended,
	t->logger(t->pos, cs, timestamp, buffer));
	}
	}
	}

	struct qb_log_callsite*
	qb_log_callsite_get(const char *function,
	const char *filename,
	const char *format,
	uint8_t priority,
	uint32_t lineno,
	uint32_t tags)
	{
	struct qb_log_target *t;
	struct qb_log_filter *flt;
	struct qb_log_callsite *cs;
	int32_t new_dcs = QB_FALSE;
	struct qb_list_head *f_item;
	- int32_t pos;
	+ enum qb_log_target_slot pos;

	if (!logger_inited) {
	return NULL;
	}

	cs = qb_log_dcs_get(&new_dcs, function, filename,
	format, priority, lineno, tags);
	if (cs == NULL) {
	return NULL;
	}

	if (new_dcs) {
	pthread_rwlock_rdlock(&_listlock);
	- for (pos = 0; pos <= conf_active_max; pos++) {
	+ for (pos = QB_LOG_TARGET_START; pos <= conf_active_max; pos++) {
	t = &conf[pos];
	if (t->state != QB_LOG_STATE_ENABLED) {
	continue;
	}
	qb_list_for_each(f_item, &t->filter_head) {
	flt = qb_list_entry(f_item, struct qb_log_filter, list);
	_log_filter_apply_to_cs(cs, t->pos, flt->conf, flt->type,
	flt->text, flt->regex, flt->high_priority,
	flt->low_priority);
	}
	}
	if (tags == 0) {
	qb_list_for_each(f_item, &tags_head) {
	flt = qb_list_entry(f_item, struct qb_log_filter, list);
	_log_filter_apply_to_cs(cs, flt->new_value, flt->conf, flt->type,
	flt->text, flt->regex, flt->high_priority,
	flt->low_priority);
	}
	} else {
	cs->tags = tags;
	}
	if (_custom_filter_fn) {
	_custom_filter_fn(cs);
	}
	pthread_rwlock_unlock(&_listlock);
	} else if (cs->tags != tags) {
	cs->tags = tags;
	if (_custom_filter_fn) {
	_custom_filter_fn(cs);
	}
	}
	return cs;
	}

	void
	qb_log_from_external_source_va(const char *function,
	const char *filename,
	const char *format,
	uint8_t priority,
	uint32_t lineno, uint32_t tags, va_list ap)
	{
	struct qb_log_callsite *cs;

	if (!logger_inited) {
	return;
	}

	cs = qb_log_callsite_get(function, filename,
	format, priority, lineno, tags);
	qb_log_real_va_(cs, ap);
	}

	void
	qb_log_from_external_source(const char *function,
	const char *filename,
	const char *format,
	uint8_t priority,
	uint32_t lineno, uint32_t tags, ...)
	{
	struct qb_log_callsite *cs;
	va_list ap;

	if (!logger_inited) {
	return;
	}

	cs = qb_log_callsite_get(function, filename,
	format, priority, lineno, tags);
	va_start(ap, tags);
	qb_log_real_va_(cs, ap);
	va_end(ap);
	}

	int32_t
	qb_log_callsites_register(struct qb_log_callsite *_start,
	struct qb_log_callsite *_stop)
	{
	struct callsite_section *sect;
	struct qb_log_callsite *cs;
	struct qb_log_target *t;
	struct qb_log_filter *flt;
	- int32_t pos;
	+ enum qb_log_target_slot pos;

	if (_start == NULL \|\| _stop == NULL) {
	return -EINVAL;
	}

	pthread_rwlock_rdlock(&_listlock);
	qb_list_for_each_entry(sect, &callsite_sections, list) {
	if (sect->start == _start \|\| sect->stop == _stop) {
	pthread_rwlock_unlock(&_listlock);
	return -EEXIST;
	}
	}
	pthread_rwlock_unlock(&_listlock);

	sect = calloc(1, sizeof(struct callsite_section));
	if (sect == NULL) {
	return -ENOMEM;
	}
	sect->start = _start;
	sect->stop = _stop;
	qb_list_init(&sect->list);

	pthread_rwlock_wrlock(&_listlock);
	qb_list_add(&sect->list, &callsite_sections);

	/*
	* Now apply the filters on these new callsites
	*/
	- for (pos = 0; pos <= conf_active_max; pos++) {
	+ for (pos = QB_LOG_TARGET_START; pos <= conf_active_max; pos++) {
	t = &conf[pos];
	if (t->state != QB_LOG_STATE_ENABLED) {
	continue;
	}
	qb_list_for_each_entry(flt, &t->filter_head, list) {
	_log_filter_apply(sect, t->pos, flt->conf,
	flt->type, flt->text, flt->regex,
	flt->high_priority, flt->low_priority);
	}
	}
	qb_list_for_each_entry(flt, &tags_head, list) {
	_log_filter_apply(sect, flt->new_value, flt->conf,
	flt->type, flt->text, flt->regex,
	flt->high_priority, flt->low_priority);
	}
	pthread_rwlock_unlock(&_listlock);
	if (_custom_filter_fn) {
	for (cs = sect->start; cs < sect->stop; cs++) {
	if (cs->lineno > 0) {
	_custom_filter_fn(cs);
	}
	}
	}
	/* qb_log_callsites_dump_sect(sect); */

	return 0;
	}

	static void
	qb_log_callsites_dump_sect(struct callsite_section *sect)
	{
	struct qb_log_callsite *cs;

	printf(" start %p - stop %p\n", sect->start, sect->stop);
	printf("filename lineno targets tags\n");
	for (cs = sect->start; cs < sect->stop; cs++) {
	if (cs->lineno > 0) {
	printf("%12s %6d %16d %16d\n", cs->filename, cs->lineno,
	cs->targets, cs->tags);
	}
	}
	}

	void
	qb_log_callsites_dump(void)
	{
	struct callsite_section *sect;
	int32_t l;

	pthread_rwlock_rdlock(&_listlock);
	l = qb_list_length(&callsite_sections);
	printf("Callsite Database [%d]\n", l);
	printf("---------------------\n");
	qb_list_for_each_entry(sect, &callsite_sections, list) {
	qb_log_callsites_dump_sect(sect);
	}
	pthread_rwlock_unlock(&_listlock);
	}

	static int32_t
	_log_filter_exists(struct qb_list_head *list_head,
	enum qb_log_filter_type type,
	const char *text,
	uint8_t high_priority,
	uint8_t low_priority,
	uint32_t new_value)
	{
	struct qb_log_filter *flt;

	qb_list_for_each_entry(flt, list_head, list) {
	if (flt->type == type &&
	flt->high_priority == high_priority &&
	flt->low_priority == low_priority &&
	flt->new_value == new_value &&
	strcmp(flt->text, text) == 0) {
	return QB_TRUE;
	}
	}
	return QB_FALSE;
	}

	static int32_t
	_log_filter_store(uint32_t t, enum qb_log_filter_conf c,
	enum qb_log_filter_type type,
	const char *text,
	uint8_t high_priority,
	uint8_t low_priority,
	struct qb_log_filter **new)
	{
	struct qb_log_filter *flt;
	struct qb_list_head *iter;
	struct qb_list_head *next;
	struct qb_list_head *list_head;

	switch (c) {
	case QB_LOG_FILTER_ADD:
	case QB_LOG_FILTER_REMOVE:
	case QB_LOG_FILTER_CLEAR_ALL:
	list_head = &conf[t].filter_head;
	break;

	case QB_LOG_TAG_SET:
	case QB_LOG_TAG_CLEAR:
	case QB_LOG_TAG_CLEAR_ALL:
	list_head = &tags_head;
	break;
	default:
	return -ENOSYS;
	}

	if (c == QB_LOG_FILTER_ADD \|\| c == QB_LOG_TAG_SET) {
	if (text == NULL) {
	return -EINVAL;
	}
	if (_log_filter_exists(list_head, type, text,
	high_priority, low_priority, t)) {
	return -EEXIST;
	}
	flt = calloc(1, sizeof(struct qb_log_filter));
	if (flt == NULL) {
	return -ENOMEM;
	}
	qb_list_init(&flt->list);
	flt->conf = c;
	flt->type = type;
	flt->text = strdup(text);
	if (flt->text == NULL) {
	_log_free_filter(flt);
	return -ENOMEM;
	}

	if (type == QB_LOG_FILTER_FUNCTION_REGEX \|\|
	type == QB_LOG_FILTER_FILE_REGEX \|\|
	type == QB_LOG_FILTER_FORMAT_REGEX) {
	int res;

	flt->regex = calloc(1, sizeof(regex_t));
	if (flt->regex == NULL) {
	_log_free_filter(flt);
	return -ENOMEM;
	}
	res = regcomp(flt->regex, flt->text, 0);
	if (res) {
	_log_free_filter(flt);
	return -EINVAL;
	}
	}
	flt->high_priority = high_priority;
	flt->low_priority = low_priority;
	flt->new_value = t;
	qb_list_add_tail(&flt->list, list_head);
	if (new) {
	*new = flt;
	}
	} else if (c == QB_LOG_FILTER_REMOVE \|\| c == QB_LOG_TAG_CLEAR) {
	qb_list_for_each_safe(iter, next, list_head) {
	flt = qb_list_entry(iter, struct qb_log_filter, list);
	if (flt->type == type &&
	flt->low_priority <= low_priority &&
	flt->high_priority >= high_priority &&
	(strcmp(flt->text, text) == 0 \|\|
	strcmp("*", text) == 0)) {
	qb_list_del(iter);
	_log_free_filter(flt);
	return 0;
	}
	}

	} else if (c == QB_LOG_FILTER_CLEAR_ALL \|\| c == QB_LOG_TAG_CLEAR_ALL) {
	qb_list_for_each_safe(iter, next, list_head) {
	flt = qb_list_entry(iter, struct qb_log_filter, list);
	qb_list_del(iter);
	_log_free_filter(flt);
	}
	}
	return 0;
	}

	static void
	_log_filter_apply(struct callsite_section *sect,
	uint32_t t, enum qb_log_filter_conf c,
	enum qb_log_filter_type type,
	const char *text,
	regex_t *regex,
	uint8_t high_priority, uint8_t low_priority)
	{
	struct qb_log_callsite *cs;

	for (cs = sect->start; cs < sect->stop; cs++) {
	if (cs->lineno > 0) {
	_log_filter_apply_to_cs(cs, t, c, type, text, regex,
	high_priority, low_priority);
	}
	}
	}

	/* #define _QB_FILTER_DEBUGGING_ 1 */
	static void
	_log_filter_apply_to_cs(struct qb_log_callsite *cs,
	uint32_t t, enum qb_log_filter_conf c,
	enum qb_log_filter_type type,
	const char *text,
	regex_t *regex,
	uint8_t high_priority, uint8_t low_priority)
	{

	if (c == QB_LOG_FILTER_CLEAR_ALL) {
	qb_bit_clear(cs->targets, t);
	return;
	} else if (c == QB_LOG_TAG_CLEAR_ALL) {
	cs->tags = 0;
	return;
	}

	if (_cs_matches_filter_(cs, type, text, regex, high_priority, low_priority)) {
	#ifdef _QB_FILTER_DEBUGGING_
	uint32_t old_targets = cs->targets;
	uint32_t old_tags = cs->tags;
	#endif /* _QB_FILTER_DEBUGGING_ */
	if (c == QB_LOG_FILTER_ADD) {
	qb_bit_set(cs->targets, t);
	} else if (c == QB_LOG_FILTER_REMOVE) {
	qb_bit_clear(cs->targets, t);
	} else if (c == QB_LOG_TAG_SET) {
	cs->tags = t;
	} else if (c == QB_LOG_TAG_CLEAR) {
	cs->tags = 0;
	}
	#ifdef _QB_FILTER_DEBUGGING_
	if (old_targets != cs->targets) {
	printf("targets: %s:%u value(%d) %d -> %d\n",
	cs->filename, cs->lineno, t,
	old_targets, cs->targets);
	}
	if (old_tags != cs->tags) {
	printf("tags: %s:%u value(%d) %d -> %d\n",
	cs->filename, cs->lineno, t, old_tags, cs->tags);
	}
	#endif /* _QB_FILTER_DEBUGGING_ */
	}
	}

	int32_t
	qb_log_filter_ctl2(int32_t t, enum qb_log_filter_conf c,
	enum qb_log_filter_type type, const char * text,
	uint8_t high_priority, uint8_t low_priority)
	{
	struct qb_log_filter *new_flt = NULL;
	regex_t *regex = NULL;
	struct callsite_section *sect;
	int32_t rc;

	if (!logger_inited) {
	return -EINVAL;
	}

	if (c == QB_LOG_FILTER_ADD \|\|
	c == QB_LOG_FILTER_CLEAR_ALL \|\|
	c == QB_LOG_FILTER_REMOVE) {
	if (t < 0 \|\| t >= QB_LOG_TARGET_MAX \|\|
	conf[t].state == QB_LOG_STATE_UNUSED) {
	return -EBADF;
	}
	}

	if (text == NULL \|\|
	low_priority < high_priority \|\|
	type > QB_LOG_FILTER_FORMAT_REGEX \|\|
	c > QB_LOG_TAG_CLEAR_ALL) {
	return -EINVAL;
	}
	pthread_rwlock_rdlock(&_listlock);
	rc = _log_filter_store(t, c, type, text, high_priority, low_priority, &new_flt);
	if (rc < 0) {
	pthread_rwlock_unlock(&_listlock);
	return rc;
	}

	if (new_flt && new_flt->regex) {
	regex = new_flt->regex;
	}
	qb_list_for_each_entry(sect, &callsite_sections, list) {
	_log_filter_apply(sect, t, c, type, text, regex, high_priority, low_priority);
	}
	pthread_rwlock_unlock(&_listlock);
	return 0;
	}

	int32_t
	qb_log_filter_fn_set(qb_log_filter_fn fn)
	{
	struct callsite_section *sect;
	struct qb_log_callsite *cs;

	if (!logger_inited) {
	return -EINVAL;
	}
	_custom_filter_fn = fn;
	if (_custom_filter_fn == NULL) {
	return 0;
	}

	qb_list_for_each_entry(sect, &callsite_sections, list) {
	for (cs = sect->start; cs < sect->stop; cs++) {
	if (cs->lineno > 0) {
	_custom_filter_fn(cs);
	}
	}
	}
	return 0;
	}

	int32_t
	qb_log_filter_ctl(int32_t t, enum qb_log_filter_conf c,
	enum qb_log_filter_type type,
	const char *text, uint8_t priority)
	{
	return qb_log_filter_ctl2(t, c, type, text, LOG_EMERG, priority);
	}

	#ifdef QB_HAVE_ATTRIBUTE_SECTION
	/* Some platforms (eg. FreeBSD 10+) don't support calling dlopen() from
	* within a dl_iterate_phdr() callback; so save all of the dlpi_names to
	* a list and iterate over them afterwards. */
	static int32_t
	_log_so_walk_callback(struct dl_phdr_info info, size_t size, void data)
	{
	struct dlname *dlname;

	if (strlen(info->dlpi_name) > 0) {
	dlname = calloc(1, sizeof(struct dlname));
	if (!dlname)
	return 0;
	dlname->dln_name = strdup(info->dlpi_name);
	qb_list_add_tail(&dlname->list, &dlnames);
	}

	return 0;
	}

	static void
	_log_so_walk_dlnames(void)
	{
	struct dlname *dlname;
	struct qb_list_head *iter;
	struct qb_list_head *next;

	void *handle;
	void *start;
	void *stop;
	const char *error;

	qb_list_for_each_safe(iter, next, &dlnames) {
	dlname = qb_list_entry(iter, struct dlname, list);

	handle = dlopen(dlname->dln_name, RTLD_LAZY);
	error = dlerror();
	if (!handle \|\| error) {
	qb_log(LOG_ERR, "%s", error);
	goto done;
	}

	start = dlsym(handle, "__start___verbose");
	error = dlerror();
	if (error) {
	goto done;
	}

	stop = dlsym(handle, "__stop___verbose");
	error = dlerror();
	if (error) {
	goto done;

	} else {
	qb_log_callsites_register(start, stop);
	}
	done:
	if (handle)
	dlclose(handle);
	qb_list_del(iter);
	if (dlname->dln_name)
	free(dlname->dln_name);
	free(dlname);
	}
	}
	#endif /* QB_HAVE_ATTRIBUTE_SECTION */

	static void
	_log_target_state_set(struct qb_log_target *t, enum qb_log_target_state s)
	{
	- int32_t i;
	+ enum qb_log_target_slot i;
	int32_t a_set = QB_FALSE;
	int32_t u_set = QB_FALSE;

	t->state = s;

	- for (i = 31; i >= 0; i--) {
	- if (!a_set && conf[i].state == QB_LOG_STATE_ENABLED) {
	+ for (i = QB_LOG_TARGET_MAX; i > QB_LOG_TARGET_START; i--) {
	+ if (!a_set && conf[i-1].state == QB_LOG_STATE_ENABLED) {
	a_set = QB_TRUE;
	- conf_active_max = i;
	+ conf_active_max = i-1;
	}
	- if (!u_set && conf[i].state != QB_LOG_STATE_UNUSED) {
	+ if (!u_set && conf[i-1].state != QB_LOG_STATE_UNUSED) {
	u_set = QB_TRUE;
	}
	}
	}

	void
	qb_log_init(const char *name, int32_t facility, uint8_t priority)
	{
	- int32_t i;
	+ int32_t l;
	+ enum qb_log_target_slot i;

	- i = pthread_rwlock_init(&_listlock, NULL);
	- assert(i == 0);
	+ l = pthread_rwlock_init(&_listlock, NULL);
	+ assert(l == 0);
	qb_log_format_init();

	- for (i = 0; i < QB_LOG_TARGET_MAX; i++) {
	+ for (i = QB_LOG_TARGET_START; i < QB_LOG_TARGET_MAX; i++) {
	conf[i].pos = i;
	conf[i].debug = QB_FALSE;
	conf[i].file_sync = QB_FALSE;
	conf[i].extended = QB_TRUE;
	conf[i].state = QB_LOG_STATE_UNUSED;
	(void)strlcpy(conf[i].name, name, PATH_MAX);
	conf[i].facility = facility;
	qb_list_init(&conf[i].filter_head);
	}

	qb_log_dcs_init();
	#ifdef QB_HAVE_ATTRIBUTE_SECTION
	qb_log_callsites_register(__start___verbose, __stop___verbose);
	dl_iterate_phdr(_log_so_walk_callback, NULL);
	_log_so_walk_dlnames();
	#endif /* QB_HAVE_ATTRIBUTE_SECTION */

	- conf[QB_LOG_STDERR].state = QB_LOG_STATE_DISABLED;
	- conf[QB_LOG_BLACKBOX].state = QB_LOG_STATE_DISABLED;
	- conf[QB_LOG_STDOUT].state = QB_LOG_STATE_DISABLED;
	+ for (i = QB_LOG_TARGET_STATIC_START; i < QB_LOG_TARGET_STATIC_MAX; i++)
	+ conf[i].state = QB_LOG_STATE_DISABLED;

	logger_inited = QB_TRUE;
	(void)qb_log_syslog_open(&conf[QB_LOG_SYSLOG]);
	_log_target_state_set(&conf[QB_LOG_SYSLOG], QB_LOG_STATE_ENABLED);
	(void)qb_log_filter_ctl(QB_LOG_SYSLOG, QB_LOG_FILTER_ADD,
	QB_LOG_FILTER_FILE, "*", priority);
	}

	void
	qb_log_fini(void)
	{
	struct qb_log_target *t;
	struct qb_log_filter *flt;
	struct callsite_section *s;
	struct qb_list_head *iter;
	struct qb_list_head *iter2;
	struct qb_list_head *next;
	struct qb_list_head *next2;
	- int32_t pos;
	+ enum qb_log_target_slot pos;

	if (!logger_inited) {
	return;
	}
	logger_inited = QB_FALSE;
	qb_log_thread_stop();
	pthread_rwlock_destroy(&_listlock);

	- for (pos = 0; pos <= conf_active_max; pos++) {
	+ for (pos = QB_LOG_TARGET_START; pos <= conf_active_max; pos++) {
	t = &conf[pos];
	_log_target_disable(t);
	qb_list_for_each_safe(iter2, next2, &t->filter_head) {
	flt = qb_list_entry(iter2, struct qb_log_filter, list);
	qb_list_del(iter2);
	_log_free_filter(flt);
	}
	}
	qb_log_format_fini();
	qb_log_dcs_fini();
	qb_list_for_each_safe(iter, next, &callsite_sections) {
	s = qb_list_entry(iter, struct callsite_section, list);
	qb_list_del(iter);
	free(s);
	}
	qb_list_for_each_safe(iter, next, &tags_head) {
	flt = qb_list_entry(iter, struct qb_log_filter, list);
	qb_list_del(iter);
	_log_free_filter(flt);
	}
	}

	struct qb_log_target *
	qb_log_target_alloc(void)
	{
	- int32_t i;
	- for (i = 0; i < QB_LOG_TARGET_MAX; i++) {
	+ enum qb_log_target_slot i;
	+ for (i = QB_LOG_TARGET_START; i < QB_LOG_TARGET_MAX; i++) {
	if (conf[i].state == QB_LOG_STATE_UNUSED) {
	_log_target_state_set(&conf[i], QB_LOG_STATE_DISABLED);
	return &conf[i];
	}
	}
	return NULL;
	}

	void
	qb_log_target_free(struct qb_log_target *t)
	{
	(void)qb_log_filter_ctl(t->pos, QB_LOG_FILTER_CLEAR_ALL,
	QB_LOG_FILTER_FILE, NULL, 0);
	t->debug = QB_FALSE;
	t->filename[0] = '\0';
	qb_log_format_set(t->pos, NULL);
	_log_target_state_set(t, QB_LOG_STATE_UNUSED);
	}

	struct qb_log_target *
	qb_log_target_get(int32_t pos)
	{
	return &conf[pos];
	}

	void *
	qb_log_target_user_data_get(int32_t t)
	{
	if (t < 0 \|\| t >= QB_LOG_TARGET_MAX \|\|
	conf[t].state == QB_LOG_STATE_UNUSED) {
	errno = -EBADF;
	return NULL;
	}

	return conf[t].instance;
	}

	int32_t
	qb_log_target_user_data_set(int32_t t, void *user_data)
	{
	if (!logger_inited) {
	return -EINVAL;
	}
	if (t < 0 \|\| t >= QB_LOG_TARGET_MAX \|\|
	conf[t].state == QB_LOG_STATE_UNUSED) {
	return -EBADF;
	}

	conf[t].instance = user_data;
	return 0;
	}

	int32_t
	qb_log_custom_open(qb_log_logger_fn log_fn,
	qb_log_close_fn close_fn,
	qb_log_reload_fn reload_fn, void *user_data)
	{
	struct qb_log_target *t;

	t = qb_log_target_alloc();
	if (t == NULL) {
	return -errno;
	}

	t->instance = user_data;
	snprintf(t->filename, PATH_MAX, "custom-%d", t->pos);

	t->logger = log_fn;
	t->vlogger = NULL;
	t->reload = reload_fn;
	t->close = close_fn;

	return t->pos;
	}

	void
	qb_log_custom_close(int32_t t)
	{
	struct qb_log_target *target;

	if (!logger_inited) {
	return;
	}
	if (t < 0 \|\| t >= QB_LOG_TARGET_MAX \|\|
	conf[t].state == QB_LOG_STATE_UNUSED) {
	return;
	}

	target = qb_log_target_get(t);

	if (target->close) {
	in_logger = QB_TRUE;
	target->close(t);
	in_logger = QB_FALSE;
	}
	qb_log_target_free(target);
	}

	static int32_t
	_log_target_enable(struct qb_log_target *t)
	{
	int32_t rc = 0;

	if (t->state == QB_LOG_STATE_ENABLED) {
	return 0;
	}
	if (t->pos == QB_LOG_STDERR \|\|
	t->pos == QB_LOG_STDOUT) {
	rc = qb_log_stderr_open(t);
	} else if (t->pos == QB_LOG_SYSLOG) {
	rc = qb_log_syslog_open(t);
	} else if (t->pos == QB_LOG_BLACKBOX) {
	rc = qb_log_blackbox_open(t);
	}
	if (rc == 0) {
	_log_target_state_set(t, QB_LOG_STATE_ENABLED);
	}
	return rc;
	}

	static void
	_log_target_disable(struct qb_log_target *t)
	{
	if (t->state != QB_LOG_STATE_ENABLED) {
	return;
	}
	_log_target_state_set(t, QB_LOG_STATE_DISABLED);
	if (t->close) {
	in_logger = QB_TRUE;
	t->close(t->pos);
	in_logger = QB_FALSE;
	}
	}

	int32_t
	qb_log_ctl2(int32_t t, enum qb_log_conf c, qb_log_ctl2_arg_t arg_not4directuse)
	{
	int32_t rc = 0;
	int32_t need_reload = QB_FALSE;

	/* extract the constants and do not touch the origin anymore */
	const int32_t arg_i32 = arg_not4directuse.i32;
	const char * const arg_s = arg_not4directuse.s;

	if (!logger_inited) {
	return -EINVAL;
	}
	if (t < 0 \|\| t >= QB_LOG_TARGET_MAX \|\|
	conf[t].state == QB_LOG_STATE_UNUSED) {
	return -EBADF;
	}
	switch (c) {
	case QB_LOG_CONF_ENABLED:
	if (arg_i32) {
	rc = _log_target_enable(&conf[t]);
	} else {
	_log_target_disable(&conf[t]);
	}
	break;
	case QB_LOG_CONF_STATE_GET:
	rc = conf[t].state;
	break;
	case QB_LOG_CONF_FACILITY:
	conf[t].facility = arg_i32;
	if (t == QB_LOG_SYSLOG) {
	need_reload = QB_TRUE;
	}
	break;
	case QB_LOG_CONF_IDENT:
	(void)strlcpy(conf[t].name, arg_s, PATH_MAX);
	if (t == QB_LOG_SYSLOG) {
	need_reload = QB_TRUE;
	}
	break;
	case QB_LOG_CONF_FILE_SYNC:
	conf[t].file_sync = arg_i32;
	break;
	case QB_LOG_CONF_PRIORITY_BUMP:
	conf[t].priority_bump = arg_i32;
	break;
	case QB_LOG_CONF_SIZE:
	if (t == QB_LOG_BLACKBOX) {
	if (arg_i32 <= 0) {
	return -EINVAL;
	}
	conf[t].size = arg_i32;
	need_reload = QB_TRUE;
	} else {
	return -ENOSYS;
	}
	break;
	case QB_LOG_CONF_THREADED:
	conf[t].threaded = arg_i32;
	break;
	case QB_LOG_CONF_EXTENDED:
	conf[t].extended = arg_i32;
	break;

	default:
	rc = -EINVAL;
	}
	if (rc == 0 && need_reload && conf[t].reload) {
	in_logger = QB_TRUE;
	conf[t].reload(t);
	in_logger = QB_FALSE;
	}
	return rc;
	}

	int32_t
	qb_log_ctl(int32_t t, enum qb_log_conf c, int32_t arg)
	{
	return qb_log_ctl2(t, c, QB_LOG_CTL2_I32(arg));
	}
	diff --git a/lib/log_format.c b/lib/log_format.c
	index 6c29f0a..3789b6c 100644
	--- a/lib/log_format.c
	+++ b/lib/log_format.c
	@@ -1,852 +1,853 @@
	/*
	* Copyright (C) 2011 Red Hat, Inc.
	*
	* All rights reserved.
	*
	* Author: Angus Salkeld <asalkeld@redhat.com>
	*
	* libqb is free software: you can redistribute it and/or modify
	* it under the terms of the GNU Lesser General Public License as published by
	* the Free Software Foundation, either version 2.1 of the License, or
	* (at your option) any later version.
	*
	* libqb is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU Lesser General Public License for more details.
	*
	* You should have received a copy of the GNU Lesser General Public License
	* along with libqb. If not, see <http://www.gnu.org/licenses/>.
	*/
	#include "os_base.h"
	#include <ctype.h>

	#include <qb/qbdefs.h>
	#include "log_int.h"

	static qb_log_tags_stringify_fn _user_tags_stringify_fn;

	/*
	* syslog prioritynames, facility names to value mapping
	* Some C libraries build this in to their headers, but it is non-portable
	* so logsys supplies its own version.
	*/
	struct syslog_names {
	const char *c_name;
	int32_t c_val;
	};

	static struct syslog_names prioritynames[] = {
	{"emerg", LOG_EMERG},
	{"alert", LOG_ALERT},
	{"crit", LOG_CRIT},
	{"error", LOG_ERR},
	{"warning", LOG_WARNING},
	{"notice", LOG_NOTICE},
	{"info", LOG_INFO},
	{"debug", LOG_DEBUG},
	{"trace", LOG_TRACE},
	{NULL, -1}
	};

	struct syslog_names facilitynames[] = {
	{"auth", LOG_AUTH},
	#if defined(LOG_AUTHPRIV)
	{"authpriv", LOG_AUTHPRIV},
	#endif
	{"cron", LOG_CRON},
	{"daemon", LOG_DAEMON},
	#if defined(LOG_FTP)
	{"ftp", LOG_FTP},
	#endif
	{"kern", LOG_KERN},
	{"lpr", LOG_LPR},
	{"mail", LOG_MAIL},
	{"news", LOG_NEWS},
	{"syslog", LOG_SYSLOG},
	{"user", LOG_USER},
	{"uucp", LOG_UUCP},
	{"local0", LOG_LOCAL0},
	{"local1", LOG_LOCAL1},
	{"local2", LOG_LOCAL2},
	{"local3", LOG_LOCAL3},
	{"local4", LOG_LOCAL4},
	{"local5", LOG_LOCAL5},
	{"local6", LOG_LOCAL6},
	{"local7", LOG_LOCAL7},
	{NULL, -1}
	};

	static const char log_month_name[][4] = {
	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
	};

	static pthread_rwlock_t _formatlock;

	void
	qb_log_format_init(void)
	{
	- int32_t i;
	+ int32_t l;
	struct qb_log_target *t;
	+ enum qb_log_target_slot i;

	- i = pthread_rwlock_init(&_formatlock, NULL);
	- assert(i == 0);
	+ l = pthread_rwlock_init(&_formatlock, NULL);
	+ assert(l == 0);

	- for (i = 0; i < QB_LOG_TARGET_MAX; i++) {
	+ for (i = QB_LOG_TARGET_START; i < QB_LOG_TARGET_MAX; i++) {
	t = qb_log_target_get(i);
	t->format = strdup("[%p] %b");
	}
	}

	void
	qb_log_format_fini(void)
	{
	struct qb_log_target *t;
	- int32_t i;
	+ enum qb_log_target_slot i;

	pthread_rwlock_destroy(&_formatlock);

	- for (i = 0; i < QB_LOG_TARGET_MAX; i++) {
	+ for (i = QB_LOG_TARGET_START; i < QB_LOG_TARGET_MAX; i++) {
	t = qb_log_target_get(i);
	free(t->format);
	}
	}

	void
	qb_log_format_set(int32_t target, const char *format)
	{
	char modified_format[256];
	struct qb_log_target *t = qb_log_target_get(target);

	pthread_rwlock_wrlock(&_formatlock);

	free(t->format);

	if (format) {
	qb_log_target_format_static(target, format, modified_format);
	t->format = strdup(modified_format);
	} else {
	t->format = strdup("[%p] %b");
	}
	assert(t->format != NULL);

	pthread_rwlock_unlock(&_formatlock);
	}

	/* Convert string "auth" to equivalent number "LOG_AUTH" etc. */
	int32_t
	qb_log_facility2int(const char *fname)
	{
	int32_t i;

	if (fname == NULL) {
	return -EINVAL;
	}

	for (i = 0; facilitynames[i].c_name != NULL; i++) {
	if (strcmp(fname, facilitynames[i].c_name) == 0) {
	return facilitynames[i].c_val;
	}
	}
	return -EINVAL;
	}

	/* Convert number "LOG_AUTH" to equivalent string "auth" etc. */
	const char *
	qb_log_facility2str(int32_t fnum)
	{
	int32_t i;

	for (i = 0; facilitynames[i].c_name != NULL; i++) {
	if (facilitynames[i].c_val == fnum) {
	return facilitynames[i].c_name;
	}
	}
	return NULL;
	}

	const char *
	qb_log_priority2str(uint8_t priority)
	{
	if (priority > LOG_TRACE) {
	return prioritynames[LOG_TRACE].c_name;
	}
	return prioritynames[priority].c_name;
	}

	void
	qb_log_tags_stringify_fn_set(qb_log_tags_stringify_fn fn)
	{
	_user_tags_stringify_fn = fn;
	}

	static int
	_strcpy_cutoff(char dest, const char src, size_t cutoff, int ralign,
	size_t buf_len)
	{
	size_t len = strlen(src);
	if (buf_len <= 1) {
	if (buf_len == 0)
	dest[0] = 0;
	return 0;
	}

	if (cutoff == 0) {
	cutoff = len;
	}

	cutoff = QB_MIN(cutoff, buf_len - 1);
	len = QB_MIN(len, cutoff);
	if (ralign) {
	memset(dest, ' ', cutoff - len);
	memcpy(dest + cutoff - len, src, len);
	} else {
	memcpy(dest, src, len);
	memset(dest + len, ' ', cutoff - len);
	}

	dest[cutoff] = '\0';

	return cutoff;
	}

	/*
	* This function will do static formatting (for things that don't
	* change on each log message).
	*
	* %P PID
	* %N name passed into qb_log_init
	* %H hostname
	*
	* any number between % and character specify field length to pad or chop
	*/
	void
	qb_log_target_format_static(int32_t target, const char * format,
	char *output_buffer)
	{
	char tmp_buf[255];
	unsigned int format_buffer_idx = 0;
	unsigned int output_buffer_idx = 0;
	size_t cutoff;
	uint32_t len;
	int ralign;
	int c;
	struct qb_log_target *t = qb_log_target_get(target);

	if (format == NULL) {
	return;
	}

	while ((c = format[format_buffer_idx])) {
	cutoff = 0;
	ralign = QB_FALSE;
	if (c != '%') {
	output_buffer[output_buffer_idx++] = c;
	format_buffer_idx++;
	} else {
	const char *p;
	unsigned int percent_buffer_idx = format_buffer_idx;

	format_buffer_idx += 1;
	if (format[format_buffer_idx] == '-') {
	ralign = QB_TRUE;
	format_buffer_idx += 1;
	}

	if (isdigit(format[format_buffer_idx])) {
	cutoff = atoi(&format[format_buffer_idx]);
	}
	while (isdigit(format[format_buffer_idx])) {
	format_buffer_idx += 1;
	}

	switch (format[format_buffer_idx]) {
	case 'P':
	snprintf(tmp_buf, 30, "%d", getpid());
	p = tmp_buf;
	break;

	case 'N':
	p = t->name;
	break;

	case 'H':
	if (gethostname(tmp_buf, 255) == 0) {
	tmp_buf[254] = '\0';
	} else {
	(void)strlcpy(tmp_buf, "localhost", 255);
	}
	p = tmp_buf;
	break;

	default:
	p = &format[percent_buffer_idx];
	cutoff = (format_buffer_idx - percent_buffer_idx + 1);
	ralign = QB_FALSE;
	break;
	}
	len = _strcpy_cutoff(output_buffer + output_buffer_idx,
	p, cutoff, ralign,
	(QB_LOG_MAX_LEN -
	output_buffer_idx));
	output_buffer_idx += len;
	format_buffer_idx += 1;
	}
	if (output_buffer_idx >= QB_LOG_MAX_LEN - 1) {
	break;
	}
	}

	output_buffer[output_buffer_idx] = '\0';
	}

	/*
	* %n FUNCTION NAME
	* %f FILENAME
	* %l FILELINE
	* %p PRIORITY
	* %t TIMESTAMP
	* %b BUFFER
	* %g SUBSYSTEM
	*
	* any number between % and character specify field length to pad or chop
	*/
	void
	qb_log_target_format(int32_t target,
	struct qb_log_callsite *cs,
	time_t current_time,
	const char formatted_message, char output_buffer)
	{
	char tmp_buf[128];
	struct tm tm_res;
	unsigned int format_buffer_idx = 0;
	unsigned int output_buffer_idx = 0;
	size_t cutoff;
	uint32_t len;
	int ralign;
	int c;
	struct qb_log_target *t = qb_log_target_get(target);

	pthread_rwlock_rdlock(&_formatlock);
	if (t->format == NULL) {
	pthread_rwlock_unlock(&_formatlock);
	return;
	}

	while ((c = t->format[format_buffer_idx])) {
	cutoff = 0;
	ralign = QB_FALSE;
	if (c != '%') {
	output_buffer[output_buffer_idx++] = c;
	format_buffer_idx++;
	} else {
	const char *p;

	format_buffer_idx += 1;
	if (t->format[format_buffer_idx] == '-') {
	ralign = QB_TRUE;
	format_buffer_idx += 1;
	}

	if (isdigit(t->format[format_buffer_idx])) {
	cutoff = atoi(&t->format[format_buffer_idx]);
	}
	while (isdigit(t->format[format_buffer_idx])) {
	format_buffer_idx += 1;
	}

	switch (t->format[format_buffer_idx]) {
	case 'g':
	if (_user_tags_stringify_fn) {
	p = _user_tags_stringify_fn(cs->tags);
	} else {
	p = "";
	}
	break;

	case 'n':
	p = cs->function;
	break;

	case 'f':
	#ifdef BUILDING_IN_PLACE
	p = cs->filename;
	#else
	p = strrchr(cs->filename, '/');
	if (p == NULL) {
	p = cs->filename;
	} else {
	p++; /* move past the "/" */
	}
	#endif /* BUILDING_IN_PLACE */
	break;

	case 'l':
	snprintf(tmp_buf, 30, "%d", cs->lineno);
	p = tmp_buf;
	break;

	case 't':
	(void)localtime_r(&current_time, &tm_res);
	snprintf(tmp_buf, TIME_STRING_SIZE,
	"%s %02d %02d:%02d:%02d",
	log_month_name[tm_res.tm_mon],
	tm_res.tm_mday, tm_res.tm_hour,
	tm_res.tm_min, tm_res.tm_sec);
	p = tmp_buf;
	break;

	case 'b':
	p = formatted_message;
	break;

	case 'p':
	if (cs->priority > LOG_TRACE) {
	p = prioritynames[LOG_TRACE].c_name;
	} else {
	p = prioritynames[cs->priority].c_name;
	}
	break;

	default:
	p = "";
	break;
	}
	len = _strcpy_cutoff(output_buffer + output_buffer_idx,
	p, cutoff, ralign,
	(QB_LOG_MAX_LEN -
	output_buffer_idx));
	output_buffer_idx += len;
	format_buffer_idx += 1;
	}
	if (output_buffer_idx >= QB_LOG_MAX_LEN - 1) {
	break;
	}
	}
	pthread_rwlock_unlock(&_formatlock);

	if (output_buffer[output_buffer_idx - 1] == '\n') {
	output_buffer[output_buffer_idx - 1] = '\0';
	} else {
	output_buffer[output_buffer_idx] = '\0';
	}
	}


	/*
	* These wrappers around strl* functions just return the
	* number of characters written, not the number of characters
	* requested to be written.
	*/
	static size_t
	my_strlcpy(char dest, const char src, size_t maxlen)
	{
	size_t rc = strlcpy(dest, src, maxlen);
	/* maxlen includes NUL, so -1 */
	return QB_MIN(rc, maxlen-1);
	}

	static size_t
	my_strlcat(char dest, const char src, size_t maxlen)
	{
	size_t rc = strlcat(dest, src, maxlen);
	return QB_MIN(rc, maxlen-1);
	}

	size_t
	qb_vsnprintf_serialize(char *serialize, size_t max_len,
	const char *fmt, va_list ap)
	{
	char *format;
	char *p;
	char *qb_xc;
	int type_long = QB_FALSE;
	int type_longlong = QB_FALSE;
	int sformat_length = 0;
	int sformat_precision = QB_FALSE;
	uint32_t location = my_strlcpy(serialize, fmt, max_len) + 1;

	/* Assume serialized output always wants extended information
	* (@todo: add variant of this function that takes argument for whether
	* to print extended information, and make this a macro with that
	* argument set to QB_TRUE, so callers can honor extended setting)
	*/
	if ((qb_xc = strchr(serialize, QB_XC)) != NULL) {
	qb_xc = (qb_xc + 1)? '\|' : '\0';
	}

	format = (char *)fmt;
	for (;;) {
	type_long = QB_FALSE;
	type_longlong = QB_FALSE;
	p = strchrnul((const char *)format, '%');
	if (*p == '\0') {
	break;
	}
	format = p + 1;
	reprocess:
	switch (format[0]) {
	case '#': /* alternate form conversion, ignore */
	case '-': /* left adjust, ignore */
	case ' ': /* a space, ignore */
	case '+': /* a sign should be used, ignore */
	case '\'': /* group in thousands, ignore */
	case 'I': /* glibc-ism locale alternative, ignore */
	format++;
	goto reprocess;
	case '.': /* precision, ignore */
	format++;
	sformat_precision = QB_TRUE;
	goto reprocess;
	case '0': /* field width, ignore */
	case '1': /* field width, ignore */
	case '2': /* field width, ignore */
	case '3': /* field width, ignore */
	case '4': /* field width, ignore */
	case '5': /* field width, ignore */
	case '6': /* field width, ignore */
	case '7': /* field width, ignore */
	case '8': /* field width, ignore */
	case '9': /* field width, ignore */
	if (sformat_precision) {
	sformat_length *= 10;
	sformat_length += (format[0] - '0');
	}
	format++;
	goto reprocess;
	case '': / variable field width, save */ {
	int arg_int = va_arg(ap, int);
	if (location + sizeof (int) > max_len) {
	return max_len;
	}
	memcpy(&serialize[location], &arg_int, sizeof (int));
	location += sizeof(int);
	format++;
	goto reprocess;
	}
	case 'l':
	format++;
	type_long = QB_TRUE;
	if (*format == 'l') {
	type_long = QB_FALSE;
	type_longlong = QB_TRUE;
	format++;
	}
	goto reprocess;
	case 'd': /* int argument */
	case 'i': /* int argument */
	case 'o': /* unsigned int argument */
	case 'u':
	case 'x':
	case 'X':
	if (type_long) {
	long int arg_int;

	if (location + sizeof (long int) > max_len) {
	return max_len;
	}
	arg_int = va_arg(ap, long int);
	memcpy(&serialize[location], &arg_int,
	sizeof(long int));
	location += sizeof(long int);
	format++;
	break;
	} else if (type_longlong) {
	long long int arg_int;

	if (location + sizeof (long long int) > max_len) {
	return max_len;
	}
	arg_int = va_arg(ap, long long int);
	memcpy(&serialize[location], &arg_int,
	sizeof(long long int));
	location += sizeof(long long int);
	format++;
	break;
	} else {
	int arg_int;

	if (location + sizeof (int) > max_len) {
	return max_len;
	}
	arg_int = va_arg(ap, int);
	memcpy(&serialize[location], &arg_int,
	sizeof(int));
	location += sizeof(int);
	format++;
	break;
	}
	case 'e':
	case 'E':
	case 'f':
	case 'F':
	case 'g':
	case 'G':
	case 'a':
	case 'A':
	{
	double arg_double;

	if (location + sizeof (double) > max_len) {
	return max_len;
	}
	arg_double = va_arg(ap, double);
	memcpy (&serialize[location], &arg_double, sizeof (double));
	location += sizeof(double);
	format++;
	break;
	}
	case 'c':
	{
	int arg_int;
	unsigned char arg_char;

	if (location + sizeof (unsigned int) > max_len) {
	return max_len;
	}
	arg_int = va_arg(ap, unsigned int);
	arg_char = (unsigned char)arg_int;
	memcpy (&serialize[location], &arg_char, sizeof (unsigned char));
	location += sizeof(unsigned char);
	break;
	}
	case 's':
	{
	char *arg_string;
	arg_string = va_arg(ap, char *);
	if (arg_string == NULL) {
	location += my_strlcpy(&serialize[location],
	"(null)",
	QB_MIN(strlen("(null)") + 1,
	max_len - location));
	} else if (sformat_length) {
	location += my_strlcpy(&serialize[location],
	arg_string,
	QB_MIN(sformat_length + 1,
	(max_len - location)));
	} else {
	location += my_strlcpy(&serialize[location],
	arg_string,
	QB_MIN(strlen(arg_string) + 1,
	max_len - location));
	}
	location++;
	break;
	}
	case 'p':
	{
	ptrdiff_t arg_pointer = va_arg(ap, ptrdiff_t);
	if (location + sizeof (ptrdiff_t) > max_len) {
	return max_len;
	}
	memcpy(&serialize[location], &arg_pointer, sizeof(ptrdiff_t));
	location += sizeof(ptrdiff_t);
	break;
	}
	case '%':
	if (location + 1 > max_len) {
	return max_len;
	}
	serialize[location++] = '%';
	sformat_length = 0;
	sformat_precision = QB_FALSE;
	break;

	}
	}
	return (location);
	}

	#define MINI_FORMAT_STR_LEN 20

	size_t
	qb_vsnprintf_deserialize(char string, size_t str_len, const char buf)
	{
	char *p;
	char *format;
	char fmt[MINI_FORMAT_STR_LEN];
	int fmt_pos;

	uint32_t location = 0;
	uint32_t data_pos = strlen(buf) + 1;
	int type_long = QB_FALSE;
	int type_longlong = QB_FALSE;
	int len;

	string[0] = '\0';
	format = (char *)buf;
	for (;;) {
	type_long = QB_FALSE;
	type_longlong = QB_FALSE;
	p = strchrnul((const char *)format, '%');
	if (*p == '\0') {
	return my_strlcat(string, format, str_len) + 1;
	}
	/* copy from current to the next % */
	len = p - format;
	memcpy(&string[location], format, len);
	location += len;
	format = p;

	/* start building up the format for snprintf */
	fmt_pos = 0;
	fmt[fmt_pos++] = *format;
	format++;
	reprocess:
	switch (format[0]) {
	case '#': /* alternate form conversion, ignore */
	case '-': /* left adjust, ignore */
	case ' ': /* a space, ignore */
	case '+': /* a sign should be used, ignore */
	case '\'': /* group in thousands, ignore */
	case 'I': /* glibc-ism locale alternative, ignore */
	case '.': /* precision, ignore */
	case '0': /* field width, ignore */
	case '1': /* field width, ignore */
	case '2': /* field width, ignore */
	case '3': /* field width, ignore */
	case '4': /* field width, ignore */
	case '5': /* field width, ignore */
	case '6': /* field width, ignore */
	case '7': /* field width, ignore */
	case '8': /* field width, ignore */
	case '9': /* field width, ignore */
	fmt[fmt_pos++] = *format;
	format++;
	goto reprocess;

	case '*': {
	int arg_int;
	memcpy(&arg_int, &buf[data_pos], sizeof(int));
	data_pos += sizeof(int);
	fmt_pos += snprintf(&fmt[fmt_pos],
	MINI_FORMAT_STR_LEN - fmt_pos,
	"%d", arg_int);
	format++;
	goto reprocess;
	}
	case 'l':
	fmt[fmt_pos++] = *format;
	format++;
	type_long = QB_TRUE;
	if (*format == 'l') {
	type_long = QB_FALSE;
	type_longlong = QB_TRUE;
	}
	goto reprocess;
	case 'd': /* int argument */
	case 'i': /* int argument */
	case 'o': /* unsigned int argument */
	case 'u':
	case 'x':
	case 'X':
	if (type_long) {
	long int arg_int;

	fmt[fmt_pos++] = *format;
	fmt[fmt_pos++] = '\0';
	memcpy(&arg_int, &buf[data_pos], sizeof(long int));
	location += snprintf(&string[location],
	str_len - location,
	fmt, arg_int);
	data_pos += sizeof(long int);
	format++;
	break;
	} else if (type_longlong) {
	long long int arg_int;

	fmt[fmt_pos++] = *format;
	fmt[fmt_pos++] = '\0';
	memcpy(&arg_int, &buf[data_pos], sizeof(long long int));
	location += snprintf(&string[location],
	str_len - location,
	fmt, arg_int);
	data_pos += sizeof(long long int);
	format++;
	break;
	} else {
	int arg_int;

	fmt[fmt_pos++] = *format;
	fmt[fmt_pos++] = '\0';
	memcpy(&arg_int, &buf[data_pos], sizeof(int));
	location += snprintf(&string[location],
	str_len - location,
	fmt, arg_int);
	data_pos += sizeof(int);
	format++;
	break;
	}
	case 'e':
	case 'E':
	case 'f':
	case 'F':
	case 'g':
	case 'G':
	case 'a':
	case 'A':
	{
	double arg_double;

	fmt[fmt_pos++] = *format;
	fmt[fmt_pos++] = '\0';
	memcpy(&arg_double, &buf[data_pos], sizeof(double));
	location += snprintf(&string[location],
	str_len - location,
	fmt, arg_double);
	data_pos += sizeof(double);
	format++;
	break;
	}
	case 'c':
	{
	unsigned char *arg_char;

	fmt[fmt_pos++] = *format;
	fmt[fmt_pos++] = '\0';
	arg_char = (unsigned char*)&buf[data_pos];
	location += snprintf(&string[location],
	str_len - location,
	fmt, *arg_char);
	data_pos += sizeof(unsigned char);
	format++;
	break;
	}
	case 's':
	{
	fmt[fmt_pos++] = *format;
	fmt[fmt_pos++] = '\0';
	len = snprintf(&string[location],
	str_len - location,
	fmt, &buf[data_pos]);
	location += len;
	/* don't use len as there might be a len modifier */
	data_pos += strlen(&buf[data_pos]) + 1;
	format++;
	break;
	}
	case 'p':
	{
	ptrdiff_t pt;
	memcpy(&pt, &buf[data_pos],
	sizeof(ptrdiff_t));
	fmt[fmt_pos++] = *format;
	fmt[fmt_pos++] = '\0';
	location += snprintf(&string[location],
	str_len - location,
	fmt, pt);
	data_pos += sizeof(void*);
	format++;
	break;
	}
	case '%':
	string[location++] = '%';
	format++;
	break;

	}
	}
	return location;
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Feb 25, 5:43 PM (1 d, 5 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1463450
Default Alt Text: (70 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions