X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-binding-v2.h;h=621ddce6bc5b9c45ec8844f079b0d71204c2d361;hb=f30be1ca9ce04cfab55b9e6ce25cec6952f7e21d;hp=6f8eb953bd105955a201b2374616df87ce8850d9;hpb=95c29ef579d6320a721f96d7146efd10f74a201b;p=src%2Fapp-framework-binder.git diff --git a/include/afb/afb-binding-v2.h b/include/afb/afb-binding-v2.h index 6f8eb953..621ddce6 100644 --- a/include/afb/afb-binding-v2.h +++ b/include/afb/afb-binding-v2.h @@ -20,11 +20,12 @@ #include #include "afb-auth.h" -#include "afb-req-itf.h" -#include "afb-event-itf.h" +#include "afb-event.h" +#include "afb-req.h" #include "afb-service-common.h" #include "afb-daemon-common.h" +#include "afb-req-v2.h" #include "afb-session-v2.h" struct json_object; @@ -35,9 +36,10 @@ struct json_object; */ struct afb_verb_v2 { - const char *verb; /* name of the verb */ + const char *verb; /* name of the verb, NULL only at end of the array */ void (*callback)(struct afb_req req); /* callback function implementing the verb */ - const struct afb_auth *auth; /* required authorisation */ + const struct afb_auth *auth; /* required authorisation, can be NULL */ + const char *info; /* some info about the verb, can be NULL */ uint32_t session; /* authorisation and session requirements of the verb */ }; @@ -47,11 +49,12 @@ struct afb_verb_v2 struct afb_binding_v2 { const char *api; /* api name for the binding */ - const char *specification; /* textual specification of the binding */ + const char *specification; /* textual specification of the binding, can be NULL */ + const char *info; /* some info about the api, can be NULL */ const struct afb_verb_v2 *verbs; /* array of descriptions of verbs terminated by a NULL name */ - int (*preinit)(); - int (*init)(); - void (*onevent)(const char *event, struct json_object *object); + int (*preinit)(); /* callback at load of the binding */ + int (*init)(); /* callback for starting the service */ + void (*onevent)(const char *event, struct json_object *object); /* callback for handling events */ unsigned noconcurrency: 1; /* avoids concurrent requests to verbs */ }; @@ -77,11 +80,10 @@ extern const struct afb_binding_v2 afbBindingV2; #define AFB_BINDING_DATA_NAME_V2 afbBindingV2data #endif -#if AFB_BINDING_VERSION == 2 -struct afb_binding_data_v2 AFB_BINDING_DATA_NAME_V2 __attribute__ ((weak)); -#else -extern struct afb_binding_data_v2 AFB_BINDING_DATA_NAME_V2; +#if AFB_BINDING_VERSION != 2 +extern #endif +struct afb_binding_data_v2 AFB_BINDING_DATA_NAME_V2 __attribute__ ((weak)); #define afb_get_verbosity_v2() (AFB_BINDING_DATA_NAME_V2.verbosity) #define afb_get_daemon_v2() (AFB_BINDING_DATA_NAME_V2.daemon) @@ -90,70 +92,63 @@ extern struct afb_binding_data_v2 AFB_BINDING_DATA_NAME_V2; /* * 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) -# else -# define _AFB_LOGGING_V2_(vlevel,llevel,...) \ +# define _AFB_REQ_LOGGING_V2_(vlevel,llevel,req,...) \ do{ \ - if(afbBindingV2data.verbosity>=vlevel) \ - afb_daemon_verbose_v2(llevel,NULL,0,NULL,__VA_ARGS__); \ + if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \ + afb_req_verbose(req,llevel,__FILE__,__LINE__,NULL,NULL); \ }while(0) -# endif -# define AFB_ERROR_V2(...) _AFB_LOGGING_V2_(0,3,__VA_ARGS__) -# define AFB_WARNING_V2(...) _AFB_LOGGING_V2_(1,4,__VA_ARGS__) -# define AFB_NOTICE_V2(...) _AFB_LOGGING_V2_(1,5,__VA_ARGS__) -# define AFB_INFO_V2(...) _AFB_LOGGING_V2_(2,6,__VA_ARGS__) -# define AFB_DEBUG_V2(...) _AFB_LOGGING_V2_(3,7,__VA_ARGS__) -#endif -#include "afb-daemon-v2.h" -#include "afb-service-v2.h" - -/***************************************************************************************************/ - -#if AFB_BINDING_VERSION == 2 - -# define afb_binding afb_binding_v2 -# define afb_binding_interface afb_binding_interface_v2 +#elif defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS) -# define AFB_SESSION_NONE AFB_SESSION_NONE_V2 -# define AFB_SESSION_CLOSE AFB_SESSION_CLOSE_V2 -# define AFB_SESSION_RENEW AFB_SESSION_REFRESH_V2 -# define AFB_SESSION_REFRESH AFB_SESSION_REFRESH_V2 -# define AFB_SESSION_CHECK AFB_SESSION_CHECK_V2 - -# define AFB_SESSION_LOA_MASK AFB_SESSION_LOA_MASK_V2 - -# define AFB_SESSION_LOA_0 AFB_SESSION_LOA_0_V2 -# define AFB_SESSION_LOA_1 AFB_SESSION_LOA_1_V2 -# define AFB_SESSION_LOA_2 AFB_SESSION_LOA_2_V2 -# define AFB_SESSION_LOA_3 AFB_SESSION_LOA_3_V2 +# define _AFB_LOGGING_V2_(vlevel,llevel,...) \ + do{ \ + 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,...) \ + do{ \ + if(AFB_BINDING_DATA_NAME_V2.verbosity>=vlevel) \ + afb_req_verbose(req,llevel,NULL,0,NULL,__VA_ARGS__); \ + }while(0) -# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO) +#else -# define ERROR AFB_ERROR_V2 -# define WARNING AFB_WARNING_V2 -# define NOTICE AFB_NOTICE_V2 -# define INFO AFB_INFO_V2 -# define DEBUG AFB_DEBUG_V2 +# 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 +#endif -#define afb_daemon_get_event_loop afb_daemon_get_event_loop_v2 -#define afb_daemon_get_user_bus afb_daemon_get_user_bus_v2 -#define afb_daemon_get_system_bus afb_daemon_get_system_bus_v2 -#define afb_daemon_broadcast_event afb_daemon_broadcast_event_v2 -#define afb_daemon_make_event afb_daemon_make_event_v2 -#define afb_daemon_verbose afb_daemon_verbose_v2 -#define afb_daemon_rootdir_get_fd afb_daemon_rootdir_get_fd_v2 -#define afb_daemon_rootdir_open_locale afb_daemon_rootdir_open_locale_v2 -#define afb_daemon_queue_job afb_daemon_queue_job_v2 +#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__) -#define afb_service_call afb_service_call_v2 +#include "afb-daemon-v2.h" +#include "afb-service-v2.h" -#endif