Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bindings v2: Enforce to explicitely ask for concurrency
[src/app-framework-binder.git]
/
src
/
afb-api-so-v1.c
diff --git
a/src/afb-api-so-v1.c
b/src/afb-api-so-v1.c
index
a81ec17
..
c5f20b7
100644
(file)
--- a/
src/afb-api-so-v1.c
+++ b/
src/afb-api-so-v1.c
@@
-16,7
+16,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
-#define
NO_BINDING
_VERBOSE_MACRO
+#define
AFB_BINDING_PRAGMA_NO
_VERBOSE_MACRO
#include <string.h>
#include <dlfcn.h>
#include <string.h>
#include <dlfcn.h>
@@
-27,6
+27,7
@@
#include <afb/afb-binding.h>
#include "afb-api.h"
#include <afb/afb-binding.h>
#include "afb-api.h"
+#include "afb-api-so-v1.h"
#include "afb-apiset.h"
#include "afb-svc.h"
#include "afb-evt.h"
#include "afb-apiset.h"
#include "afb-svc.h"
#include "afb-evt.h"
@@
-70,11
+71,7
@@
static void call_cb(void *closure, struct afb_xreq *xreq)
struct api_so_v1 *desc = closure;
verb = search(desc, xreq->verb);
struct api_so_v1 *desc = closure;
verb = search(desc, xreq->verb);
- if (!verb)
- afb_xreq_fail_unknown_verb(xreq);
- else
- if (!xreq_session_check_apply(xreq, verb->session))
- afb_xreq_call(xreq, verb->callback);
+ afb_xreq_call_verb_v1(xreq, verb);
}
static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
}
static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
@@
-109,7
+106,7
@@
static int service_start_cb(void *closure, int share_session, int onneed, struct
/* get the event handler if any */
onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
/* get the event handler if any */
onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
- desc->service = afb_svc_create(apiset, share_session, init, onevent);
+ desc->service = afb_svc_create
_v1
(apiset, share_session, init, onevent);
if (desc->service == NULL) {
/* starting error */
ERROR("Starting service %s failed", desc->binding->v1.prefix);
if (desc->service == NULL) {
/* starting error */
ERROR("Starting service %s failed", desc->binding->v1.prefix);
@@
-208,10
+205,10
@@
int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
desc->handle = handle;
/* init the interface */
desc->handle = handle;
/* init the interface */
- afb_ditf_init(&desc->ditf, path);
+ afb_ditf_init
_v1
(&desc->ditf, path);
/* init the binding */
/* init the binding */
-
NOTICE
("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
+
INFO
("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
desc->binding = register_function(&desc->ditf.interface);
if (desc->binding == NULL) {
ERROR("binding [%s] register function failed. continuing...", path);
desc->binding = register_function(&desc->ditf.interface);
if (desc->binding == NULL) {
ERROR("binding [%s] register function failed. continuing...", path);
@@
-248,7
+245,7
@@
int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
ERROR("binding [%s] can't be registered...", path);
goto error2;
}
ERROR("binding [%s] can't be registered...", path);
goto error2;
}
-
NOTICE
("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix);
+
INFO
("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix);
return 1;
error2:
return 1;
error2: