Improve handling of verbosity in bindings

The macro AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO is removed.

The macro AFB_BINDING_PRAGMA_NO_VERBOSE_UNPREFIX is removed.

The macro AFB_BINDING_PRAGMA_KEEP_VERBOSE_UNPREFIX is now used to
activate the weakly named verbose macros DEBUG, INFO, NOTICE,
WARNING, ERROR.

The macros AFB_BINDING_PRAGMA_NO_VERBOSE_DATA and
AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS can be used to tune what
verbose parts are to be emitted:

If AFB_BINDING_PRAGMA_NO_VERBOSE_DATA is defined then the macro
will only report the file and the line that emitted the message.
This mode is intended to reduce the count of static data plugin
the binary.

If AFB_BINDING_PRAGMA_NO_VERBOSE_DATA is not defined and
AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS is defined, this is the opposite:
the messages are emitted but not the file, line and function.

When none of these 2 are difened, everything is emitted: the message
and the details.

Change-Id: Ibb83cd435797fadf90626cb06bbda77f0f8b3cde
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

3 files changed, 114 insertions, 87 deletions

diff --git a/include/afb/afb-binding-v1.h b/include/afb/afb-binding-v1.h
index 09edddb5..6c9b5c19 100644
--- a/include/afb/afb-binding-v1.h
+++ b/include/afb/afb-binding-v1.h
@@ -147,30 +147,51 @@ struct afb_binding_interface_v1
 /*
  * Macros for logging messages
  */
