X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.cpp;h=d63b8c1ddc7d023b235c7d6125c28d975d544e0c;hb=2624def304610c4111d11ca529e1e8433ede453e;hp=6a573102ed9bd6740807227dd85b6193ab6a81f3;hpb=bcdcf57a93ac30b0aac23ed2fed9f71312cae5da;p=staging%2Fwindowmanager.git diff --git a/AFBClient.cpp b/AFBClient.cpp index 6a57310..d63b8c1 100644 --- a/AFBClient.cpp +++ b/AFBClient.cpp @@ -1,5 +1,6 @@ #include "AFBClient.h" +#include #include #include #include @@ -8,55 +9,161 @@ #define UNUSED(x) (void)(x) -extern "C" { -extern struct afb_wsj1 *afb_ws_client_connect_wsj1(struct sd_event *eloop, const char *uri, struct afb_wsj1_itf *itf, void *closure); -extern int afb_wsj1_call_s(struct afb_wsj1 *wsj1, const char *api, const char *verb, const char *object, void (*on_reply)(void *closure, struct afb_wsj1_msg *msg), void *closure); -extern int afb_wsj1_msg_is_reply_ok(struct afb_wsj1_msg *msg); -extern int afb_wsj1_send_event_s(struct afb_wsj1 *wsj1, const char *event, const char *object); -static inline int afb_wsj1_reply_error_s(struct afb_wsj1_msg *msg, const char *object, const char *token); +namespace { + +constexpr const int token_maxlen = 20; +constexpr const char *const wmAPI = "winman"; + +#ifdef NDEBUG +#define TRACE() +#else +#define TRACE() \ + ScopeTrace __attribute__((unused)) trace_scope_here__(__PRETTY_FUNCTION__) + +struct ScopeTrace { + 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; +#endif + +/* called when wsj1 receives a method invocation */ +void onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg) +{ + TRACE(); + UNUSED(closure); + int rc; + printf("ON-CALL %s/%s:\n%s\n", api, verb, + json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), + JSON_C_TO_STRING_PRETTY)); + fflush(stdout); + rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", nullptr); + if (rc < 0) + fprintf(stderr, "replying failed: %m\n"); +} + +/* called when wsj1 receives an event */ +void onEvent(void *closure, const char *event, afb_wsj1_msg *msg) +{ + TRACE(); + UNUSED(closure); + printf("ON-EVENT %s:\n%s\n", event, + json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), + JSON_C_TO_STRING_PRETTY)); + fflush(stdout); +} + +/* called when wsj1 hangsup */ +void onHangup(void *closure, afb_wsj1 *wsj1) +{ + TRACE(); + UNUSED(closure); + UNUSED(wsj1); + printf("ON-HANGUP\n"); + fflush(stdout); + exit(0); +} + +/* called when wsj1 receives a reply */ +void onReply(void *closure, afb_wsj1_msg *msg) +{ + TRACE(); + printf("ON-REPLY %s: %s\n%s\n", (char*)closure, + afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR", + json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), + JSON_C_TO_STRING_PRETTY)); + fflush(stdout); + free(closure); } -const char * AFBClient::wmURI = "ws://localhost:1700/api?token=wm"; -const char * AFBClient::wmAPI = "winman"; +} // namespace + +AFBClient &AFBClient::instance() +{ + TRACE(); + static AFBClient obj; + return obj; +} -AFBClient::AFBClient() : itf() +AFBClient::AFBClient() : wsj1{}, itf{}, loop{} { + TRACE(); ///* itinializing the callback interface for wsj1 */ - itf.on_hangup = AFBClient::onHangup; - itf.on_call = AFBClient::onCall; - itf.on_event = AFBClient::onEvent; + itf.on_hangup = onHangup; + itf.on_call = onCall; + itf.on_event = onEvent; } AFBClient::~AFBClient() { + TRACE(); + sd_event_unref(loop); + loop = nullptr; } -bool AFBClient::init() +int AFBClient::init(int port, char const *token) { - printf("init() -->\n"); + TRACE(); + char *uribuf = nullptr; + int rc = -1; + + if (!token || strlen(token) > token_maxlen) { + fprintf(stderr, "Token is invalid\n"); + rc = -EINVAL; + goto fail; + } + + for (char const *p = token; *p; p++) { + if (!isalnum(*p)) { + fprintf(stderr, "Token is invalid\n"); + rc = -EINVAL; + goto fail; + } + } + + if (port < 1 && port > 0xffff) { + fprintf(stderr, "Port is invalid\n"); + rc = -EINVAL; + goto fail; + } + /* get the default event loop */ - int rc = sd_event_default(&loop); + rc = sd_event_default(&loop); if (rc < 0) { fprintf(stderr, "Connection to default event loop failed: %s\n", strerror(-rc)); - return false; + goto fail; } + asprintf(&uribuf, "ws://localhost:%d/api?token=%s", port, token); + /* connect the websocket wsj1 to the uri given by the first argument */ - wsj1 = afb_ws_client_connect_wsj1(loop, wmURI, &itf, NULL); - if (wsj1 == NULL) { - fprintf(stderr, "Connection to %s failed: %m\n", wmURI); - return false; + wsj1 = afb_ws_client_connect_wsj1(loop, uribuf, &itf, nullptr); + if (wsj1 == nullptr) { + sd_event_unref(loop); + fprintf(stderr, "Connection to %s failed: %m\n", uribuf); + rc = -errno; + goto fail; } - printf("init() <--\n"); - return true; + return 0; + +fail: + return rc; +} + +int AFBClient::dispatch(uint64_t timeout) { + TRACE(); + return sd_event_run(loop, timeout); } int AFBClient::requestSurface(const char *label) { - printf("requestSurface(%s) -->\n", label); + TRACE(); constexpr char const *verb = "request_surface"; - int ret = -1; json_object *jp = json_object_new_object(); json_object_object_add(jp, "drawing_name", json_object_new_string(label)); @@ -67,12 +174,12 @@ int AFBClient::requestSurface(const char *label) bool is_not_set; }; - constexpr struct optional nullopt = {0, true}; + constexpr struct optional const nullopt = {0, true}; auto id = nullopt; /* send the request */ int rc = afb_wsj1_call_j( - wsj1, AFBClient::wmAPI, verb, jp, + wsj1, wmAPI, verb, jp, [](void *closure, afb_wsj1_msg *msg) { if (afb_wsj1_msg_is_reply_ok(msg)) { int id = json_object_get_int( @@ -85,7 +192,7 @@ int AFBClient::requestSurface(const char *label) (void *)&id); if (rc < 0) { - fprintf(stderr, "calling %s/%s(%s) failed: %m\n", AFBClient::wmAPI, verb, + fprintf(stderr, "calling %s/%s(%s) failed: %m\n", wmAPI, verb, json_object_to_json_string(jp)); } else { // Lets make this call sync here... @@ -98,22 +205,20 @@ int AFBClient::requestSurface(const char *label) if (setenv("QT_IVI_SURFACE_ID", buf, 1) != 0) { fprintf(stderr, "putenv failed: %m\n"); } else { - ret = 0; // Single point of success + rc = 0; // Single point of success } } else { fprintf(stderr, "Could not get surface ID from WM\n"); + rc = -EINVAL; } } - printf("requestSurface(%s) = %d <--\n", label, ret); - - return ret; + return rc; } -void AFBClient::activateSurface(const char *label) +int AFBClient::activateSurface(const char *label) { - printf("activateSurface(%s) -->\n", label); - fflush(stdout); + TRACE(); const char begin[] = "{\"drawing_name\":\""; const char end[] = "\"}"; @@ -124,102 +229,58 @@ void AFBClient::activateSurface(const char *label) strcpy(parameter, begin); strcat(parameter, label); strcat(parameter, end); - call(AFBClient::wmAPI, verb, parameter); + call(wmAPI, verb, parameter); // Sync this one too dispatch(-1); - printf("activateSurface(%s) <--\n", label); - fflush(stdout); -} - -int AFBClient::dispatch(uint64_t timeout) { - return sd_event_run(loop, timeout); -} - -void AFBClient::deactivateSurface(const char *label) -{ - UNUSED(label); -} - -void AFBClient::endDraw(const char *label) -{ - UNUSED(label); -} - -/* called when wsj1 receives a method invocation */ -void AFBClient::onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg) -{ - UNUSED(closure); - int rc; - printf("ON-CALL %s/%s:\n%s\n", api, verb, - json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), - JSON_C_TO_STRING_PRETTY)); - fflush(stdout); - rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL); - if (rc < 0) - fprintf(stderr, "replying failed: %m\n"); + return 0; } -/* called when wsj1 receives an event */ -void AFBClient::onEvent(void *closure, const char *event, afb_wsj1_msg *msg) +int AFBClient::deactivateSurface(const char *label) { - UNUSED(closure); - printf("ON-EVENT %s:\n%s\n", event, - json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), - JSON_C_TO_STRING_PRETTY)); - fflush(stdout); -} - -/* called when wsj1 hangsup */ -void AFBClient::onHangup(void *closure, afb_wsj1 *wsj1) -{ - UNUSED(closure); - UNUSED(wsj1); - printf("ON-HANGUP\n"); - fflush(stdout); - exit(0); + TRACE(); + json_object *j = json_object_new_object(); + json_object_object_add(j, "drawing_name", json_object_new_string(label)); + call(wmAPI, "deactivate_surface", json_object_to_json_string(j)); + json_object_put(j); + dispatch(-1); + return 0; } -/* called when wsj1 receives a reply */ -void AFBClient::onReply(void *closure, afb_wsj1_msg *msg) +int AFBClient::endDraw(const char *label) { - printf("ON-REPLY %s: %s\n%s\n", (char*)closure, - afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR", - json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg), - JSON_C_TO_STRING_PRETTY)); - fflush(stdout); - free(closure); + TRACE(); + json_object *j = json_object_new_object(); + json_object_object_add(j, "drawing_name", json_object_new_string(label)); + call(wmAPI, "enddraw", json_object_to_json_string(j)); + json_object_put(j); + dispatch(-1); + return 0; } /* makes a call */ void AFBClient::call(const char *api, const char *verb, const char *object) { + TRACE(); static int num = 0; char *key; int rc; - printf("call(%s, %s, %s) -->\n", api, verb, object); fflush(stdout); /* allocates an id for the request */ rc = asprintf(&key, "%d:%s/%s", ++num, api, verb); /* send the request */ - rc = afb_wsj1_call_s(wsj1, api, verb, object, AFBClient::onReply, key); + rc = afb_wsj1_call_s(wsj1, api, verb, object, onReply, key); if (rc < 0) fprintf(stderr, "calling %s/%s(%s) failed: %m\n", api, verb, object); - printf("call(%s, %s, %s) <--\n", api, verb, object); fflush(stdout); } -/* sends an event */ -void AFBClient::event(const char *event, const char *object) -{ - int rc; - - rc = afb_wsj1_send_event_s(wsj1, event, object); - if (rc < 0) - fprintf(stderr, "sending !%s(%s) failed: %m\n", event, object); +void AFBClient::set_event_handler(enum EventType at, std::function func) { + TRACE(); + // XXX todo }