Clean up source codeeel_4.99.5eel/4.99.54.99.5

To reduce the files and redundant code,
* Remove afb_binding_api.* files and generate-binding-glue.py. 
* Merge them into other source codes.

Change-Id: Ib61350ee6a42d73efc3fa29fa0c4868145a88e2e
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

7 files changed, 87 insertions, 455 deletions

diff --git a/generate-binding-glue.py b/generate-binding-glue.py
deleted file mode 100644
index a7be2da..0000000
--- a/generate-binding-glue.py
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/python3
-
-#
-# Copyright (c) 2017 TOYOTA MOTOR CORPORATION
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import sys
-
-OUT = sys.stdout
-
-def set_output(f):
-    global OUT
-    OUT = f
-
-def p(*args):
-    OUT.write('\n'.join(args))
-    OUT.write('\n')
-
-def emit_func_impl(api, f):
-    args = f.get('args', [])
-    func_name = f.get('name', [])
-    if "wm_subscribe" == func_name:
-        p('   json_object *jreq = afb_req_json(req);')
-        p('   json_object *j = nullptr;')
-        p('   if (! json_object_object_get_ex(jreq, "event", &j)) {')
-        p('      afb_req_fail(req, "failed", "Need char const* argument event");')
-        p('      return;')
-        p('   }')
-        p('   int event_type = json_object_get_int(j);')
-        p('   const char *event_name = g_afb_instance->app.kListEventName[event_type];')
-        p('   struct afb_event event = g_afb_instance->app.map_afb_event[event_name];')
-        p('   int ret = afb_req_subscribe(req, event);')
-        p('   if (ret) {',
-          '      afb_req_fail(req, "failed", "Error: afb_req_subscribe()");',
-          '      return;',
-          '   }')
-        p('   afb_req_success(req, NULL, "success");')
-
-    else:
-        if len(args) > 0:
-            p('   json_object *jreq = afb_req_json(req);', '')
-            for arg in args:
-                arg['jtype'] = arg.get('jtype', arg['type']) # add jtype default
-                p('   json_object *j_%(name)s = nullptr;' % arg,
-                  '   if (! json_object_object_get_ex(jreq, "%(name)s", &j_%(name)s)) {' % arg,
-                  '      afb_req_fail(req, "failed", "Need %(type)s argument %(name)s");' % arg,
-                  '      return;',
-                  '   }',
-                  '   %(type)s a_%(name)s = json_object_get_%(jtype)s(j_%(name)s);' % arg, '')
-        p('   auto ret = %(api)s' % api + '%(name)s(' % f + ', '.join(map(lambda x: 'a_' + x['name'], args)) + ');')
-        p('   if (ret.is_err()) {',
-          '      afb_req_fail(req, "failed", ret.unwrap_err());',
-          '      return;',
-          '   }', '')
-        p('   afb_req_success(req, ret.unwrap(), "success");')
-
-def emit_func(api, f):
-    p('void %(impl_name)s(afb_req req) noexcept {' % f)
-    p('   std::lock_guard<std::mutex> guard(binding_m);')
-    p('   #ifdef ST')
-    p('   ST();')
-    p('   #endif')
-    p('   if (g_afb_instance == nullptr) {',
-      '      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");',
-      '      return;',
-      '   }', '',
-      '   try {', '   // BEGIN impl')
-    emit_func_impl(api, f)
-    p('   // END impl',
-      '   } catch (std::exception &e) {',
-      '      afb_req_fail_f(req, "failed", "Uncaught exception while calling %(name)s: %%s", e.what());' % f,
-      '      return;',
-      '   }', '')
-    p('}', '')
-
-def emit_afb_verbs(api):
-    p('const struct afb_verb_v2 %(name)s_verbs[] = {' % api)
-    for f in api['functions']:
-        p('   { "%(name)s", %(impl_name)s, nullptr, nullptr, AFB_SESSION_NONE },' % f)
-    p('   {}', '};')
-
-def emit_binding(api):
-    p('namespace {')
-    p('std::mutex binding_m;', '')
-    for func in api['functions']:
-        emit_func(api, func)
-    p('} // namespace', '')
-    emit_afb_verbs(api)
-
-def generate_names(api):
-    for f in api['functions']:
-        f['impl_name'] = '%s_%s_thunk' % (api['name'], f['name'])
-
-def emit_afb_api(api):
-    p('#include "result.hpp"', '')
-    p('#include <json-c/json.h>', '')
-    p('namespace wm {', '')
-    p('struct App;', '')
-    p('struct binding_api {')
-    p('   typedef wm::result<json_object *> result_type;')
-    p('   struct wm::App *app;')
-    p('   void send_event(char const *evname, char const *label);')
-    p('   void send_event(char const *evname, char const *label, char const *area);')
-    for f in api['functions']:
-        p('   result_type %(name)s(' % f + ', '.join(map(lambda x: '%(type)s %(name)s' % x, f.get('args', []))) + ');')
-    p('};', '')
-    p('} // namespace wm', '')
-
-# names must always be valid in c and unique for each function (that is its arguments)
-# arguments will be looked up from json request, range checking needs to be implemented
-# by the actual API call
-API = {
-        'name': 'windowmanager',
-        'api': 'g_afb_instance->app.api.', # where are our API functions
-        'functions': [
-            {
-                'name': 'requestsurface',
-                #'return_type': 'int', # Or do they return all just some json?
-                'args': [ # describes the functions arguments, and their names as found in the json request
-                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
-                ],
-            },
-            {
-                'name': 'requestsurfacexdg',
-                'args': [
-                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
-                    { 'name': 'ivi_id',       'type': 'char const*', 'jtype': 'string' },
-                ],
-            },
-            {
-                'name': 'activatesurface',
-                'args': [
-                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
-                    { 'name': 'drawing_area', 'type': 'char const*', 'jtype': 'string' },
-                ],
-            },
-            {
-                'name': 'deactivatesurface',
-                'args': [
-                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
-                ],
-            },
-            {
-                'name': 'enddraw',
-                'args': [
-                    { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' },
-                ],
-            },
-            { 'name': 'wm_subscribe', },
-
-            { 'name': 'list_drawing_names', },
-            { 'name': 'ping' },
-
-            { 'name': 'debug_status', },
-            { 'name': 'debug_layers', },
-            { 'name': 'debug_surfaces', },
-            { 'name': 'debug_terminate' },
-        ]
-}
-
-def main():
-    with open('afb_binding_glue.inl', 'w') as out:
-        set_output(out)
-        p('// This file was generated, do not edit', '')
-        generate_names(API)
-        emit_binding(API)
-    with open('afb_binding_api.hpp', 'w') as out:
-        set_output(out)
-        p('// This file was generated, do not edit', '')
-        emit_afb_api(API)
-
-__name__ == '__main__' and main()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e508287..c55fe0b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,9 +37,7 @@ add_library(${TARGETS_WM} MODULE
    json_helper.cpp
    json_helper.hpp
    app.hpp app.cpp
-   afb_binding_api.cpp
    result.hpp
-   afb_binding_api.hpp
    layers.cpp
    layers.hpp
    controller_hooks.hpp
diff --git a/src/afb_binding_api.cpp b/src/afb_binding_api.cpp
deleted file mode 100644
index 735a572..0000000
--- a/src/afb_binding_api.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "app.hpp"
-#include "json_helper.hpp"
-
-#include <csignal>
-
-#include <json.hpp>
-
-using json = nlohmann::json;
-
-#include <json-c/json.h>
-
-namespace wm {
-/**
- * binding_api impl
- */
-binding_api::result_type binding_api::requestsurface(
-   char const *drawing_name) {
-   auto r = this->app->api_request_surface(drawing_name);
-   if (r.is_err()) {
-      return Err<json_object *>(r.unwrap_err());
-   }
-   return Ok(json_object_new_int(r.unwrap()));
-}
-
-binding_api::result_type binding_api::requestsurfacexdg(
-   char const *drawing_name, char const *ivi_id) {
-   auto r = this->app->api_request_surface(drawing_name, ivi_id);
-   if (r != nullptr) {
-      HMI_DEBUG("wm", "%s failed with error: %s", __func__, r);
-      return Err<json_object *>(r);
-   }
-   return Ok(json_object_new_object());
-}
-
-binding_api::result_type binding_api::activatesurface(
-   char const *drawing_name, char const *drawing_area) {
-  HMI_DEBUG("wm", "%s drawing_name %s, drawing_area %s", __func__, drawing_name, drawing_area);
-  auto r = this->app->api_activate_surface(drawing_name, drawing_area);
-   if (r != nullptr) {
-      HMI_DEBUG("wm", "%s failed with error: %s", __func__, r);
-      return Err<json_object *>(r);
-   }
-   return Ok(json_object_new_object());
-}
-
-binding_api::result_type binding_api::deactivatesurface(char const* drawing_name) {
-   HMI_DEBUG("wm", "%s drawing_name %s", __func__, drawing_name);
-   auto r = this->app->api_deactivate_surface(drawing_name);
-   if (r != nullptr) {
-      HMI_DEBUG("wm", "%s failed with error: %s", __func__, r);
-      return Err<json_object *>(r);
-   }
-   return Ok(json_object_new_object());
-}
-
-binding_api::result_type binding_api::enddraw(char const* drawing_name) {
-   HMI_DEBUG("wm", "%s drawing_name %s", __func__, drawing_name);
-   auto r = this->app->api_enddraw(drawing_name);
-   if (r != nullptr) {
-      HMI_DEBUG("wm", "%s failed with error: %s", __func__, r);
-      return Err<json_object *>(r);
-   }
-   return Ok(json_object_new_object());
-}
-
-binding_api::result_type binding_api::list_drawing_names() {
-   HMI_DEBUG("wm", "%s", __func__);
-   json j = this->app->id_alloc.name2id;
-   return Ok(json_tokener_parse(j.dump().c_str()));
-}
-
-binding_api::result_type binding_api::debug_layers() {
-   HMI_DEBUG("wm", "%s", __func__);
-   return Ok(json_tokener_parse(this->app->layers.to_json().dump().c_str()));
-}
-
-binding_api::result_type binding_api::debug_surfaces() {
-   HMI_DEBUG("wm", "%s", __func__);
-   return Ok(to_json(this->app->controller->sprops));
-}
-
-binding_api::result_type binding_api::debug_status() {
-   HMI_DEBUG("wm", "%s", __func__);
-   json_object *jr = json_object_new_object();
-   json_object_object_add(jr, "surfaces",
-                          to_json(this->app->controller->sprops));
-   json_object_object_add(jr, "layers", to_json(this->app->controller->lprops));
-   return Ok(jr);
-}
-
-binding_api::result_type binding_api::debug_terminate() {
-   HMI_DEBUG("wm", "%s", __func__);
-   if (getenv("WINMAN_DEBUG_TERMINATE") != nullptr) {
-      raise(SIGKILL);  // afb-daemon kills it's pgroup using TERM, which
-                       // doesn't play well with perf
-   }
-   return Ok(json_object_new_object());
-}
-
-binding_api::result_type binding_api::ping() {
-   this->app->api_ping();
-   return Ok(json_object_new_object());
-}
-
-}  // namespace wm
diff --git a/src/afb_binding_api.hpp b/src/afb_binding_api.hpp
deleted file mode 100644
index ba6b1d1..0000000
--- a/src/afb_binding_api.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "result.hpp"
-
-#include <json-c/json.h>
-
-namespace wm {
-
-struct App;
-
-struct binding_api {
-   typedef wm::result<json_object *> result_type;
-   struct wm::App *app;
-   void send_event(char const *evname, char const *label);
-   void send_event(char const *evname, char const *label, char const *area);
-   result_type requestsurface(char const* drawing_name);
-   result_type requestsurfacexdg(char const* drawing_name, char const* ivi_id);
-   result_type activatesurface(char const* drawing_name, char const* drawing_area);
-   result_type deactivatesurface(char const* drawing_name);
-   result_type enddraw(char const* drawing_name);
-   result_type wm_subscribe();
-   result_type list_drawing_names();
-   result_type ping();
-   result_type debug_status();
-   result_type debug_layers();
-   result_type debug_surfaces();
-   result_type debug_terminate();
-};
-
-} // namespace wm
-
diff --git a/src/app.cpp b/src/app.cpp
index 9ddfde4..164ea21 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -76,8 +76,7 @@ struct result<layer_map> load_layer_map(char const *filename) {
  * App Impl
  */
 App::App(wl::display *d)
-   : api{this},
-     chooks{this},
+   : chooks{this},
      display{d},
      controller{},
      outputs(),
@@ -590,6 +589,31 @@ char const *App::api_enddraw(char const *drawing_name) {
 
 void App::api_ping() { this->dispatch_pending_events(); }
 
+void App::send_event(char const *evname, char const *label){
+   HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label);
+
+   json_object *j = json_object_new_object();
+   json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
+
+   int ret = afb_event_push(this->map_afb_event[evname], j);
+   if (ret != 0) {
+      HMI_DEBUG("wm", "afb_event_push failed: %m");
+   }
+}
+
+void App::send_event(char const *evname, char const *label, char const *area){
+   HMI_DEBUG("wm", "%s: %s(%s, %s)", __func__, evname, label, area);
+
+   json_object *j = json_object_new_object();
+   json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
+   json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area));
+
+   int ret = afb_event_push(this->map_afb_event[evname], j);
+   if (ret != 0) {
+      HMI_DEBUG("wm", "afb_event_push failed: %m");
+   }
+}
+
 /**
  * proxied events
  */
@@ -634,23 +658,23 @@ void App::surface_removed(uint32_t surface_id) {
 }
 
 void App::emit_activated(char const *label) {
-   this->api.send_event(kListEventName[Event_Active], label);
+   this->send_event(kListEventName[Event_Active], label);
 }
 
 void App::emit_deactivated(char const *label) {
-   this->api.send_event(kListEventName[Event_Inactive], label);
+   this->send_event(kListEventName[Event_Inactive], label);
 }
 
 void App::emit_syncdraw(char const *label, char const *area) {
-    this->api.send_event(kListEventName[Event_SyncDraw], label, area);
+    this->send_event(kListEventName[Event_SyncDraw], label, area);
 }
 
 void App::emit_flushdraw(char const *label) {
-   this->api.send_event(kListEventName[Event_FlushDraw], label);
+   this->send_event(kListEventName[Event_FlushDraw], label);
 }
 
 void App::emit_visible(char const *label, bool is_visible) {
-   this->api.send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label);
+   this->send_event(is_visible ? kListEventName[Event_Visible] : kListEventName[Event_Invisible], label);
 }
 
 void App::emit_invisible(char const *label) {
diff --git a/src/app.hpp b/src/app.hpp
index ee4e732..5ec19ae 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -24,8 +24,6 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <experimental/optional>
-
-#include "afb_binding_api.hpp"
 #include "config.hpp"
 #include "controller_hooks.hpp"
 #include "layers.hpp"
@@ -144,7 +142,6 @@ struct App {
      "flushdraw"
    };
 
-   struct binding_api api;
    struct controller_hooks chooks;
 
    // This is the one thing, we do not own.
@@ -195,6 +192,8 @@ struct App {
    char const *api_enddraw(char const *drawing_name);
    char const *api_subscribe(afb_req *req, char const *event_name);
    void api_ping();
+   void send_event(char const *evname, char const *label);
+   void send_event(char const *evname, char const *label, char const *area);
 
    // Events from the compositor we are interested in
    void surface_created(uint32_t surface_id);
diff --git a/src/main.cpp b/src/main.cpp
index da8536a..e8ae75a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,16 +15,16 @@
  */
 
 #include <unistd.h>
+#include <algorithm>
+#include <mutex>
+#include <json.h>
+#include <json.hpp>
 #include "app.hpp"
+#include "result.hpp"
 #include "json_helper.hpp"
 #include "util.hpp"
 #include "wayland.hpp"
 
-#include <algorithm>
-#include <mutex>
-
-#include <json.h>
-
 extern "C" {
 #include <afb/afb-binding.h>
 #include <systemd/sd-event.h>
@@ -85,10 +85,7 @@ error:
    return -1;
 }
 
-/**
- * binding_init_()
- */
-int binding_init_() {
+int _binding_init() {
    HMI_NOTICE("wm", "WinMan ver. %s", WINMAN_VERSION_STRING);
 
    if (g_afb_instance != nullptr) {
@@ -145,7 +142,7 @@ error:
 
 int binding_init() noexcept {
    try {
-      return binding_init_();
+      return _binding_init();
    } catch (std::exception &e) {
       HMI_ERROR("wm", "Uncaught exception in binding_init(): %s", e.what());
    }
@@ -163,21 +160,20 @@ void windowmanager_requestsurface(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
    const char* a_drawing_name = afb_req_value(req, "drawing_name");
    if(!a_drawing_name){
        afb_req_fail(req, "failed", "Need char const* argument drawing_name");
        return;
    }
 
-   auto ret = g_afb_instance->app.api.requestsurface(a_drawing_name);
+   auto ret = g_afb_instance->app.api_request_surface(a_drawing_name);
    if (ret.is_err()) {
       afb_req_fail(req, "failed", ret.unwrap_err());
       return;
    }
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+   afb_req_success(req, json_object_new_int(ret.unwrap()), "success");
+
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling requestsurface: %s", e.what());
       return;
@@ -196,7 +192,6 @@ void windowmanager_requestsurfacexdg(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
    json_object *jreq = afb_req_json(req);
 
    json_object *j_drawing_name = nullptr;
@@ -213,19 +208,17 @@ void windowmanager_requestsurfacexdg(afb_req req) noexcept {
    }
    char const* a_ivi_id = json_object_get_string(j_ivi_id);
 
-   auto ret = g_afb_instance->app.api.requestsurfacexdg(a_drawing_name, a_ivi_id);
-   if (ret.is_err()) {
-      afb_req_fail(req, "failed", ret.unwrap_err());
+   auto ret = g_afb_instance->app.api_request_surface(a_drawing_name, a_ivi_id);
+   if (ret != nullptr) {
+      afb_req_fail(req, "failed", ret);
       return;
    }
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+   afb_req_success(req, NULL, "success");
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling requestsurfacexdg: %s", e.what());
       return;
    }
-
 }
 
 void windowmanager_activatesurface(afb_req req) noexcept {
@@ -239,7 +232,6 @@ void windowmanager_activatesurface(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
    const char* a_drawing_name = afb_req_value(req, "drawing_name");
    if(!a_drawing_name){
        afb_req_fail(req, "failed", "Need char const* argument drawing_name");
@@ -252,14 +244,13 @@ void windowmanager_activatesurface(afb_req req) noexcept {
        return;
    }
 
-   auto ret = g_afb_instance->app.api.activatesurface(a_drawing_name, a_drawing_area);
-   if (ret.is_err()) {
-      afb_req_fail(req, "failed", ret.unwrap_err());
+   auto ret = g_afb_instance->app.api_activate_surface(a_drawing_name, a_drawing_area);
+   if (ret != nullptr) {
+      afb_req_fail(req, "failed", ret);
       return;
    }
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+   afb_req_success(req, NULL, "success");
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling activatesurface: %s", e.what());
       return;
@@ -278,26 +269,23 @@ void windowmanager_deactivatesurface(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
    const char* a_drawing_name = afb_req_value(req, "drawing_name");
    if(!a_drawing_name){
        afb_req_fail(req, "failed", "Need char const* argument drawing_name");
        return;
    }
 
-   auto ret = g_afb_instance->app.api.deactivatesurface(a_drawing_name);
-   if (ret.is_err()) {
-      afb_req_fail(req, "failed", ret.unwrap_err());
+   auto ret = g_afb_instance->app.api_deactivate_surface(a_drawing_name);
+   if (ret != nullptr) {
+      afb_req_fail(req, "failed", ret);
       return;
    }
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+   afb_req_success(req, NULL, "success");
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling deactivatesurface: %s", e.what());
       return;
    }
-
 }
 
 void windowmanager_enddraw(afb_req req) noexcept {
@@ -311,21 +299,19 @@ void windowmanager_enddraw(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
    const char* a_drawing_name = afb_req_value(req, "drawing_name");
    if(!a_drawing_name){
        afb_req_fail(req, "failed", "Need char const* argument drawing_name");
        return;
    }
 
-   auto ret = g_afb_instance->app.api.enddraw(a_drawing_name);
-   if (ret.is_err()) {
-      afb_req_fail(req, "failed", ret.unwrap_err());
+   auto ret = g_afb_instance->app.api_enddraw(a_drawing_name);
+   if (ret != nullptr) {
+      afb_req_fail(req, "failed", ret);
       return;
    }
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+   afb_req_success(req, NULL, "success");
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling enddraw: %s", e.what());
       return;
@@ -344,7 +330,6 @@ void windowmanager_wm_subscribe(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
    json_object *jreq = afb_req_json(req);
    json_object *j = nullptr;
    if (! json_object_object_get_ex(jreq, "event", &j)) {
@@ -360,7 +345,7 @@ void windowmanager_wm_subscribe(afb_req req) noexcept {
       return;
    }
    afb_req_success(req, NULL, "success");
-   // END impl
+
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling wm_subscribe: %s", e.what());
       return;
@@ -379,15 +364,16 @@ void windowmanager_list_drawing_names(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
-   auto ret = g_afb_instance->app.api.list_drawing_names();
+
+   nlohmann::json j = g_afb_instance->app.id_alloc.name2id;
+   auto ret = wm::Ok(json_tokener_parse(j.dump().c_str()));
    if (ret.is_err()) {
       afb_req_fail(req, "failed", ret.unwrap_err());
       return;
    }
 
    afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling list_drawing_names: %s", e.what());
       return;
@@ -406,20 +392,15 @@ void windowmanager_ping(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
-   auto ret = g_afb_instance->app.api.ping();
-   if (ret.is_err()) {
-      afb_req_fail(req, "failed", ret.unwrap_err());
-      return;
-   }
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+   g_afb_instance->app.api_ping();
+
+   afb_req_success(req, NULL, "success");
+
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling ping: %s", e.what());
       return;
    }
-
 }
 
 void windowmanager_debug_status(afb_req req) noexcept {
@@ -433,20 +414,18 @@ void windowmanager_debug_status(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
-   auto ret = g_afb_instance->app.api.debug_status();
-   if (ret.is_err()) {
-      afb_req_fail(req, "failed", ret.unwrap_err());
-      return;
-   }
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+   json_object *jr = json_object_new_object();
+   json_object_object_add(jr, "surfaces",
+                          to_json(g_afb_instance->app.controller->sprops));
+   json_object_object_add(jr, "layers", to_json(g_afb_instance->app.controller->lprops));
+
+   afb_req_success(req, jr, "success");
+
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_status: %s", e.what());
       return;
    }
-
 }
 
 void windowmanager_debug_layers(afb_req req) noexcept {
@@ -460,20 +439,14 @@ void windowmanager_debug_layers(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
-   auto ret = g_afb_instance->app.api.debug_layers();
-   if (ret.is_err()) {
-      afb_req_fail(req, "failed", ret.unwrap_err());
-      return;
-   }
+   auto ret = wm::Ok(json_tokener_parse(g_afb_instance->app.layers.to_json().dump().c_str()));
+
+   afb_req_success(req, ret, "success");
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_layers: %s", e.what());
       return;
    }
-
 }
 
 void windowmanager_debug_surfaces(afb_req req) noexcept {
@@ -487,15 +460,15 @@ void windowmanager_debug_surfaces(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
-   auto ret = g_afb_instance->app.api.debug_surfaces();
+
+   auto ret = wm::Ok(to_json(g_afb_instance->app.controller->sprops));
    if (ret.is_err()) {
       afb_req_fail(req, "failed", ret.unwrap_err());
       return;
    }
 
    afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_surfaces: %s", e.what());
       return;
@@ -514,15 +487,14 @@ void windowmanager_debug_terminate(afb_req req) noexcept {
    }
 
    try {
-   // BEGIN impl
-   auto ret = g_afb_instance->app.api.debug_terminate();
-   if (ret.is_err()) {
-      afb_req_fail(req, "failed", ret.unwrap_err());
-      return;
+
+   if (getenv("WINMAN_DEBUG_TERMINATE") != nullptr) {
+      raise(SIGKILL);  // afb-daemon kills it's pgroup using TERM, which
+                       // doesn't play well with perf
    }
 
-   afb_req_success(req, ret.unwrap(), "success");
-   // END impl
+   afb_req_success(req, NULL, "success");
+
    } catch (std::exception &e) {
       afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_terminate: %s", e.what());
       return;
@@ -546,32 +518,5 @@ const struct afb_verb_v2 windowmanager_verbs[] = {
    {}
 };
 
-namespace wm {
-void binding_api::send_event(char const *evname, char const *label) {
-   HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label);
-
-   json_object *j = json_object_new_object();
-   json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
-
-   int ret = afb_event_push(g_afb_instance->app.map_afb_event[evname], j);
-   if (ret != 0) {
-      HMI_DEBUG("wm", "afb_event_push failed: %m");
-   }
-}
-
-void binding_api::send_event(char const *evname, char const *label, char const *area) {
-   HMI_DEBUG("wm", "%s: %s(%s, %s)", __func__, evname, label, area);
-
-   json_object *j = json_object_new_object();
-   json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
-   json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area));
-
-   int ret = afb_event_push(g_afb_instance->app.map_afb_event[evname], j);
-   if (ret != 0) {
-      HMI_DEBUG("wm", "afb_event_push failed: %m");
-   }
-}
-} // namespace wm
-
 extern "C" const struct afb_binding_v2 afbBindingV2 = {
    "windowmanager", nullptr, nullptr, windowmanager_verbs, nullptr, binding_init, nullptr, 0};