X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=log.c;h=459a5c10be9023ad2422a4c35a015abfd79f95ee;hp=a2633f43d91fb1f6d5724c1b4abc6e67a755095d;hb=a27981c145cd9a3709673339dc455f3a0d5c3745;hpb=66e4c27c13b2e7ba857c9c9bd9a33a8b3a5cb0fa diff --git a/log.c b/log.c index a2633f4..459a5c1 100644 --- a/log.c +++ b/log.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrokdecode project. * * Copyright (C) 2011-2012 Uwe Hermann * @@ -14,29 +14,45 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ -#include "sigrokdecode.h" -#include "sigrokdecode-internal.h" +#include +#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode.h" #include #include +#include + +/** + * @file + * + * Controlling the libsigrokdecode message logging functionality. + */ + +/** + * @defgroup grp_logging Logging + * + * Controlling the libsigrokdecode message logging functionality. + * + * @{ + */ /* Currently selected libsigrokdecode loglevel. Default: SRD_LOG_WARN. */ -static int srd_loglevel = SRD_LOG_WARN; /* Show errors+warnings per default. */ +static int cur_loglevel = SRD_LOG_WARN; /* Show errors+warnings per default. */ /* Function prototype. */ -static int srd_logv(void *data, int loglevel, const char *format, va_list args); +static int srd_logv(void *cb_data, int loglevel, const char *format, + va_list args); -/* Pointer to the currently selected log handler. Default: srd_logv(). */ -static srd_log_handler_t srd_handler = srd_logv; +/* Pointer to the currently selected log callback. Default: srd_logv(). */ +static srd_log_callback srd_log_cb = srd_logv; /* - * Pointer to private data that can be passed to the log handler. + * Pointer to private data that can be passed to the log callback. * This can be used (for example) by C++ GUIs to pass a "this" pointer. */ -static void *srd_handler_data = NULL; +static void *srd_log_cb_data = NULL; /** * Set the libsigrokdecode loglevel. @@ -45,20 +61,27 @@ static void *srd_handler_data = NULL; * and so on) libsigrokdecode will output. Using SRD_LOG_NONE disables all * messages. * + * Note that this function itself will also output log messages. After the + * loglevel has changed, it will output a debug message with SRD_LOG_DBG for + * example. Whether this message is shown depends on the (new) loglevel. + * * @param loglevel The loglevel to set (SRD_LOG_NONE, SRD_LOG_ERR, * SRD_LOG_WARN, SRD_LOG_INFO, SRD_LOG_DBG, or SRD_LOG_SPEW). + * * @return SRD_OK upon success, SRD_ERR_ARG upon invalid loglevel. + * + * @since 0.1.0 */ -int srd_set_loglevel(int loglevel) +SRD_API int srd_log_loglevel_set(int loglevel) { if (loglevel < SRD_LOG_NONE || loglevel > SRD_LOG_SPEW) { srd_err("Invalid loglevel %d.", loglevel); return SRD_ERR_ARG; } - srd_loglevel = loglevel; + cur_loglevel = loglevel; - srd_dbg("srd: loglevel set to %d", loglevel); + srd_dbg("libsigrokdecode loglevel set to %d.", loglevel); return SRD_OK; } @@ -67,142 +90,99 @@ int srd_set_loglevel(int loglevel) * Get the libsigrokdecode loglevel. * * @return The currently configured libsigrokdecode loglevel. + * + * @since 0.1.0 */ -int srd_get_loglevel(void) +SRD_API int srd_log_loglevel_get(void) { - return srd_loglevel; + return cur_loglevel; } /** - * Set the libsigrokdecode log handler to the specified function. - * - * @param handler Function pointer to the log handler function to use. - * Must not be NULL. - * @param data Pointer to private data to be passed on. This can be used by - * the caller pass arbitrary data to the log functions. This - * pointer is only stored or passed on by libsigrokdecode, and - * is never used or interpreted in any way. + * Set the libsigrokdecode log callback to the specified function. + * + * @param cb Function pointer to the log callback function to use. + * Must not be NULL. + * @param cb_data Pointer to private data to be passed on. This can be used + * by the caller to pass arbitrary data to the log functions. + * This pointer is only stored or passed on by libsigrokdecode, + * and is never used or interpreted in any way. The pointer + * is allowed to be NULL if the caller doesn't need/want to + * pass any data. + * * @return SRD_OK upon success, SRD_ERR_ARG upon invalid arguments. + * + * @since 0.3.0 */ -int srd_log_set_handler(srd_log_handler_t handler, void *data) +SRD_API int srd_log_callback_set(srd_log_callback cb, void *cb_data) { - if (!handler) { - srd_err("log: %s: handler was NULL", __func__); + if (!cb) { + srd_err("log: %s: cb was NULL", __func__); return SRD_ERR_ARG; } - /* Note: 'data' is allowed to be NULL. */ + /* Note: 'cb_data' is allowed to be NULL. */ - srd_handler = handler; - srd_handler_data = data; + srd_log_cb = cb; + srd_log_cb_data = cb_data; return SRD_OK; } /** - * Set the libsigrokdecode log handler to the default built-in one. + * Set the libsigrokdecode log callback to the default built-in one. * - * Additionally, the internal 'srd_handler_data' pointer is set to NULL. + * Additionally, the internal 'srd_log_cb_data' pointer is set to NULL. * - * @return SRD_OK upon success, a negative error code otherwise. + * @return SRD_OK upon success, a (negative) error code otherwise. + * + * @since 0.1.0 */ -int srd_log_set_default_handler(void) +SRD_API int srd_log_callback_set_default(void) { /* * Note: No log output in this function, as it should safely work - * even if the currently set log handler is buggy/broken. + * even if the currently set log callback is buggy/broken. */ - srd_handler = srd_logv; - srd_handler_data = NULL; + srd_log_cb = srd_logv; + srd_log_cb_data = NULL; return SRD_OK; } -static int srd_logv(void *data, int loglevel, const char *format, va_list args) -{ - int ret; - - /* This specific log handler doesn't need the void pointer data. */ - (void)data; - - /* Only output messages of at least the selected loglevel(s). */ - if (loglevel > srd_loglevel) - return SRD_OK; /* TODO? */ - - ret = vfprintf(stderr, format, args); - fprintf(stderr, "\n"); - - return ret; -} - -int srd_log(int loglevel, const char *format, ...) -{ - int ret; - va_list args; - - va_start(args, format); - ret = srd_handler(srd_handler_data, loglevel, format, args); - va_end(args); - - return ret; -} - -int srd_spew(const char *format, ...) +static int srd_logv(void *cb_data, int loglevel, const char *format, + va_list args) { - int ret; - va_list args; + /* This specific log callback doesn't need the void pointer data. */ + (void)cb_data; - va_start(args, format); - ret = srd_handler(srd_handler_data, SRD_LOG_SPEW, format, args); - va_end(args); - - return ret; -} + (void)loglevel; -int srd_dbg(const char *format, ...) -{ - int ret; - va_list args; + if (fputs("srd: ", stderr) < 0 + || g_vfprintf(stderr, format, args) < 0 + || putc('\n', stderr) < 0) + return SRD_ERR; - va_start(args, format); - ret = srd_handler(srd_handler_data, SRD_LOG_DBG, format, args); - va_end(args); + fflush(stderr); - return ret; + return SRD_OK; } -int srd_info(const char *format, ...) +/** @private */ +SRD_PRIV int srd_log(int loglevel, const char *format, ...) { int ret; va_list args; - va_start(args, format); - ret = srd_handler(srd_handler_data, SRD_LOG_INFO, format, args); - va_end(args); - - return ret; -} - -int srd_warn(const char *format, ...) -{ - int ret; - va_list args; + /* Only output messages of at least the selected loglevel(s). */ + if (loglevel > cur_loglevel) + return SRD_OK; va_start(args, format); - ret = srd_handler(srd_handler_data, SRD_LOG_WARN, format, args); + ret = srd_log_cb(srd_log_cb_data, loglevel, format, args); va_end(args); return ret; } -int srd_err(const char *format, ...) -{ - int ret; - va_list args; - - va_start(args, format); - ret = srd_handler(srd_handler_data, SRD_LOG_ERR, format, args); - va_end(args); - - return ret; -} +/** @} */