afb-xreq: Detection of self locks due to 'noconcurrency'

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

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index 498aed5..ae71147 100644 (file)
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -17,24 +17,25 @@
 
 #pragma once
 
-
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
-#include <afb/afb-binding.h>
 #include "afb-context.h"
-#include "afb-evt.h"
 
 struct json_object;
 struct afb_evt_listener;
 struct afb_xreq;
 struct afb_cred;
 struct afb_apiset;
+struct afb_event;
+struct afb_verb_desc_v1;
+struct afb_verb_v2;
+struct afb_req;
+struct afb_stored_req;
 
 struct afb_xreq_query_itf {
        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 (*reply)(struct afb_xreq *xreq, int status, 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);
@@ -64,6 +65,7 @@ struct afb_xreq
        int hookindex;                  /**< index for hooking */
        struct afb_evt_listener *listener; /**< event listener for the request */
        struct afb_cred *cred;          /**< client credential if revelant */
+       struct afb_xreq *caller;        /**< caller request if any */
 };
 
 /**
@@ -86,6 +88,7 @@ struct afb_xreq
 #define CONTAINER_OF_XREQ(type,x) CONTAINER_OF(type,xreq,x)
 
 /* req wrappers for xreq */
+extern struct afb_req afb_xreq_unstore(struct afb_stored_req *sreq);
 extern void afb_xreq_addref(struct afb_xreq *xreq);
 extern void afb_xreq_unref(struct afb_xreq *xreq);
 
@@ -119,6 +122,19 @@ extern void afb_xreq_unhooked_subcall(
                void (*callback)(void*, int, struct json_object*),
                void *cb_closure);
 
+extern int afb_xreq_unhooked_subcall_sync(
+               struct afb_xreq *xreq,
+               const char *api,
+               const char *verb,
+               struct json_object *args,
+               struct json_object **result);
+extern int afb_xreq_subcall_sync(
+               struct afb_xreq *xreq,
+               const char *api,
+               const char *verb,
+               struct json_object *args,
+               struct json_object **result);
+
 /* initialisation and processing of xreq */
 extern void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf);