Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
AFBClient: honor the SCOPE_TRACING option from cmake
[staging/windowmanager.git]
/
client-lib
/
AFBClient.cpp
diff --git
a/client-lib/AFBClient.cpp
b/client-lib/AFBClient.cpp
index
dc1c523
..
60743d9
100644
(file)
--- a/
client-lib/AFBClient.cpp
+++ b/
client-lib/AFBClient.cpp
@@
-84,13
+84,13
@@
namespace {
constexpr const int token_maxlen = 20;
constexpr const char *const wmAPI = "winman";
constexpr const int token_maxlen = 20;
constexpr const char *const wmAPI = "winman";
-#ifdef NDEBUG
-#define TRACE()
-#define TRACEN(N)
-#else
#define CONCAT_(X, Y) X##Y
#define CONCAT(X, Y) CONCAT_(X, Y)
#define CONCAT_(X, Y) X##Y
#define CONCAT(X, Y) CONCAT_(X, Y)
+#ifndef SCOPE_TRACING
+#define TRACE()
+#define TRACEN(N)
+#else
#define TRACE() \
ScopeTrace __attribute__((unused)) CONCAT(trace_scope_, __LINE__)(__func__)
#define TRACEN(N) \
#define TRACE() \
ScopeTrace __attribute__((unused)) CONCAT(trace_scope_, __LINE__)(__func__)
#define TRACEN(N) \
@@
-239,7
+239,7
@@
int AFBClient::Impl::requestSurface(const char *label) {
int rc = -1;
/* send the request */
int rc2 =
int rc = -1;
/* send the request */
int rc2 =
- this->api_call("
request_s
urface", j, [&rc](bool ok, json_object *j) {
+ this->api_call("
RequestS
urface", j, [&rc](bool ok, json_object *j) {
if (ok) {
int id =
json_object_get_int(json_object_object_get(j, "response"));
if (ok) {
int id =
json_object_get_int(json_object_object_get(j, "response"));
@@
-275,7
+275,7
@@
int AFBClient::Impl::requestSurface(const char *label) {
int AFBClient::Impl::activateSurface(const char *label) {
TRACE();
json_object *j = drawing_name_json_argument(label);
int AFBClient::Impl::activateSurface(const char *label) {
TRACE();
json_object *j = drawing_name_json_argument(label);
- return this->api_call("
activate_s
urface", j, [](bool ok, json_object *j) {
+ return this->api_call("
ActivateS
urface", 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(
if (!ok) {
fprintf(stderr, "API Call activate_surface() failed: %s\n",
j != nullptr ? json_object_to_json_string_ext(
@@
-288,7
+288,7
@@
int AFBClient::Impl::activateSurface(const char *label) {
int AFBClient::Impl::deactivateSurface(const char *label) {
TRACE();
json_object *j = drawing_name_json_argument(label);
int AFBClient::Impl::deactivateSurface(const char *label) {
TRACE();
json_object *j = drawing_name_json_argument(label);
- return this->api_call("
deactivate_s
urface", j, [](bool ok, json_object *j) {
+ return this->api_call("
DeactivateS
urface", 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(
if (!ok) {
fprintf(stderr, "API Call deactivate_surface() failed: %s\n",
j != nullptr ? json_object_to_json_string_ext(
@@
-301,7
+301,7
@@
int AFBClient::Impl::deactivateSurface(const char *label) {
int AFBClient::Impl::endDraw(const char *label) {
TRACE();
json_object *j = drawing_name_json_argument(label);
int AFBClient::Impl::endDraw(const char *label) {
TRACE();
json_object *j = drawing_name_json_argument(label);
- return this->api_call("
endd
raw", j, [](bool ok, json_object *j) {
+ return this->api_call("
EndD
raw", j, [](bool ok, json_object *j) {
if (!ok) {
fprintf(stderr, "API Call endDraw() failed: %s\n",
j != nullptr ? json_object_to_json_string_ext(
if (!ok) {
fprintf(stderr, "API Call endDraw() failed: %s\n",
j != nullptr ? json_object_to_json_string_ext(