*
* (c) 1997--2009 Martin Mares <mj@ucw.cz>
* (c) 2008 Tomas Gavenciak <gavento@ucw.cz>
+ * (c) 2014 Tomas Valla <tom@ucw.cz>
*
* This software may be freely distributed and used according to the terms
* of the GNU Lesser General Public License.
*/
-#include "ucw/lib.h"
-#include "ucw/log.h"
-#include "ucw/log-internal.h"
-#include "ucw/simple-lists.h"
+#include <ucw/lib.h>
+#include <ucw/log.h>
+#include <ucw/log-internal.h>
+#include <ucw/simple-lists.h>
#include <stdio.h>
#include <stdlib.h>
static int default_log_handler(struct log_stream *ls UNUSED, struct log_msg *m)
{
// This is a completely bare version of the log-file module. Errors are ignored.
- write(2, m->m, m->m_len);
+ if (write(2, m->m, m->m_len) < 0)
+ {
+ }
return 0;
}
}
/* Pass the message to the log_stream */
- if (log_pass_msg(0, ls, &m))
+ log_pass_msg(ls, &m);
+ if (m.error)
{
/* Error (such as infinite loop) occurred */
- log_pass_msg(0, &log_stream_default, &m);
+ log_pass_msg(&log_stream_default, &m);
}
if (m.raw_msg != msgbuf)
errno = err;
snprintf(errbuf, sizeof(errbuf), "Error logging to %s: %m", name);
}
- log_pass_msg(0, &log_stream_default, &errm);
+ log_pass_msg(&log_stream_default, &errm);
if (ls->stream_flags & LSFLAG_ERR_IS_FATAL)
do_die();
/* Maximal depth of log_pass_msg recursion */
#define LS_MAX_DEPTH 64
-int
-log_pass_msg(int depth, struct log_stream *ls, struct log_msg *m)
+void
+log_pass_filtered(struct log_stream *ls, struct log_msg *m)
{
- ASSERT(ls);
-
- /* Check recursion depth */
- if (depth > LS_MAX_DEPTH)
- {
- log_report_err(ls, m, EDEADLK);
- return 1;
- }
-
- /* Filter by level, type and hook function */
- if (!((1 << LS_GET_LEVEL(m->flags)) & ls->levels) ||
- !((1 << LS_GET_TYPE(m->flags)) & ls->types) ||
- ls->filter && ls->filter(ls, m))
- return 0;
-
/* Pass the message to substreams */
CLIST_FOR_EACH(simp_node *, s, ls->substreams)
- if (log_pass_msg(depth+1, s->p, m))
- return 1;
+ {
+ log_pass_msg(s->p, m);
+ if (m->error)
+ return;
+ }
/* Will pass to the handler of this stream... is there any? */
if (!ls->handler)
- return 0;
+ return;
/* Will print a message type? */
char *type = NULL;
if (free_buf)
xfree(free_buf);
- return 0;
+}
+
+void
+log_pass_msg(struct log_stream *ls, struct log_msg *m)
+{
+ ASSERT(ls);
+
+ /* Check recursion depth */
+ if (m->depth > LS_MAX_DEPTH)
+ {
+ log_report_err(ls, m, EDEADLK);
+ m->error = 1;
+ return;
+ }
+
+ /* Filter by level and type */
+ if (!((1 << LS_GET_LEVEL(m->flags)) & ls->levels) ||
+ !((1 << LS_GET_TYPE(m->flags)) & ls->types))
+ return;
+
+ m->depth++;
+
+ if (ls->filter && ls->filter(ls, m))
+ {
+ // The filter might have called log_pass_filtered()
+ }
+ else
+ log_pass_filtered(ls, m);
+
+ m->depth--;
}
/*** Utility functions ***/
#ifdef DEBUG_DIE_BY_ABORT
abort();
#else
+ const char *env = getenv(CONFIG_UCW_ENV_VAR_DIE_BY_ABORT);
+ if (env && *env)
+ abort();
exit(1);
#endif
}
void
-die(const char *fmt, ...)
+vdie(const char *fmt, va_list args)
{
- va_list args;
-
- va_start(args, fmt);
vmsg(L_FATAL, fmt, args);
- va_end(args);
if (log_die_hook)
log_die_hook();
do_die();
}
+void
+die(const char *fmt, ...)
+{
+ va_list args;
+ va_start(args, fmt);
+ vdie(fmt, args);
+}
+
void
assert_failed(const char *assertion, const char *file, int line)
{
abort();
}
+void
+assert_failed_msg(const char *assertion, const char *file, int line, const char *fmt, ...)
+{
+ va_list args;
+ va_start(args, fmt);
+ vmsg(L_DEBUG, fmt, args);
+ msg(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line);
+ abort();
+}
+
void
assert_failed_noinfo(void)
{