X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=3d65cc4e20bb755d7550f87b85959990976916c9;hb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;hp=36aa5c0070c10659b6ef6f0a6d7a46f275996197;hpb=15408b51f3f165f13fb19c647b5991e0b755817c;p=libsigrok.git diff --git a/src/log.c b/src/log.c index 36aa5c00..3d65cc4e 100644 --- a/src/log.c +++ b/src/log.c @@ -18,14 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include +#include #include -/** @cond PRIVATE */ -#define NO_LOG_WRAPPERS -/** @endcond */ #include "libsigrok-internal.h" +#define LOG_PREFIX "log" + /** * @file * @@ -56,13 +57,9 @@ static sr_log_callback sr_log_cb = sr_logv; */ static void *sr_log_cb_data = NULL; -/* Log domain (a short string that is used as prefix for all messages). */ /** @cond PRIVATE */ -#define LOGDOMAIN_MAXLEN 30 -#define LOGDOMAIN_DEFAULT "sr: " +#define LOGLEVEL_TIMESTAMP SR_LOG_DBG /** @endcond */ -static char sr_log_domain[LOGDOMAIN_MAXLEN + 1] = LOGDOMAIN_DEFAULT; - static int64_t sr_log_start_time = 0; /** @@ -89,7 +86,7 @@ SR_API int sr_log_loglevel_set(int loglevel) return SR_ERR_ARG; } /* Output time stamps relative to time at startup */ - if (loglevel >= SR_LOG_SPEW && sr_log_start_time == 0) + if (loglevel >= LOGLEVEL_TIMESTAMP && sr_log_start_time == 0) sr_log_start_time = g_get_monotonic_time(); cur_loglevel = loglevel; @@ -111,51 +108,6 @@ SR_API int sr_log_loglevel_get(void) return cur_loglevel; } -/** - * Set the libsigrok logdomain string. - * - * @param logdomain The string to use as logdomain for libsigrok log - * messages from now on. Must not be NULL. The maximum - * length of the string is 30 characters (this does not - * include the trailing NUL-byte). Longer strings are - * silently truncated. - * In order to not use a logdomain, pass an empty string. - * The function makes its own copy of the input string, i.e. - * the caller does not need to keep it around. - * - * @return SR_OK upon success, SR_ERR_ARG upon invalid logdomain. - * - * @since 0.1.0 - */ -SR_API int sr_log_logdomain_set(const char *logdomain) -{ - if (!logdomain) { - sr_err("log: %s: logdomain was NULL", __func__); - return SR_ERR_ARG; - } - - /* TODO: Error handling. */ - snprintf(sr_log_domain, LOGDOMAIN_MAXLEN, "%s", logdomain); - - sr_dbg("Log domain set to '%s'.", sr_log_domain); - - return SR_OK; -} - -/** - * Get the currently configured libsigrok logdomain. - * - * @return A copy of the currently configured libsigrok logdomain - * string. The caller is responsible for g_free()ing the string when - * it is no longer needed. - * - * @since 0.1.0 - */ -SR_API char *sr_log_logdomain_get(void) -{ - return g_strdup(sr_log_domain); -} - /** * Set the libsigrok log callback to the specified function. * @@ -174,7 +126,7 @@ SR_API char *sr_log_logdomain_get(void) SR_API int sr_log_callback_set(sr_log_callback cb, void *cb_data) { if (!cb) { - sr_err("log: %s: cb was NULL", __func__); + sr_err("%s: cb was NULL", __func__); return SR_ERR_ARG; } @@ -209,10 +161,9 @@ SR_API int sr_log_callback_set_default(void) static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args) { - int64_t elapsed; - int64_t min; - int sec; - int usec; + uint64_t elapsed_us, minutes; + unsigned int rest_us, seconds, microseconds; + int ret; /* This specific log callback doesn't need the void pointer data. */ (void)cb_data; @@ -221,20 +172,22 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args if (loglevel > cur_loglevel) return SR_OK; - if (cur_loglevel >= SR_LOG_SPEW) { - elapsed = g_get_monotonic_time() - sr_log_start_time; - min = elapsed / G_TIME_SPAN_MINUTE; - sec = (elapsed % G_TIME_SPAN_MINUTE) / G_TIME_SPAN_SECOND; - usec = elapsed % G_TIME_SPAN_SECOND; + if (cur_loglevel >= LOGLEVEL_TIMESTAMP) { + elapsed_us = g_get_monotonic_time() - sr_log_start_time; - if (fprintf(stderr, "[%.2" PRIi64 ":%.2d.%.6d] ", min, sec, usec) < 0) - return SR_ERR; + minutes = elapsed_us / G_TIME_SPAN_MINUTE; + rest_us = elapsed_us % G_TIME_SPAN_MINUTE; + seconds = rest_us / G_TIME_SPAN_SECOND; + microseconds = rest_us % G_TIME_SPAN_SECOND; + + ret = g_fprintf(stderr, "sr: [%.2" PRIu64 ":%.2u.%.6u] ", + minutes, seconds, microseconds); + } else { + ret = fputs("sr: ", stderr); } - if (sr_log_domain[0] != '\0' && fputs(sr_log_domain, stderr) < 0) - return SR_ERR; - if (vfprintf(stderr, format, args) < 0) - return SR_ERR; - if (putc('\n', stderr) < 0) + + if (ret < 0 || g_vfprintf(stderr, format, args) < 0 + || putc('\n', stderr) < 0) return SR_ERR; return SR_OK; @@ -253,69 +206,4 @@ SR_PRIV int sr_log(int loglevel, const char *format, ...) return ret; } -/** @private */ -SR_PRIV int sr_spew(const char *format, ...) -{ - int ret; - va_list args; - - va_start(args, format); - ret = sr_log_cb(sr_log_cb_data, SR_LOG_SPEW, format, args); - va_end(args); - - return ret; -} - -/** @private */ -SR_PRIV int sr_dbg(const char *format, ...) -{ - int ret; - va_list args; - - va_start(args, format); - ret = sr_log_cb(sr_log_cb_data, SR_LOG_DBG, format, args); - va_end(args); - - return ret; -} - -/** @private */ -SR_PRIV int sr_info(const char *format, ...) -{ - int ret; - va_list args; - - va_start(args, format); - ret = sr_log_cb(sr_log_cb_data, SR_LOG_INFO, format, args); - va_end(args); - - return ret; -} - -/** @private */ -SR_PRIV int sr_warn(const char *format, ...) -{ - int ret; - va_list args; - - va_start(args, format); - ret = sr_log_cb(sr_log_cb_data, SR_LOG_WARN, format, args); - va_end(args); - - return ret; -} - -/** @private */ -SR_PRIV int sr_err(const char *format, ...) -{ - int ret; - va_list args; - - va_start(args, format); - ret = sr_log_cb(sr_log_cb_data, SR_LOG_ERR, format, args); - va_end(args); - - return ret; -} - /** @} */