X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=generate-binding-glue.py;h=4791b4dc86653ad2d30270f67960ebd7112ed75b;hb=9b397b09fe6eef8936ad41763e4908e99ce274d6;hp=82f71aefa550dfc77bb94ccd16511f766e1c0dfc;hpb=89685c1f1e603d9a45ce0f3407c73e712dd7ad5a;p=staging%2Fwindowmanager.git

diff --git a/generate-binding-glue.py b/generate-binding-glue.py
index 82f71ae..4791b4d 100644
--- a/generate-binding-glue.py
+++ b/generate-binding-glue.py
@@ -50,6 +50,9 @@ def emit_func_impl(api, f):
 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;',
@@ -70,7 +73,8 @@ def emit_afb_verbs(api):
     p('   {}', '};')
 
 def emit_binding(api):
-    p('namespace {', '')
+    p('namespace {')
+    p('std::mutex binding_m;', '')
     for func in api['functions']:
         emit_func(api, func)
     p('} // namespace', '')
@@ -88,11 +92,11 @@ def emit_afb_api(api):
     p('struct binding_api {')
     p('   typedef wm::result<json_object *> result_type;')
     p('   struct wm::App *app;')
-    p('   void send_event(char const *evname, json_object *payload);')
+    p('   void send_event(char const *evname, char const *label);')
     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')
+    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
@@ -127,12 +131,7 @@ API = {
                 ],
             },
             { 'name': 'list_drawing_names', },
-            {
-                'name': 'demo_activate_surface',
-                'args': [ { 'name': 'surfaceid', 'type': 'uint32_t', 'jtype': 'int' } ]
-            },
-
-            { 'name': 'demo_activate_all' },
+            { 'name': 'ping' },
 
             { 'name': 'debug_status', },
             { 'name': 'debug_layers', },