Reactivate hooking of requests

[src/app-framework-binder.git] / src / afb-apis.c

diff --git a/src/afb-apis.c b/src/afb-apis.c
index de122b6..1355894 100644 (file)
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -27,8 +27,8 @@
 #include "verbose.h"
 #include "afb-apis.h"
 #include "afb-context.h"
-#include "afb-hook.h"
 #include "afb-xreq.h"
+#include "jobs.h"
 
 #include <afb/afb-req-itf.h>
 
@@ -42,6 +42,16 @@ struct api_desc {
 
 static struct api_desc *apis_array = NULL;
 static int apis_count = 0;
+static int apis_timeout = 15;
+
+/**
+ * Set the API timeout
+ * @param to the timeout in seconds
+ */
+void afb_apis_set_timeout(int to)
+{
+       apis_timeout = to;
+}
 
 /**
  * Checks wether 'name' is a valid API name.
@@ -221,20 +231,13 @@ int afb_apis_start_all_services(int share_session)
 }
 
 /**
- * Dispatch the request 'req' with the 'context' to the
- * method of 'api' and 'verb'.
- * @param req the request to dispatch
- * @param context the context of the request
- * @param api the api of the verb
- * @param verb the verb within the api
+ * Internal direct dispatch of the request 'xreq'
+ * @param xreq the request to dispatch
  */
-void afb_apis_call(struct afb_xreq *xreq)
+static void do_call_direct(struct afb_xreq *xreq)
 {
        const struct api_desc *a;
 
-       /* init hooking the request */
-       // TODO req = afb_hook_req_call(req, context, api, verb);
-
        /* search the api */
        a = search(xreq->api);
        if (!a)
@@ -245,3 +248,48 @@ void afb_apis_call(struct afb_xreq *xreq)
        }
 }
 
+/**
+ * Asynchronous dispatch callback for the request 'xreq'
+ * @param signum 0 on normal flow or the signal number that interupted the normal flow
+ */
+static void do_call_async(int signum, void *arg)
+{
+       struct afb_xreq *xreq = arg;
+
+       if (signum != 0)
+               afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
+       else {
+               do_call_direct(xreq);
+       }
+       afb_xreq_unref(xreq);
+}
+
+/**
+ * Dispatch the request 'xreq' synchronously and directly.
+ * @param xreq the request to dispatch
+ */
+void afb_apis_call_direct(struct afb_xreq *xreq)
+{
+       afb_xreq_begin(xreq);
+       do_call_direct(xreq);
+}
+
+/**
+ * Dispatch the request 'xreq' asynchronously.
+ * @param xreq the request to dispatch
+ */
+void afb_apis_call(struct afb_xreq *xreq)
+{
+       int rc;
+
+       afb_xreq_begin(xreq);
+       afb_xreq_addref(xreq);
+       rc = jobs_queue(NULL, apis_timeout, do_call_async, xreq);
+       if (rc < 0) {
+               /* TODO: allows or not to proccess it directly as when no threading? (see above) */
+               ERROR("can't process job with threads: %m");
+               afb_xreq_fail_f(xreq, "cancelled", "not able to create a job for the task");
+               afb_xreq_unref(xreq);
+       }
+}
+