X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.cpp;h=26efab61139618bb6d15b923d384148646cca858;hb=808d675237bdc2750f63a21869264ddb7319a57f;hp=407aeac0ff7b8ad4a7c3e9fda3a63dd8e670c6ba;hpb=b8ec6408f237065d6f87a23bcfe6c20ac56528bf;p=staging%2Fwindowmanager.git diff --git a/AFBClient.cpp b/AFBClient.cpp index 407aeac..26efab6 100644 --- a/AFBClient.cpp +++ b/AFBClient.cpp @@ -6,8 +6,21 @@ #include #include #include + +#include +#include + #include +#include + +#include + +extern "C" { +#include +#include +} + #define UNUSED(x) (void)(x) namespace { @@ -28,14 +41,14 @@ constexpr const char *const wmAPI = "winman"; 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 */ @@ -73,29 +86,121 @@ void onHangup(void *closure, afb_wsj1 *wsj1) { exit(0); } -} // namespace +static struct afb_wsj1_itf itf = { + onHangup, onCall, onEvent, +}; -AFBClient &AFBClient::instance() { +// XXX: I am not sure this is the right thing to do though... +std::recursive_mutex dispatch_mutex; + +void dispatch_internal(struct sd_event *loop) { + std::lock_guard guard(dispatch_mutex); TRACE(); - static AFBClient obj; - return obj; + sd_event_run(loop, -1); } -AFBClient::AFBClient() : wsj1{}, itf{}, loop{} { +/// 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 onReply) { TRACE(); - itf.on_hangup = onHangup; - itf.on_call = onCall; - itf.on_event = onEvent; + + // 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; + std::atomic returned; + returned.store(false, std::memory_order_relaxed); + std::function 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.store(true, std::memory_order_release); + }; + + // 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 *>( + 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.load(std::memory_order_consume)) { + dispatch_internal(loop); + } + + // return the actual API call result + rc = call_rc; + } + + return rc; } -AFBClient::~AFBClient() { +} // namespace + +// _ ___ _ +// ___| | __ _ ___ ___ |_ _|_ __ ___ _ __ | | +// / __| |/ _` / __/ __| | || '_ ` _ \| '_ \| | +// | (__| | (_| \__ \__ \ | || | | | | | |_) | | +// \___|_|\__,_|___/___/ |___|_| |_| |_| .__/|_| +// |_| +class AFBClient::Impl { + friend class AFBClient; + + // This is the AFBClient interface impl + int init(int port, char const *token); + int dispatch(); + + // WM API + int requestSurface(const char *label); + int activateSurface(const char *label); + int deactivateSurface(const char *label); + int endDraw(const char *label); + + void set_event_handler(enum EventType et, + std::function f); + + Impl(); + ~Impl(); + + struct afb_wsj1 *wsj1; + struct sd_event *loop; +}; + +AFBClient::Impl::Impl() : wsj1{}, loop{} { TRACE(); } + +AFBClient::Impl::~Impl() { TRACE(); afb_wsj1_unref(wsj1); sd_event_unref(loop); loop = nullptr; } -int AFBClient::init(int port, char const *token) { +int AFBClient::Impl::init(int port, char const *token) { TRACE(); char *uribuf = nullptr; int rc = -1; @@ -145,45 +250,49 @@ fail: return rc; } -int AFBClient::dispatch(uint64_t timeout) { - return sd_event_run(loop, timeout); +int AFBClient::Impl::dispatch() { + std::lock_guard guard(dispatch_mutex); + return sd_event_run(loop, 1); } -int AFBClient::requestSurface(const char *label) { +int AFBClient::Impl::requestSurface(const char *label) { TRACE(); json_object *jp = json_object_new_object(); 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; } -int AFBClient::activateSurface(const char *label) { +int AFBClient::Impl::activateSurface(const char *label) { 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", @@ -193,11 +302,12 @@ int AFBClient::activateSurface(const char *label) { }); } -int AFBClient::deactivateSurface(const char *label) { +int AFBClient::Impl::deactivateSurface(const char *label) { 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", @@ -207,11 +317,11 @@ int AFBClient::deactivateSurface(const char *label) { }); } -int AFBClient::endDraw(const char *label) { +int AFBClient::Impl::endDraw(const char *label) { 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", @@ -221,66 +331,51 @@ int AFBClient::endDraw(const char *label) { }); } -/// object will be json_object_put -int AFBClient::call(const char *verb, json_object *object, - std::function onReply) { +void AFBClient::Impl::set_event_handler( + enum EventType et, std::function func) { + UNUSED(et); + UNUSED(func); TRACE(); + // XXX todo +} - // 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 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; - }; +// _ _ _____ ____ ____ _ _ _ +// ___| | __ _ ___ ___ / \ | ___| __ ) / ___| (_) ___ _ __ | |_ +// / __| |/ _` / __/ __| / _ \ | |_ | _ \| | | | |/ _ \ '_ \| __| +// | (__| | (_| \__ \__ \ / ___ \| _| | |_) | |___| | | __/ | | | |_ +// \___|_|\__,_|___/___/ /_/ \_\_| |____/ \____|_|_|\___|_| |_|\__| +// +int AFBClient::init(int port, char const *token) { + return this->d->init(port, token); +} - // 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 *>( - closure); - (*onReply)(!!afb_wsj1_msg_is_reply_ok(msg), - afb_wsj1_msg_object_j(msg)); - }, - &wrappedOnReply); +int AFBClient::dispatch() { return this->d->dispatch(); } - 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); - } +int AFBClient::requestSurface(const char *label) { + return this->d->requestSurface(label); +} - // return the actual API call result - rc = call_rc; - } +int AFBClient::activateSurface(const char *label) { + return this->d->activateSurface(label); +} - return rc; +int AFBClient::deactivateSurface(const char *label) { + return this->d->deactivateSurface(label); } +int AFBClient::endDraw(const char *label) { return this->d->endDraw(label); } + void AFBClient::set_event_handler(enum EventType et, - std::function func) { - UNUSED(et); - UNUSED(func); + std::function f) { + return this->d->set_event_handler(et, std::move(f)); +} + +AFBClient &AFBClient::instance() { TRACE(); - // XXX todo + static AFBClient obj; + return obj; } + +AFBClient::AFBClient() : d(new Impl) {} + +AFBClient::~AFBClient() { delete d; }