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
Improve log output format
[src/app-framework-binder.git]
/
src
/
afb-ditf.c
diff --git
a/src/afb-ditf.c
b/src/afb-ditf.c
index
e6b6857
..
b5a5093
100644
(file)
--- a/
src/afb-ditf.c
+++ b/
src/afb-ditf.c
@@
-16,14
+16,15
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
+#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <json-c/json.h>
#include <string.h>
#include <errno.h>
#include <json-c/json.h>
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
#include "afb-ditf.h"
#include "afb-evt.h"
#include "afb-ditf.h"
#include "afb-evt.h"
@@
-43,7
+44,7
@@
static void vverbose_cb(void *closure, int level, const char *file, int line, co
if (vasprintf(&p, fmt, args) < 0)
vverbose(level, file, line, function, fmt, args);
else {
if (vasprintf(&p, fmt, args) < 0)
vverbose(level, file, line, function, fmt, args);
else {
- verbose(level, file, line, function, "
%s {binding %s}", p, ditf->prefix
);
+ verbose(level, file, line, function, "
[API %s] %s", ditf->api, p
);
free(p);
}
}
free(p);
}
}
@@
-60,10
+61,10
@@
static struct afb_event event_make_cb(void *closure, const char *name)
struct afb_ditf *ditf = closure;
/* makes the event name */
struct afb_ditf *ditf = closure;
/* makes the event name */
- plen = strlen(ditf->
prefix
);
+ plen = strlen(ditf->
api
);
nlen = strlen(name);
event = alloca(nlen + plen + 2);
nlen = strlen(name);
event = alloca(nlen + plen + 2);
- memcpy(event, ditf->
prefix
, plen);
+ memcpy(event, ditf->
api
, plen);
event[plen] = '/';
memcpy(event + plen + 1, name, nlen + 1);
event[plen] = '/';
memcpy(event + plen + 1, name, nlen + 1);
@@
-78,10
+79,10
@@
static int event_broadcast_cb(void *closure, const char *name, struct json_objec
struct afb_ditf *ditf = closure;
/* makes the event name */
struct afb_ditf *ditf = closure;
/* makes the event name */
- plen = strlen(ditf->
prefix
);
+ plen = strlen(ditf->
api
);
nlen = strlen(name);
event = alloca(nlen + plen + 2);
nlen = strlen(name);
event = alloca(nlen + plen + 2);
- memcpy(event, ditf->
prefix
, plen);
+ memcpy(event, ditf->
api
, plen);
event[plen] = '/';
memcpy(event + plen + 1, name, nlen + 1);
event[plen] = '/';
memcpy(event + plen + 1, name, nlen + 1);
@@
-105,8
+106,11
@@
static int queue_job_cb(void *closure, void (*callback)(int signum, void *arg),
static void hooked_vverbose_cb(void *closure, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
{
struct afb_ditf *ditf = closure;
static void hooked_vverbose_cb(void *closure, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
{
struct afb_ditf *ditf = closure;
+ va_list ap;
+ va_copy(ap, args);
vverbose_cb(closure, level, file, line, function, fmt, args);
vverbose_cb(closure, level, file, line, function, fmt, args);
- afb_hook_ditf_vverbose(ditf, level, file, line, function, fmt, args);
+ afb_hook_ditf_vverbose(ditf, level, file, line, function, fmt, ap);
+ va_end(ap);
}
static void hooked_old_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
}
static void hooked_old_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
@@
-176,7
+180,8
@@
static int hooked_queue_job_cb(void *closure, void (*callback)(int signum, void
}
static const struct afb_daemon_itf daemon_itf = {
}
static const struct afb_daemon_itf daemon_itf = {
- .vverbose = old_vverbose_cb,
+ .vverbose_v1 = old_vverbose_cb,
+ .vverbose_v2 = vverbose_cb,
.event_make = event_make_cb,
.event_broadcast = event_broadcast_cb,
.get_event_loop = afb_common_get_event_loop,
.event_make = event_make_cb,
.event_broadcast = event_broadcast_cb,
.get_event_loop = afb_common_get_event_loop,
@@
-188,7
+193,8
@@
static const struct afb_daemon_itf daemon_itf = {
};
static const struct afb_daemon_itf hooked_daemon_itf = {
};
static const struct afb_daemon_itf hooked_daemon_itf = {
- .vverbose = hooked_old_vverbose_cb,
+ .vverbose_v1 = hooked_old_vverbose_cb,
+ .vverbose_v2 = hooked_vverbose_cb,
.event_make = hooked_event_make_cb,
.event_broadcast = hooked_event_broadcast_cb,
.get_event_loop = hooked_get_event_loop,
.event_make = hooked_event_make_cb,
.event_broadcast = hooked_event_broadcast_cb,
.get_event_loop = hooked_get_event_loop,
@@
-199,38
+205,40
@@
static const struct afb_daemon_itf hooked_daemon_itf = {
.queue_job = hooked_queue_job_cb
};
.queue_job = hooked_queue_job_cb
};
-void afb_ditf_init_v2(struct afb_ditf *ditf, const char *
prefix
)
+void afb_ditf_init_v2(struct afb_ditf *ditf, const char *
api, struct afb_binding_data_v2 *data
)
{
ditf->version = 2;
{
ditf->version = 2;
- ditf->daemon.closure = ditf;
- afb_ditf_rename(ditf, prefix);
+ ditf->v2 = data;
+ data->daemon.closure = ditf;
+ afb_ditf_rename(ditf, api);
}
}
-void afb_ditf_init_v1(struct afb_ditf *ditf, const char *
prefix
)
+void afb_ditf_init_v1(struct afb_ditf *ditf, const char *
api, struct afb_binding_interface_v1 *itf
)
{
ditf->version = 1;
{
ditf->version = 1;
- ditf->interface.verbosity = verbosity;
- ditf->interface.mode = AFB_MODE_LOCAL;
- ditf->interface.daemon.closure = ditf;
- afb_ditf_rename(ditf, prefix);
+ ditf->v1 = itf;
+ itf->verbosity = verbosity;
+ itf->mode = AFB_MODE_LOCAL;
+ itf->daemon.closure = ditf;
+ afb_ditf_rename(ditf, api);
}
}
-void afb_ditf_rename(struct afb_ditf *ditf, const char *
prefix
)
+void afb_ditf_rename(struct afb_ditf *ditf, const char *
api
)
{
{
- ditf->
prefix = prefix
;
+ ditf->
api = api
;
afb_ditf_update_hook(ditf);
}
void afb_ditf_update_hook(struct afb_ditf *ditf)
{
afb_ditf_update_hook(ditf);
}
void afb_ditf_update_hook(struct afb_ditf *ditf)
{
- int hooked = !!afb_hook_flags_ditf(ditf->
prefix
);
+ int hooked = !!afb_hook_flags_ditf(ditf->
api
);
switch (ditf->version) {
case 1:
switch (ditf->version) {
case 1:
- ditf->
interface.
daemon.itf = hooked ? &hooked_daemon_itf : &daemon_itf;
+ ditf->
v1->
daemon.itf = hooked ? &hooked_daemon_itf : &daemon_itf;
break;
default:
case 2:
break;
default:
case 2:
- ditf->daemon.itf = hooked ? &hooked_daemon_itf : &daemon_itf;
+ ditf->
v2->
daemon.itf = hooked ? &hooked_daemon_itf : &daemon_itf;
break;
}
}
break;
}
}