From: Marcus Fritzsch Date: Tue, 5 Sep 2017 07:50:25 +0000 (+0200) Subject: AFBClient: move api_call() to Impl as it's now private anyway. X-Git-Tag: 4.99.1~33 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2Fwindowmanager.git;a=commitdiff_plain;h=df0c4f92980769f7e9b09e8c62cf7db84cb168dc AFBClient: move api_call() to Impl as it's now private anyway. * Also put json argument creation to helper function Signed-off-by: Marcus Fritzsch --- diff --git a/AFBClient.cpp b/AFBClient.cpp index e47e23f..4b37740 100644 --- a/AFBClient.cpp +++ b/AFBClient.cpp @@ -55,6 +55,9 @@ class AFBClient::Impl { std::set labels; std::map handlers; + int api_call(const char *verb, json_object *object, + const std::function &onReply); + public: void event(char const *et, char const *label); }; @@ -127,70 +130,6 @@ void dispatch_internal(struct sd_event *loop) { 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; -} - } // namespace // _ ___ _ _ _ @@ -269,6 +208,11 @@ int AFBClient::Impl::dispatch() { std::lock_guard guard(dispatch_mutex); return sd_event_run(this->loop, 1); } + +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; } int AFBClient::Impl::requestSurface(const char *label) { @@ -279,33 +223,30 @@ 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) { - 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 - } + int rc2 = 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")); + 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 { - fprintf(stderr, "Could not get surface ID from WM: %s\n", - j != nullptr ? json_object_to_json_string_ext( - j, JSON_C_TO_STRING_PRETTY) - : "no-info"); - rc = -EINVAL; + rc = 0; // Single point of success } - }); + } else { + fprintf(stderr, "Could not get surface ID from WM: %s\n", + j != nullptr ? json_object_to_json_string_ext( + j, JSON_C_TO_STRING_PRETTY) + : "no-info"); + rc = -EINVAL; + } + }); if (rc2 < 0) { rc = rc2; @@ -320,39 +261,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 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 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 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 +336,70 @@ 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)) { + dispatch_internal(this->loop); + } + } + + // return the actual API call result + rc = call_rc; + } + + return rc; +} + void AFBClient::Impl::event(char const *et, char const *label) { TRACE(); auto oet = make_event_type(et);