X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fverbose.h;h=402da4043ffc787fed19e0925c60af0cb28c98f6;hb=3c7a1f5c28c23e5d0a933db19993d9c71fe6a3a2;hp=25bd85b0ddae7a118969abf06bb122ae8b486d21;hpb=68a8eaafe5f43480f29308bfd2ec12ad54da43f1;p=src%2Fapp-framework-binder.git

diff --git a/src/verbose.h b/src/verbose.h
index 25bd85b0..402da404 100644
--- a/src/verbose.h
+++ b/src/verbose.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2016 IoT.bzh
+ Copyright (C) 2016, 2017 "IoT.bzh"
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -18,24 +18,79 @@
 
 #pragma once
 
-#if !defined(NDEBUG)
-#include <syslog.h>
+#include <stdarg.h>
+
+/*
+  verbosity tune the count of reported messages
+
+   verbosity value : reported messages
+   ----------------+------------------------
+    lesser than 0  : no message at all
+         0         : ERROR
+         1         : ERROR, WARNING
+         2         : ERROR, WARNING, NOTICE
+         3         : ERROR, WARNING, NOTICE, INFO
+    greater than 3 : ERROR, WARNING, NOTICE, INFO, DEBUG
+
+*/
 extern int verbosity;
-#define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER)
-#define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH)
-#define ERROR(...)   syslog(LOG_ERR,__VA_ARGS__)
-#define WARNING(...) do{if(verbosity)syslog(LOG_WARNING,__VA_ARGS__);}while(0)
-#define NOTICE(...)  do{if(verbosity)syslog(LOG_NOTICE,__VA_ARGS__);}while(0)
-#define INFO(...)    do{if(verbosity>1)syslog(LOG_INFO,__VA_ARGS__);}while(0)
-#define DEBUG(...)   do{if(verbosity>2)syslog(LOG_DEBUG,__VA_ARGS__);}while(0)
+
+enum verbosity_levels
+{
+	Verbosity_Level_Error = 0,
+	Verbosity_Level_Warning = 1,
+	Verbosity_Level_Notice = 2,
+	Verbosity_Level_Info = 3,
+	Verbosity_Level_Debug = 4
+};
+
+extern void verbose_set_name(const char *name, int authority);
+
+/*
+ Log level is defined by syslog standard:
+       KERN_EMERG             0        System is unusable
+       KERN_ALERT             1        Action must be taken immediately
+       KERN_CRIT              2        Critical conditions
+       KERN_ERR               3        Error conditions
+       KERN_WARNING           4        Warning conditions
+       KERN_NOTICE            5        Normal but significant condition
+       KERN_INFO              6        Informational
+       KERN_DEBUG             7        Debug-level messages
+*/
+
+enum log_levels
+{
+	Log_Level_Emergency = 0,
+	Log_Level_Alert = 1,
+	Log_Level_Critical = 2,
+	Log_Level_Error = 3,
+	Log_Level_Warning = 4,
+	Log_Level_Notice = 5,
+	Log_Level_Info = 6,
+	Log_Level_Debug = 7
+};
+
+extern void verbose(int loglevel, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
+extern void vverbose(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args);
+
+#if defined(VERBOSE_NO_DATA)
+# define __VERBOSE__(lvl,...)      do{if((lvl)<=Log_Level_Error) verbose(lvl, __FILE__, __LINE__, __func__, __VA_ARGS__)\
+					else verbose(lvl, __FILE__, __LINE__, __func__, NULL);}while(0)
+#elif defined(VERBOSE_NO_DETAILS)
+# define __VERBOSE__(lvl,...)      verbose(lvl, NULL, 0, NULL, __VA_ARGS__)
 #else
-#include <syslog.h>
-#define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER)
-#define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH)
-extern void verbose_error(const char *file, int line);
-#define ERROR(...)   verbose_error(__FILE__,__LINE__)
-#define WARNING(...) do{/*nothing*/}while(0)
-#define NOTICE(...)  do{/*nothing*/}while(0)
-#define INFO(...)    do{/*nothing*/}while(0)
-#define DEBUG(...)   do{/*nothing*/}while(0)
+# define __VERBOSE__(lvl,...)      verbose(lvl, __FILE__, __LINE__, __func__, __VA_ARGS__)
 #endif
+
+# define _VERBOSE_(vlvl,llvl,...)  do{ if (verbosity >= vlvl) __VERBOSE__(llvl, __VA_ARGS__); } while(0)
+
+# define ERROR(...)                _VERBOSE_(Verbosity_Level_Error, Log_Level_Error, __VA_ARGS__)
+# define WARNING(...)              _VERBOSE_(Verbosity_Level_Warning, Log_Level_Warning, __VA_ARGS__)
+# define NOTICE(...)               _VERBOSE_(Verbosity_Level_Notice, Log_Level_Notice, __VA_ARGS__)
+# define INFO(...)                 _VERBOSE_(Verbosity_Level_Info, Log_Level_Info, __VA_ARGS__)
+# define DEBUG(...)                _VERBOSE_(Verbosity_Level_Debug, Log_Level_Debug, __VA_ARGS__)
+
+# define LOGUSER(app)              verbose_set_name(app,0)
+# define LOGAUTH(app)              verbose_set_name(app,1)
+
+extern void (*verbose_observer)(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args);