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
applies timeout setting for apis
[src/app-framework-binder.git]
/
src
/
afb-api-so.c
diff --git
a/src/afb-api-so.c
b/src/afb-api-so.c
index
78d6d1b
..
b741b13
100644
(file)
--- a/
src/afb-api-so.c
+++ b/
src/afb-api-so.c
@@
-16,6
+16,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#define NO_PLUGIN_VERBOSE_MACRO
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
#include <assert.h>
@@
-29,7
+30,6
@@
#include <afb/afb-plugin.h>
#include <afb/afb-req-itf.h>
#include <afb/afb-plugin.h>
#include <afb/afb-req-itf.h>
-#include <afb/afb-event-sender-itf.h>
#include "session.h"
#include "afb-common.h"
#include "session.h"
#include "afb-common.h"
@@
-39,18
+39,26
@@
#include "afb-sig-handler.h"
#include "verbose.h"
#include "afb-sig-handler.h"
#include "verbose.h"
+/*
+ * Description of a plugin
+ */
struct api_so_desc {
struct AFB_plugin *plugin; /* descriptor */
struct api_so_desc {
struct AFB_plugin *plugin; /* descriptor */
- size_t apilength;
+ size_t apilength;
/* length of the API name */
void *handle; /* context of dlopen */
void *handle; /* context of dlopen */
- struct AFB_interface interface; /* interface */
+ struct AFB_interface interface; /* interface
for the plugin
*/
};
static int api_timeout = 15;
};
static int api_timeout = 15;
-static const char plugin_register_function[] = "pluginAfbV1Register";
+static const char plugin_register_function_v1[] = "pluginAfbV1Register";
+
+void afb_api_so_set_timeout(int to)
+{
+ api_timeout = to;
+}
-static
void afb_api_so_event_sender_push
(struct api_so_desc *desc, const char *name, struct json_object *object)
+static
int afb_api_so_event_broadcast
(struct api_so_desc *desc, const char *name, struct json_object *object)
{
size_t length;
char *event;
{
size_t length;
char *event;
@@
-61,23
+69,27
@@
static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *n
memcpy(event, desc->plugin->v1.prefix, desc->apilength);
event[desc->apilength] = '/';
memcpy(event + desc->apilength + 1, name, length + 1);
memcpy(event, desc->plugin->v1.prefix, desc->apilength);
event[desc->apilength] = '/';
memcpy(event + desc->apilength + 1, name, length + 1);
- ctxClientEventSend(NULL, event, object);
+
return
ctxClientEventSend(NULL, event, object);
}
}
-static const struct afb_event_sender_itf event_sender_itf = {
- .push = (void*)afb_api_so_event_sender_push
-};
-
-static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *desc)
+static void afb_api_so_vverbose(struct api_so_desc *desc, int level, const char *file, int line, const char *fmt, va_list args)
{
{
- return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc };
+ char *p;
+
+ if (vasprintf(&p, fmt, args) < 0)
+ vverbose(level, file, line, fmt, args);
+ else {
+ verbose(level, file, line, "%s {plugin %s}", p, desc->plugin->v1.prefix);
+ free(p);
+ }
}
static const struct afb_daemon_itf daemon_itf = {
}
static const struct afb_daemon_itf daemon_itf = {
- .
get_event_sender = (void*)afb_api_so_get_event_sender
,
+ .
event_broadcast = (void*)afb_api_so_event_broadcast
,
.get_event_loop = (void*)afb_common_get_event_loop,
.get_user_bus = (void*)afb_common_get_user_bus,
.get_event_loop = (void*)afb_common_get_event_loop,
.get_user_bus = (void*)afb_common_get_user_bus,
- .get_system_bus = (void*)afb_common_get_system_bus
+ .get_system_bus = (void*)afb_common_get_system_bus,
+ .vverbose = (void*)afb_api_so_vverbose
};
struct monitoring {
};
struct monitoring {
@@
-174,7
+186,7
@@
int afb_api_so_add_plugin(const char *path)
}
/* retrieves the register function */
}
/* retrieves the register function */
- pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function);
+ pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function
_v1
);
if (!pluginAfbV1RegisterFct) {
ERROR("plugin [%s] is not an AFB plugin", path);
goto error2;
if (!pluginAfbV1RegisterFct) {
ERROR("plugin [%s] is not an AFB plugin", path);
goto error2;
@@
-191,12
+203,13
@@
int afb_api_so_add_plugin(const char *path)
desc->handle = handle;
/* init the interface */
desc->handle = handle;
/* init the interface */
- desc->interface.verbosity =
0
;
+ desc->interface.verbosity =
verbosity
;
desc->interface.mode = AFB_MODE_LOCAL;
desc->interface.daemon.itf = &daemon_itf;
desc->interface.daemon.closure = desc;
/* init the plugin */
desc->interface.mode = AFB_MODE_LOCAL;
desc->interface.daemon.itf = &daemon_itf;
desc->interface.daemon.closure = desc;
/* init the plugin */
+ NOTICE("plugin [%s] calling registering function %s", path, plugin_register_function_v1);
desc->plugin = pluginAfbV1RegisterFct(&desc->interface);
if (desc->plugin == NULL) {
ERROR("plugin [%s] register function failed. continuing...", path);
desc->plugin = pluginAfbV1RegisterFct(&desc->interface);
if (desc->plugin == NULL) {
ERROR("plugin [%s] register function failed. continuing...", path);