Optimisation of xreq

[src/app-framework-binder.git] / src / afb-xreq.h

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index ba99d4a..4cd5820 100644 (file)
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -25,20 +25,20 @@
 
 struct json_object;
 struct afb_evt_listener;
+struct afb_xreq;
 
 struct afb_xreq_query_itf {
-       struct json_object *(*json)(void *closure);
-       struct afb_arg (*get)(void *closure, const char *name);
-       void (*success)(void *closure, struct json_object *obj, const char *info);
-       void (*fail)(void *closure, const char *status, const char *info);
-       void (*reply)(void *closure, int iserror, struct json_object *obj);
-       void (*unref)(void *closure);
-       int (*subscribe)(void *closure, struct afb_event event);
-       int (*unsubscribe)(void *closure, struct afb_event event);
-       void (*subcall)(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure);
+       struct json_object *(*json)(struct afb_xreq *xreq);
+       struct afb_arg (*get)(struct afb_xreq *xreq, const char *name);
+       void (*success)(struct afb_xreq *xreq, struct json_object *obj, const char *info);
+       void (*fail)(struct afb_xreq *xreq, const char *status, const char *info);
+       void (*reply)(struct afb_xreq *xreq, int iserror, struct json_object *obj);
+       void (*unref)(struct afb_xreq *xreq);
+       int (*subscribe)(struct afb_xreq *xreq, struct afb_event event);
+       int (*unsubscribe)(struct afb_xreq *xreq, struct afb_event event);
+       void (*subcall)(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure);
 };
 
-
 /**
  * Internal data for requests
  */
@@ -48,7 +48,6 @@ struct afb_xreq
        const char *api;        /**< the requested API */
        const char *verb;       /**< the requested VERB */
        struct json_object *json; /**< the json object (or NULL) */
-       void *query;    /**< closure for the query */
        const struct afb_xreq_query_itf *queryitf;
        int refcount;   /**< current ref count */
        int replied;    /**< is replied? */
@@ -57,6 +56,8 @@ struct afb_xreq
        struct afb_evt_listener *listener;
 };
 
+#define CONTAINER_OF_XREQ(type,x) ((type*)(((intptr_t)(x))-((intptr_t)&(((type*)NULL)->xreq))))
+
 extern void afb_xreq_addref(struct afb_xreq *xreq);
 extern void afb_xreq_unref(struct afb_xreq *xreq);
 extern void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info);
@@ -69,6 +70,7 @@ extern int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event event);
 extern void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure);
 extern void afb_xreq_unhooked_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure);
 
+extern void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf);
 extern void afb_xreq_begin(struct afb_xreq *xreq);
 extern void afb_xreq_call(struct afb_xreq *xreq, int sessionflags, void (*callback)(struct afb_req req));