-#if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
-# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS)
-#  define _AFB_LOGGING_V1_(itf,vlevel,llevel,...) \
+#if defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DATA)
+
+# define _AFB_LOGGING_V1_(itf,vlevel,llevel,...) \
 	do{ \
-		if(itf->verbosity>=vlevel) \
-			afb_daemon_verbose2_v1(itf->daemon,llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+		if(itf->verbosity>=vlevel) {\
+			if (llevel <= AFB_VERBOSITY_LEVEL_ERROR) \
+				afb_daemon_verbose2_v1(itf->daemon,llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+			else \
+				afb_daemon_verbose2_v1(itf->daemon,llevel,__FILE__,__LINE__,NULL,NULL); \
+		} \
 	}while(0)
-#  define _AFB_REQ_LOGGING_V1_(itf,vlevel,llevel,req,...) \
+# define _AFB_REQ_LOGGING_V1_(itf,vlevel,llevel,req,...) \
 	do{ \
 		if(itf->verbosity>=vlevel) \
-			afb_req_verbose(req,llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+			afb_req_verbose(req,llevel,__FILE__,__LINE__,NULL,NULL); \
 	}while(0)
-# else
-#  define _AFB_LOGGING_V1_(itf,vlevel,llevel,...) \
+
+#elif defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS)
+
+# define _AFB_LOGGING_V1_(itf,vlevel,llevel,...) \
 	do{ \
 		if(itf->verbosity>=vlevel) \
-			afb_daemon_verbose_v1(itf->daemon,llevel,NULL,0,NULL,__VA_ARGS__); \
+			afb_daemon_verbose2_v1(itf->daemon,llevel,NULL,0,NULL,__VA_ARGS__); \
 	}while(0)
-#  define _AFB_REQ_LOGGING_V1_(itf,vlevel,llevel,req,...) \
+# define _AFB_REQ_LOGGING_V1_(itf,vlevel,llevel,req,...) \
 	do{ \
 		if(itf->verbosity>=vlevel) \
 			afb_req_verbose(req,llevel,NULL,0,NULL,__VA_ARGS__); \
 	}while(0)
-# endif
+
+#else
+
+# define _AFB_LOGGING_V1_(itf,vlevel,llevel,...) \
+	do{ \
+		if(itf->verbosity>=vlevel) \
+			afb_daemon_verbose2_v1(itf->daemon,llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+	}while(0)
+# define _AFB_REQ_LOGGING_V1_(itf,vlevel,llevel,req,...) \
+	do{ \
+		if(itf->verbosity>=vlevel) \
+			afb_req_verbose(req,llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+	}while(0)
+
+#endif
+
 # include "afb-verbosity.h"
 # define AFB_ERROR_V1(itf,...)       _AFB_LOGGING_V1_(itf,AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
 # define AFB_WARNING_V1(itf,...)     _AFB_LOGGING_V1_(itf,AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
@@ -182,5 +203,4 @@ struct afb_binding_interface_v1
 # define AFB_REQ_NOTICE_V1(itf,...)  _AFB_REQ_LOGGING_V1_(itf,AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
 # define AFB_REQ_INFO_V1(itf,...)    _AFB_REQ_LOGGING_V1_(itf,AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
 # define AFB_REQ_DEBUG_V1(itf,...)   _AFB_REQ_LOGGING_V1_(itf,AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
-#endif
 
diff --git a/include/afb/afb-binding-v2.h b/include/afb/afb-binding-v2.h
index 8831a434..4780b4ef 100644
--- a/include/afb/afb-binding-v2.h
+++ b/include/afb/afb-binding-v2.h
@@ -92,43 +92,63 @@ struct afb_binding_data_v2 AFB_BINDING_DATA_NAME_V2  __attribute__ ((weak));
 /*
  * Macros for logging messages
  */
-#if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
-# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS)
-#  define _AFB_LOGGING_V2_(vlevel,llevel,...) \
+#if defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DATA)
+
+# define _AFB_LOGGING_V2_(vlevel,llevel,...) \
 	do{ \
-		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
-			afb_daemon_verbose_v2(llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) {\
+			if (llevel <= AFB_VERBOSITY_LEVEL_ERROR) \
+				afb_daemon_verbose_v2(llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+			else \
+				afb_daemon_verbose_v2(llevel,__FILE__,__LINE__,NULL,NULL); \
+		} \
 	}while(0)
-#  define _AFB_REQ_LOGGING_V2_(vlevel,llevel,req,...) \
+# define _AFB_REQ_LOGGING_V2_(vlevel,llevel,req,...) \
 	do{ \
 		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
-			afb_req_verbose(req,llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+			afb_req_verbose(req,llevel,__FILE__,__LINE__,NULL,NULL); \
 	}while(0)
-# else
-#  define _AFB_LOGGING_V2_(vlevel,llevel,...) \
+
+#elif defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS)
+
+# define _AFB_LOGGING_V2_(vlevel,llevel,...) \
 	do{ \
-		if(afbBindingV2data.verbosity>=vlevel) \
+		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
 			afb_daemon_verbose_v2(llevel,NULL,0,NULL,__VA_ARGS__); \
 	}while(0)
-#  define _AFB_REQ_LOGGING_V2_(vlevel,llevel,req,...) \
+# define _AFB_REQ_LOGGING_V2_(vlevel,llevel,req,...) \
 	do{ \
 		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
 			afb_req_verbose(req,llevel,NULL,0,NULL,__VA_ARGS__); \
 	}while(0)
-# endif
-# include "afb-verbosity.h"
-# define AFB_ERROR_V2(...)       _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
-# define AFB_WARNING_V2(...)     _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
-# define AFB_NOTICE_V2(...)      _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
-# define AFB_INFO_V2(...)        _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
-# define AFB_DEBUG_V2(...)       _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
-# define AFB_REQ_ERROR_V2(...)   _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
-# define AFB_REQ_WARNING_V2(...) _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
-# define AFB_REQ_NOTICE_V2(...)  _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
-# define AFB_REQ_INFO_V2(...)    _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
-# define AFB_REQ_DEBUG_V2(...)   _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
+
+#else
+
+# define _AFB_LOGGING_V2_(vlevel,llevel,...) \
+	do{ \
+		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
+			afb_daemon_verbose_v2(llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+	}while(0)
+# define _AFB_REQ_LOGGING_V2_(vlevel,llevel,req,...) \
+	do{ \
+		if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \
+			afb_req_verbose(req,llevel,__FILE__,__LINE__,__func__,__VA_ARGS__); \
+	}while(0)
+
 #endif
 
+#include "afb-verbosity.h"
+#define AFB_ERROR_V2(...)       _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
+#define AFB_WARNING_V2(...)     _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
+#define AFB_NOTICE_V2(...)      _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
+#define AFB_INFO_V2(...)        _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
+#define AFB_DEBUG_V2(...)       _AFB_LOGGING_V2_(AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
+#define AFB_REQ_ERROR_V2(...)   _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_ERROR,_AFB_SYSLOG_LEVEL_ERROR_,__VA_ARGS__)
+#define AFB_REQ_WARNING_V2(...) _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_WARNING,_AFB_SYSLOG_LEVEL_WARNING_,__VA_ARGS__)
+#define AFB_REQ_NOTICE_V2(...)  _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_NOTICE,_AFB_SYSLOG_LEVEL_NOTICE_,__VA_ARGS__)
+#define AFB_REQ_INFO_V2(...)    _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_INFO,_AFB_SYSLOG_LEVEL_INFO_,__VA_ARGS__)
+#define AFB_REQ_DEBUG_V2(...)   _AFB_REQ_LOGGING_V2_(AFB_VERBOSITY_LEVEL_DEBUG,_AFB_SYSLOG_LEVEL_DEBUG_,__VA_ARGS__)
+
 #include "afb-daemon-v2.h"
 #include "afb-service-v2.h"
 
diff --git a/include/afb/afb-binding.h b/include/afb/afb-binding.h
index 45cff649..1c4ec3f2 100644
--- a/include/afb/afb-binding.h
+++ b/include/afb/afb-binding.h
@@ -139,21 +139,17 @@ typedef struct afb_service_itf          afb_service_itf;
 # define AFB_SESSION_LOA_GE_2	AFB_SESSION_LOA_GE_2_V1
 # define AFB_SESSION_LOA_GE_3	AFB_SESSION_LOA_GE_3_V1
 
-# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
-
-#  define AFB_ERROR		AFB_ERROR_V1
-#  define AFB_WARNING		AFB_WARNING_V1
-#  define AFB_NOTICE		AFB_NOTICE_V1
-#  define AFB_INFO		AFB_INFO_V1
-#  define AFB_DEBUG		AFB_DEBUG_V1
-
-#  define AFB_REQ_ERROR		AFB_REQ_ERROR_V1
-#  define AFB_REQ_WARNING	AFB_REQ_WARNING_V1
-#  define AFB_REQ_NOTICE	AFB_REQ_NOTICE_V1
-#  define AFB_REQ_INFO		AFB_REQ_INFO_V1
-#  define AFB_REQ_DEBUG		AFB_REQ_DEBUG_V1
-
-# endif
+# define AFB_ERROR		AFB_ERROR_V1
+# define AFB_WARNING		AFB_WARNING_V1
+# define AFB_NOTICE		AFB_NOTICE_V1
+# define AFB_INFO		AFB_INFO_V1
+# define AFB_DEBUG		AFB_DEBUG_V1
+
+# define AFB_REQ_ERROR		AFB_REQ_ERROR_V1
+# define AFB_REQ_WARNING	AFB_REQ_WARNING_V1
+# define AFB_REQ_NOTICE		AFB_REQ_NOTICE_V1
+# define AFB_REQ_INFO		AFB_REQ_INFO_V1
+# define AFB_REQ_DEBUG		AFB_REQ_DEBUG_V1
 
 #define afb_daemon_get_event_loop	afb_daemon_get_event_loop_v1
 #define afb_daemon_get_user_bus		afb_daemon_get_user_bus_v1
@@ -197,21 +193,17 @@ typedef struct afb_service_itf          afb_service_itf;
 # define AFB_SESSION_LOA_2	AFB_SESSION_LOA_2_V2
 # define AFB_SESSION_LOA_3	AFB_SESSION_LOA_3_V2
 
-# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
-
-#  define AFB_ERROR		AFB_ERROR_V2
-#  define AFB_WARNING		AFB_WARNING_V2
-#  define AFB_NOTICE		AFB_NOTICE_V2
-#  define AFB_INFO		AFB_INFO_V2
-#  define AFB_DEBUG		AFB_DEBUG_V2
+# define AFB_ERROR		AFB_ERROR_V2
+# define AFB_WARNING		AFB_WARNING_V2
+# define AFB_NOTICE		AFB_NOTICE_V2
+# define AFB_INFO		AFB_INFO_V2
+# define AFB_DEBUG		AFB_DEBUG_V2
 
-#  define AFB_REQ_ERROR		AFB_REQ_ERROR_V2
-#  define AFB_REQ_WARNING	AFB_REQ_WARNING_V2
-#  define AFB_REQ_NOTICE	AFB_REQ_NOTICE_V2
-#  define AFB_REQ_INFO		AFB_REQ_INFO_V2
-#  define AFB_REQ_DEBUG		AFB_REQ_DEBUG_V2
-
-# endif
+# define AFB_REQ_ERROR		AFB_REQ_ERROR_V2
+# define AFB_REQ_WARNING	AFB_REQ_WARNING_V2
+# define AFB_REQ_NOTICE		AFB_REQ_NOTICE_V2
+# define AFB_REQ_INFO		AFB_REQ_INFO_V2
+# define AFB_REQ_DEBUG		AFB_REQ_DEBUG_V2
 
 #define afb_daemon_get_event_loop	afb_daemon_get_event_loop_v2
 #define afb_daemon_get_user_bus		afb_daemon_get_user_bus_v2
@@ -237,32 +229,27 @@ typedef struct afb_service_itf          afb_service_itf;
 
 #if AFB_BINDING_VERSION >= 2
 
-# define afb_verbose_error()	(afb_get_verbosity() >= 0)
-# define afb_verbose_warning()	(afb_get_verbosity() >= 1)
-# define afb_verbose_notice()	(afb_get_verbosity() >= 1)
-# define afb_verbose_info()	(afb_get_verbosity() >= 2)
-# define afb_verbose_debug()	(afb_get_verbosity() >= 3)
+# define afb_verbose_error()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_ERROR)
+# define afb_verbose_warning()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_WARNING)
+# define afb_verbose_notice()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_NOTICE)
+# define afb_verbose_info()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_INFO)
+# define afb_verbose_debug()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_DEBUG)
 
-# if !defined(AFB_BINDING_PRAGMA_KEEP_VERBOSE_UNPREFIX) && !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_UNPREFIX)
-#  define AFB_BINDING_PRAGMA_NO_VERBOSE_UNPREFIX
-# endif
 #endif
 
 /***************************************************************************************************/
 
-#if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_UNPREFIX)
-# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
-#  define ERROR			AFB_ERROR
-#  define WARNING		AFB_WARNING
-#  define NOTICE		AFB_NOTICE
-#  define INFO			AFB_INFO
-#  define DEBUG			AFB_DEBUG
-
-#  define REQ_ERROR		AFB_REQ_ERROR
-#  define REQ_WARNING		AFB_REQ_WARNING
-#  define REQ_NOTICE		AFB_REQ_NOTICE
-#  define REQ_INFO		AFB_REQ_INFO
-#  define REQ_DEBUG		AFB_REQ_DEBUG
-# endif
+#if defined(AFB_BINDING_PRAGMA_KEEP_VERBOSE_UNPREFIX)
+# define ERROR			AFB_ERROR
+# define WARNING		AFB_WARNING
+# define NOTICE			AFB_NOTICE
+# define INFO			AFB_INFO
+# define DEBUG			AFB_DEBUG
+
+# define REQ_ERROR		AFB_REQ_ERROR
+# define REQ_WARNING		AFB_REQ_WARNING
+# define REQ_NOTICE		AFB_REQ_NOTICE
+# define REQ_INFO		AFB_REQ_INFO
+# define REQ_DEBUG		AFB_REQ_DEBUG
 #endif