From a03087dcce0dfbd993058614e9becd34605d81a3 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Thu, 31 Aug 2017 14:42:55 +0200 Subject: [PATCH] Make all non-public things private (move to impl) Signed-off-by: Marcus Fritzsch --- AFBClient.cpp | 194 +++++++++++++++++++++++++++++++--------------------------- AFBClient.h | 22 ++----- 2 files changed, 110 insertions(+), 106 deletions(-) diff --git a/AFBClient.cpp b/AFBClient.cpp index 2d15c4f..328445c 100644 --- a/AFBClient.cpp +++ b/AFBClient.cpp @@ -9,28 +9,109 @@ #define UNUSED(x) (void)(x) +namespace { + constexpr const int token_maxlen = 20; -const char * AFBClient::wmAPI = "winman"; +constexpr const char *const wmAPI = "winman"; + +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; + +#ifndef NDEBUG +#define TRACE() +#else +#define TRACE() ScopeTrace __attribute__((unused)) trace_scope_here__(__PRETTY_FUNCTION__) +#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); +} -AFBClient::AFBClient() : itf() +/* 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); +} + +} // namespace + +AFBClient &AFBClient::instance() { + TRACE(); + static AFBClient obj; + return obj; +} + +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; } int AFBClient::init(int port, char const *token) { - char *uribuf = NULL; + TRACE(); + char *uribuf = nullptr; int rc = -1; - printf("AFBClient::init() -->\n"); - if (!token || strlen(token) > token_maxlen) { fprintf(stderr, "Token is invalid\n"); rc = -EINVAL; @@ -61,29 +142,28 @@ int AFBClient::init(int port, char const *token) 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, uribuf, &itf, NULL); - if (wsj1 == NULL) { + 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("AFBClient::init() <--\n"); return 0; fail: - printf("AFBClient::init() <--\n"); return rc; } int AFBClient::dispatch(uint64_t timeout) { + TRACE(); return sd_event_run(loop, timeout); } int AFBClient::requestSurface(const char *label) { - printf("AFBClient::requestSurface(%s) -->\n", label); + TRACE(); constexpr char const *verb = "request_surface"; json_object *jp = json_object_new_object(); @@ -100,7 +180,7 @@ int AFBClient::requestSurface(const char *label) /* 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( @@ -113,7 +193,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... @@ -134,15 +214,12 @@ int AFBClient::requestSurface(const char *label) } } - printf("AFBClient::requestSurface(%s) = %d <--\n", label, rc); - return rc; } int AFBClient::activateSurface(const char *label) { - printf("AFBClient::activateSurface(%s) -->\n", label); - fflush(stdout); + TRACE(); const char begin[] = "{\"drawing_name\":\""; const char end[] = "\"}"; @@ -153,121 +230,58 @@ int 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("AFBClient::activateSurface(%s) <--\n", label); - fflush(stdout); return 0; } int AFBClient::deactivateSurface(const char *label) { - printf("AFBClient::deactivateSurface(%s) -->\n", label); - fflush(stdout); + TRACE(); json_object *j = json_object_new_object(); json_object_object_add(j, "drawing_name", json_object_new_string(label)); - call(AFBClient::wmAPI, "deactivate_surface", json_object_to_json_string(j)); + call(wmAPI, "deactivate_surface", json_object_to_json_string(j)); json_object_put(j); dispatch(-1); - printf("AFBClient::deactivateSurface(%s) <--\n", label); - fflush(stdout); return 0; } int AFBClient::endDraw(const char *label) { - printf("AFBClient::endDraw(%s) -->\n", label); - fflush(stdout); + TRACE(); json_object *j = json_object_new_object(); json_object_object_add(j, "drawing_name", json_object_new_string(label)); - call(AFBClient::wmAPI, "enddraw", json_object_to_json_string(j)); + call(wmAPI, "enddraw", json_object_to_json_string(j)); json_object_put(j); dispatch(-1); - printf("AFBClient::endDraw(%s) <--\n", label); - fflush(stdout); return 0; } -/* 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"); -} - -/* called when wsj1 receives an event */ -void AFBClient::onEvent(void *closure, const char *event, afb_wsj1_msg *msg) -{ - 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); -} - -/* called when wsj1 receives a reply */ -void AFBClient::onReply(void *closure, afb_wsj1_msg *msg) -{ - 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); -} - /* 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 } diff --git a/AFBClient.h b/AFBClient.h index f8f824a..d776057 100644 --- a/AFBClient.h +++ b/AFBClient.h @@ -15,9 +15,11 @@ extern "C" class AFBClient { - explicit AFBClient(); - AFBClient(const AFBClient& that) = delete; - virtual~AFBClient(); + AFBClient(); + ~AFBClient(); + + AFBClient(const AFBClient &) = delete; + AFBClient &operator=(const AFBClient &) = delete; public: enum EventType { @@ -29,11 +31,7 @@ public: Event_FlushDraw, }; - static AFBClient &instance() - { - static AFBClient obj; - return obj; - } + static AFBClient &instance(); int init(int port, char const *token); int dispatch(uint64_t timeout); @@ -46,20 +44,12 @@ public: void set_event_handler(enum EventType et, std::function f); - static void onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg); - static void onEvent(void *closure, const char *event, struct afb_wsj1_msg *msg); - static void onHangup(void *closure, struct afb_wsj1 *wsj1); - static void onReply(void *closure, struct afb_wsj1_msg *msg); - private: void call(const char *api, const char *verb, const char *object); - void event(const char *event, const char *object); struct afb_wsj1 *wsj1; struct afb_wsj1_itf itf; sd_event *loop; - static const char *wmURI; - static const char *wmAPI; }; #endif // AFBCLIENT_H -- 2.16.6