#include <cstdio>
#include <cstdlib>
#include <cstring>
+
+#include <mutex>
+
#include <unistd.h>
+#include <systemd/sd-event.h>
+
+#include <json-c/json.h>
+
+extern "C" {
+#include <afb/afb-ws-client.h>
+#include <afb/afb-wsj1.h>
+}
+
#define UNUSED(x) (void)(x)
namespace {
ScopeTrace __attribute__((unused)) CONCAT(named_trace_scope_, __LINE__)(#N)
struct ScopeTrace {
- static int indent;
+ thread_local static int indent;
char const *f{};
ScopeTrace(char const *func) : f(func) {
fprintf(stderr, "%*s%s -->\n", 2 * indent++, "", this->f);
}
~ScopeTrace() { fprintf(stderr, "%*s%s <--\n", 2 * --indent, "", this->f); }
};
-int ScopeTrace::indent = 0;
+thread_local int ScopeTrace::indent = 0;
#endif
/* called when wsj1 receives a method invocation */
exit(0);
}
+static struct afb_wsj1_itf itf = {
+ onHangup, onCall, onEvent,
+};
+
+std::recursive_mutex dispatch_mutex;
+
+void dispatch_internal(struct sd_event *loop) {
+ std::lock_guard<std::recursive_mutex> guard(dispatch_mutex);
+ TRACE();
+ sd_event_run(loop, -1);
+}
+
+/// object will be json_object_put
+int api_call(struct sd_event *loop, struct afb_wsj1 *wsj1, const char *verb,
+ json_object *object,
+ std::function<void(bool, json_object *)> onReply) {
+ TRACE();
+
+ // We need to wrap the actual onReply call once in order to
+ // *look* like a normal functions pointer (std::functions<>
+ // with captures cannot convert to function pointers).
+ // Alternatively we could setup a local struct and use it as
+ // closure, but I think it is cleaner this way.
+ int call_rc = 0;
+ bool returned = false;
+ std::function<void(bool, json_object *)> wrappedOnReply =
+ [&returned, &call_rc, &onReply](bool ok, json_object *j) {
+ TRACEN(wrappedOnReply);
+ call_rc = ok ? 0 : -EINVAL;
+ // We know it failed, but there may be an explanation in the
+ // json object.
+ {
+ TRACEN(onReply);
+ onReply(ok, j);
+ }
+ returned = true;
+ };
+
+ // make the actual call, use wrappedOnReply as closure
+ int rc = afb_wsj1_call_j(
+ wsj1, wmAPI, verb, object,
+ [](void *closure, afb_wsj1_msg *msg) {
+ TRACEN(callClosure);
+ auto *onReply =
+ reinterpret_cast<std::function<void(bool, json_object *)> *>(
+ closure);
+ (*onReply)(!!afb_wsj1_msg_is_reply_ok(msg),
+ afb_wsj1_msg_object_j(msg));
+ },
+ &wrappedOnReply);
+
+ if (rc < 0) {
+ fprintf(
+ stderr, "calling %s/%s(%s) failed: %m\n", wmAPI, verb,
+ json_object_to_json_string_ext(object, JSON_C_TO_STRING_PRETTY));
+ // Call the reply handler regardless with a NULL json_object*
+ onReply(false, nullptr);
+ } else {
+ // We need to dispatch until "returned" got set, this is necessary
+ // if events get triggered by the call (and would be dispatched before
+ // the actual call-reply).
+ while (!returned) {
+ dispatch_internal(loop);
+ }
+
+ // return the actual API call result
+ rc = call_rc;
+ }
+
+ return rc;
+}
+
} // namespace
AFBClient &AFBClient::instance() {
return obj;
}
-AFBClient::AFBClient() : wsj1{}, itf{}, loop{} {
- TRACE();
- itf.on_hangup = onHangup;
- itf.on_call = onCall;
- itf.on_event = onEvent;
-}
+AFBClient::AFBClient() : wsj1{}, loop{} { TRACE(); }
AFBClient::~AFBClient() {
TRACE();
return rc;
}
-int AFBClient::dispatch(uint64_t timeout) {
- return sd_event_run(loop, timeout);
+int AFBClient::dispatch() {
+ std::lock_guard<std::recursive_mutex> guard(dispatch_mutex);
+ return sd_event_run(loop, 1);
}
int AFBClient::requestSurface(const char *label) {
json_object_object_add(jp, "drawing_name", json_object_new_string(label));
int rc = -1;
/* send the request */
- int rc2 = call("request_surface", jp, [&rc](bool ok, json_object *j) {
- if (ok) {
- int id = json_object_get_int(json_object_object_get(j, "response"));
- char *buf;
- asprintf(&buf, "%d", id);
- printf("setenv(\"QT_IVI_SURFACE_ID\", %s, 1)\n", buf);
- if (setenv("QT_IVI_SURFACE_ID", buf, 1) != 0) {
- fprintf(stderr, "putenv failed: %m\n");
- rc = -errno;
+ int rc2 = api_call(
+ loop, wsj1, "request_surface", jp, [&rc](bool ok, json_object *j) {
+ if (ok) {
+ int id =
+ json_object_get_int(json_object_object_get(j, "response"));
+ char *buf;
+ asprintf(&buf, "%d", id);
+ printf("setenv(\"QT_IVI_SURFACE_ID\", %s, 1)\n", buf);
+ if (setenv("QT_IVI_SURFACE_ID", buf, 1) != 0) {
+ fprintf(stderr, "putenv failed: %m\n");
+ rc = -errno;
+ } else {
+ rc = 0; // Single point of success
+ }
} else {
- rc = 0; // Single point of success
+ fprintf(stderr, "Could not get surface ID from WM: %s\n",
+ j ? json_object_to_json_string_ext(
+ j, JSON_C_TO_STRING_PRETTY)
+ : "no-info");
+ rc = -EINVAL;
}
- } else {
- fprintf(
- stderr, "Could not get surface ID from WM: %s\n",
- j ? json_object_to_json_string_ext(j, JSON_C_TO_STRING_PRETTY)
- : "no-info");
- rc = -EINVAL;
- }
- });
+ });
return rc2 < 0 ? rc2 : rc;
}
TRACE();
json_object *j = json_object_new_object();
json_object_object_add(j, "drawing_name", json_object_new_string(label));
- return call("activate_surface", j, [](bool ok, json_object *j) {
+ return api_call(loop, wsj1, "activate_surface", j, [](bool ok,
+ json_object *j) {
if (!ok) {
fprintf(
stderr, "API Call activate_surface() failed: %s\n",
TRACE();
json_object *j = json_object_new_object();
json_object_object_add(j, "drawing_name", json_object_new_string(label));
- return call("deactivate_surface", j, [](bool ok, json_object *j) {
+ return api_call(loop, wsj1, "deactivate_surface", j, [](bool ok,
+ json_object *j) {
if (!ok) {
fprintf(
stderr, "API Call deactivate_surface() failed: %s\n",
TRACE();
json_object *j = json_object_new_object();
json_object_object_add(j, "drawing_name", json_object_new_string(label));
- return call("enddraw", j, [](bool ok, json_object *j) {
+ return api_call(loop, wsj1, "enddraw", j, [](bool ok, json_object *j) {
if (!ok) {
fprintf(
stderr, "API Call endDraw() failed: %s\n",
});
}
-/// object will be json_object_put
-int AFBClient::call(const char *verb, json_object *object,
- std::function<void(bool, json_object *)> onReply) {
- TRACE();
-
- // We need to wrap the actual onReply call once in order to
- // *look* like a normal functions pointer (std::functions<>
- // with captures cannot convert to function pointers).
- // Alternatively we could setup a local struct and use it as
- // closure, but I think it is cleaner this way.
- int call_rc = 0;
- bool returned = false;
- std::function<void(bool, json_object *)> wrappedOnReply =
- [&returned, &call_rc, &onReply](bool ok, json_object *j) {
- TRACEN(wrappedOnReply);
- call_rc = ok ? 0 : -EINVAL;
- // We know it failed, but there may be an explanation in the
- // json object.
- onReply(ok, j);
- returned = true;
- };
-
- // make the actual call, use wrappedOnReply as closure
- int rc = afb_wsj1_call_j(
- wsj1, wmAPI, verb, object,
- [](void *closure, afb_wsj1_msg *msg) {
- TRACEN(callClosure);
- auto *onReply =
- reinterpret_cast<std::function<void(bool, json_object *)> *>(
- closure);
- (*onReply)(!!afb_wsj1_msg_is_reply_ok(msg),
- afb_wsj1_msg_object_j(msg));
- },
- &wrappedOnReply);
-
- if (rc < 0) {
- fprintf(
- stderr, "calling %s/%s(%s) failed: %m\n", wmAPI, verb,
- json_object_to_json_string_ext(object, JSON_C_TO_STRING_PRETTY));
- // Call the reply handler regardless with a NULL json_object*
- onReply(false, nullptr);
- } else {
- // We need to dispatch until "returned" got set, this is necessary
- // if events get triggered by the call (and would be dispatched before
- // the actual call-reply).
- while (!returned) {
- dispatch(-1);
- }
-
- // return the actual API call result
- rc = call_rc;
- }
-
- return rc;
-}
-
void AFBClient::set_event_handler(enum EventType et,
std::function<void(char const *)> func) {
UNUSED(et);
Code Review / staging / windowmanager.git / blobdiff