X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.cpp;h=fbffb2c0bcaf2dd6e57822947eda469d9557fb55;hb=c720d0ed2d95b6f73a6e26bfda1ef853cd41be25;hp=e47e23f3c3a1ab1f1b83e1e68f0a99ef0a9aa243;hpb=4289b00ecc6a813454374c0a445c2331cb79c41b;p=staging%2Fwindowmanager.git diff --git a/AFBClient.cpp b/AFBClient.cpp index e47e23f..fbffb2c 100644 --- a/AFBClient.cpp +++ b/AFBClient.cpp @@ -55,6 +55,10 @@ class AFBClient::Impl { std::set labels; std::map handlers; + int api_call(const char *verb, json_object *object, + const std::function &onReply); + void dispatch_internal(); + public: void event(char const *et, char const *label); }; @@ -111,7 +115,7 @@ void onHangup(void *closure, afb_wsj1 *wsj1) { UNUSED(closure); UNUSED(wsj1); fputs("Hangup, the WindowManager vanished\n", stderr); - exit(1); + exit(1); // XXX: there should be something ... *better* here. } constexpr struct afb_wsj1_itf itf = { @@ -121,74 +125,10 @@ constexpr struct afb_wsj1_itf itf = { // 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(); - 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, - const std::function &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; - 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) == 0), - 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)) { - std::lock_guard guard(dispatch_mutex); - if (!returned.load(std::memory_order_consume)) { - dispatch_internal(loop); - } - } - - // return the actual API call result - rc = call_rc; - } - - return rc; +json_object *drawing_name_json_argument(char const *label) { + json_object *j = json_object_new_object(); + json_object_object_add(j, "drawing_name", json_object_new_string(label)); + return j; } } // namespace @@ -269,7 +209,6 @@ int AFBClient::Impl::dispatch() { std::lock_guard guard(dispatch_mutex); return sd_event_run(this->loop, 1); } -} int AFBClient::Impl::requestSurface(const char *label) { TRACE(); @@ -279,13 +218,12 @@ int AFBClient::Impl::requestSurface(const char *label) { return -EINVAL; } - json_object *jp = json_object_new_object(); - json_object_object_add(jp, "drawing_name", json_object_new_string(label)); + json_object *j = drawing_name_json_argument(label); int rc = -1; /* send the request */ - int rc2 = api_call( - loop, wsj1, "request_surface", jp, [&rc](bool ok, json_object *j) { + int rc2 = + this->api_call("request_surface", j, [&rc](bool ok, json_object *j) { if (ok) { int id = json_object_get_int(json_object_object_get(j, "response")); @@ -320,39 +258,34 @@ int AFBClient::Impl::requestSurface(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 api_call( - loop, wsj1, "activate_surface", j, [](bool ok, json_object *j) { - if (!ok) { - fprintf(stderr, "API Call activate_surface() failed: %s\n", - j != nullptr ? json_object_to_json_string_ext( - j, JSON_C_TO_STRING_PRETTY) - : "no-info"); - } - }); + json_object *j = drawing_name_json_argument(label); + return this->api_call("activate_surface", j, [](bool ok, json_object *j) { + if (!ok) { + fprintf(stderr, "API Call activate_surface() failed: %s\n", + j != nullptr ? json_object_to_json_string_ext( + j, JSON_C_TO_STRING_PRETTY) + : "no-info"); + } + }); } 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 api_call( - loop, wsj1, "deactivate_surface", j, [](bool ok, json_object *j) { - if (!ok) { - fprintf(stderr, "API Call deactivate_surface() failed: %s\n", - j != nullptr ? json_object_to_json_string_ext( - j, JSON_C_TO_STRING_PRETTY) - : "no-info"); - } - }); + json_object *j = drawing_name_json_argument(label); + return this->api_call("deactivate_surface", j, [](bool ok, json_object *j) { + if (!ok) { + fprintf(stderr, "API Call deactivate_surface() failed: %s\n", + j != nullptr ? json_object_to_json_string_ext( + j, JSON_C_TO_STRING_PRETTY) + : "no-info"); + } + }); } 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 api_call(loop, wsj1, "enddraw", j, [](bool ok, json_object *j) { + json_object *j = drawing_name_json_argument(label); + return this->api_call("enddraw", j, [](bool ok, json_object *j) { if (!ok) { fprintf(stderr, "API Call endDraw() failed: %s\n", j != nullptr ? json_object_to_json_string_ext( @@ -400,6 +333,76 @@ std::pair make_event_type(char const *et) { } } // namespace +/// object will be json_object_put +int AFBClient::Impl::api_call( + const char *verb, json_object *object, + const std::function &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; + 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( + this->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) == 0), + 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)) { + std::lock_guard guard(dispatch_mutex); + if (!returned.load(std::memory_order_consume)) { + this->dispatch_internal(); + } + } + + // return the actual API call result + rc = call_rc; + } + + return rc; +} + +void AFBClient::Impl::dispatch_internal() { + std::lock_guard guard(dispatch_mutex); + TRACE(); + sd_event_run(this->loop, -1); +} + void AFBClient::Impl::event(char const *et, char const *label) { TRACE(); auto oet = make_event_type(et);