summaryrefslogtreecommitdiff
path: root/debug.c
diff options
context:
space:
mode:
Diffstat (limited to 'debug.c')
-rw-r--r--debug.c176
1 files changed, 21 insertions, 155 deletions
diff --git a/debug.c b/debug.c
index 890d7a5..e91ff31 100644
--- a/debug.c
+++ b/debug.c
@@ -41,6 +41,10 @@
#include <pthread.h>
#endif
+#ifdef WITH_DBG_FILTER
+#include "debug_filter.h"
+#endif
+
struct {
unsigned int flags;
#ifdef WITH_DBG_MUTEX
@@ -126,6 +130,11 @@ dbg_status_t dbg_init(unsigned int flags, ...)
dbg_config.syslog_host = (const char*)va_arg(vl, char*);
break;
#endif
+#ifdef WITH_DBG_FILTER
+ case DBG_OPTION_FILTER:
+ dbg_filter_parse((const char*)va_arg(vl, char*));
+ break;
+#endif
default:
status = DBG_STATUS_UNKNOWN_OPTION;
printf("option: %x\n", option);
@@ -160,9 +169,16 @@ void dbg_close()
dbg_mutex_close();
}
-static const char * const debug_class_str[] =
+const char * const debug_class_str[] =
{ "fixme", "err", "warn", "info", "debug" };
+/*
+static unsigned int gettid()
+{
+ return (unsigned int)pthread_self();
+}
+*/
+
static int dbg_create_header(char *hdr, size_t size)
{
time_t rawtime = time(NULL);
@@ -200,6 +216,10 @@ int __debug(const char *func, const int line,
dbg_mutex_lock();
+#ifdef WITH_DBG_FILTER
+ if(!dbg_filter_enabled(cl, ch)) goto done;
+#endif
+
//
// Generate message
//
@@ -244,157 +264,3 @@ int __debug(const char *func, const int line,
return result;
}
-#if 0
-
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-//#include <pthread.h>
-#include <string>
-#include <time.h>
-
-//#include "mutex.h"
-
-//static Mutex mutex;
-
-static unsigned int gettid()
-{
- return 0;//(unsigned int)pthread_self();
-}
-
-static FILE *logfp = stderr;
-
-#define NELEM(x) (sizeof(x)/sizeof((x)[0]))
-struct __debug_channel
-{
- char name[32];
- unsigned flags;
-};
-
-static const char * const debug_class_str[] =
- { "fixme", "err", "warn", "info", "debug" };
-
-#define __DEBUG_CHANNEL_MAX 256
-
-static struct __debug_channel debug_channel[__DEBUG_CHANNEL_MAX];
-static unsigned n_debug_channel = 0;
-static unsigned debug_flags = (1 << __class_err) | (1 << __class_fixme);
-
-static int __debug_enabled(const enum __debug_class cl, const char *ch)
-{
- unsigned i;
- for(i = 0; i < n_debug_channel; i++) {
- if(!strcmp(ch, debug_channel[i].name)) {
- return (debug_channel[i].flags & (1 << cl)) != 0;
- }
- }
- return debug_flags & (1 << cl);
-}
-
-int __debug(const char *func, const int line,
- const enum __debug_class cl,
- const char *ch, const char *fmt, ...)
-{
- time_t rawtime = time(NULL);
- struct tm *t = localtime(&rawtime);
-
- // MutexAutolock m(mutex);
- int ret = 0;
- if(__debug_enabled(cl, ch)) {
- if((unsigned)cl < NELEM(debug_class_str))
- ret += fprintf(logfp, "%d-%02d-%02d %02d:%02d:%02d %u %s:%s:%s:%d ",
- t->tm_year + 1900,
- t->tm_mon + 1,
- t->tm_mday,
- t->tm_hour,
- t->tm_min,
- t->tm_sec,
- gettid(),
- debug_class_str[(unsigned)cl], ch, func, line);
- if(fmt) {
- va_list va;
- va_start(va, fmt);
- ret += vfprintf(logfp, fmt, va);
- va_end(va);
- }
- }
- if(ret){
- fflush(logfp);
- }
- return ret;
-}
-
-void debug_init(FILE *fp)
-{
- // mutex.name = "debug";
- // MutexAutolock m(mutex);
- logfp = fp;
-}
-
-/*
- * fmt := [set[,set]*]*
- * set := [+-]channel
- * | class[+-]channel
- * | [+-]all
- */
-void debug_parse(const char *fmt)
-{
- // MutexAutolock m(mutex);
- char *s;
- char *next;
- char *opt;
-
- if(!(s = strdup(fmt))) return;
-
- for(opt = s; opt; opt = next) {
- int set = 0;
- int clr = 0;
- unsigned i;
- if((next = strchr(opt, ','))) *next++ = '\0';
- char *p = opt + strcspn(opt, "+-");
- if(!*p) p = opt; // All chars -> a channel name
- if(p > opt) {
- // we have a class
- for(i = 0; i < NELEM(debug_class_str); i++) {
- int n = strlen(debug_class_str[i]);
- if(n != (p - opt)) continue;
- if(!memcmp(opt, debug_class_str[i], n)) {
- // Found the class
- if(*p == '+')
- set = 1 << i;
- else
- clr = 1 << i;
- break;
- }
- }
- if(i == NELEM(debug_class_str)) continue;
- } else {
- if(*p == '-')
- clr = ~0;
- else
- set = ~0;
- }
- if(*p == '+' || *p == '-') p++;
- if(!*p) continue;
- if(!strcmp("all", p)) {
- debug_flags = (debug_flags & ~clr) | set;
- } else {
- if(strlen(p) >= sizeof(debug_channel[0].name)) continue;
- for(i = 0; i < n_debug_channel; i++) {
- if(!strcmp(p, debug_channel[i].name)) {
- debug_channel[i].flags = (debug_channel[i].flags & ~clr) | set;
- break;
- }
- }
- if(i == n_debug_channel && n_debug_channel < __DEBUG_CHANNEL_MAX) {
- strcpy(debug_channel[i].name, p);
- debug_channel[i].flags = (debug_flags & ~clr) | set;
- n_debug_channel++;
- }
- }
- }
- free(s);
-}
-
-
-#endif