*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <string.h>
#include <json-c/json.h>
-#include <afb/afb-binding.h>
+
+#include <afb/afb-binding-v2.h>
#include "afb-api.h"
#include "afb-apiset.h"
#include "afb-api-so-v2.h"
#include "afb-ditf.h"
#include "afb-xreq.h"
+#include "afb-trace.h"
#include "verbose.h"
+#include "wrap-json.h"
#include "monitor-api.inc"
extern struct afb_apiset *main_apiset;
+static struct afb_binding_data_v2 datav2;
+
int afb_monitor_init()
{
- return afb_api_so_v2_add_binding(&_afb_binding_v2_, NULL, main_apiset);
+ return afb_api_so_v2_add_binding(&_afb_binding_v2_monitor, NULL, main_apiset, &datav2);
}
/******************************************************************************
{
const char *s;
int level = -1;
- if (json_object_is_type(v, json_type_int)) {
- level = json_object_get_int(v);
+
+ if (!wrap_json_unpack(v, "i", &level)) {
level = level < 0 ? 0 : level > 3 ? 3 : level;
- } else if (json_object_is_type(v, json_type_string)) {
- s = json_object_get_string(v);
+ } else if (!wrap_json_unpack(v, "s", &s)) {
switch(*s&~' ') {
case 'D':
if (!strcasecmp(s, _debug_))
* @param resu the json object to build
* @param spec specification of the verbosity to set
*/
-static void get_verbosity(struct json_object *resu, struct json_object *spec)
+static struct json_object *get_verbosity(struct json_object *spec)
{
int i, n;
+ struct json_object *resu;
struct json_object_iterator it, end;
+ resu = json_object_new_object();
if (json_object_is_type(spec, json_type_object)) {
it = json_object_iter_begin(spec);
end = json_object_iter_end(spec);
n = json_object_array_length(spec);
for (i = 0 ; i < n ; i++)
get_verbosity_of(resu, json_object_get_string(json_object_array_get_idx(spec, i)));
+ } else if (json_object_is_type(spec, json_type_string)) {
+ get_verbosity_of(resu, json_object_get_string(spec));
} else if (json_object_get_boolean(spec)) {
get_verbosity_of(resu, "");
get_verbosity_of(resu, "*");
}
+ return resu;
}
/******************************************************************************
* @param resu the json object to build
* @param spec specification of the verbosity to set
*/
-static void get_apis(struct json_object *resu, struct json_object *spec)
+static struct json_object *get_apis(struct json_object *spec)
{
int i, n;
+ struct json_object *resu;
struct json_object_iterator it, end;
+ resu = json_object_new_object();
if (json_object_is_type(spec, json_type_object)) {
it = json_object_iter_begin(spec);
end = json_object_iter_end(spec);
n = json_object_array_length(spec);
for (i = 0 ; i < n ; i++)
get_one_api(resu, json_object_get_string(json_object_array_get_idx(spec, i)), NULL);
+ } else if (json_object_is_type(spec, json_type_string)) {
+ get_one_api(resu, json_object_get_string(spec), NULL);
} else if (json_object_get_boolean(spec)) {
afb_apiset_enum(main_apiset, get_apis_of_all_cb, resu);
}
+ return resu;
}
/******************************************************************************
static void f_get(struct afb_req req)
{
- struct json_object *o, *v, *r, *x;
-
- r = json_object_new_object();
- o = afb_req_json(req);
-
- if (json_object_object_get_ex(o, _verbosity_, &v)) {
- x = json_object_new_object();
- json_object_object_add(r, _verbosity_, x);
- get_verbosity(x, v);
- }
-
- if (json_object_object_get_ex(o, _apis_, &v)) {
- x = json_object_new_object();
- json_object_object_add(r, _apis_, x);
- get_apis(x, v);
- }
-
- afb_req_success(req, json_object_get(r), NULL);
- json_object_put(r);
+ struct json_object *r;
+ struct json_object *apis = NULL;
+ struct json_object *verbosity = NULL;
+
+ wrap_json_unpack(afb_req_json(req), "{s?:o,s?:o}", _verbosity_, &verbosity, _apis_, &apis);
+ if (verbosity)
+ verbosity = get_verbosity(verbosity);
+ if (apis)
+ apis = get_apis(apis);
+
+ wrap_json_pack(&r, "{s:o*,s:o*}", _verbosity_, verbosity, _apis_, apis);
+ afb_req_success(req, r, NULL);
}
static void f_set(struct afb_req req)
{
- struct json_object *o, *v;
+ struct json_object *verbosity = NULL;
- o = afb_req_json(req);
- if (json_object_object_get_ex(o, _verbosity_, &v)) {
- set_verbosity(v);
- }
+ wrap_json_unpack(afb_req_json(req), "{s?:o}", _verbosity_, &verbosity);
+ if (verbosity)
+ set_verbosity(verbosity);
afb_req_success(req, NULL, NULL);
}
-#if 0
-static void f_hook(struct afb_xreq *xreq)
+static void *context_create()
{
- struct json_object *o, *v;
+ return afb_trace_create(&datav2.daemon, NULL);
+}
- o = afb_xreq_json(xreq);
- if (json_object_object_get_ex(o, _verbosity_, &v)) {
- set_verbosity(v);
- }
+static void context_destroy(void *pointer)
+{
+ struct afb_trace *trace = pointer;
+ afb_trace_unref(trace);
+}
- if (!xreq->replied)
- afb_xreq_success(xreq, NULL, NULL);
+static void f_trace(struct afb_req req)
+{
+ int rc;
+ struct json_object *add = NULL;
+ struct json_object *drop = NULL;
+ struct afb_trace *trace;
+
+ trace = afb_req_context(req, context_create, context_destroy);
+ wrap_json_unpack(afb_req_json(req), "{s?o s?o}", "add", &add, "drop", &drop);
+ if (add) {
+ rc = afb_trace_add(req, add, trace);
+ if (rc)
+ return;
+ }
+ if (drop) {
+ rc = afb_trace_drop(req, drop, trace);
+ if (rc)
+ return;
+ }
+ afb_req_success(req, NULL, NULL);
}
-#endif
Code Review / src / app-framework-binder.git / blobdiff