lbkit 0.9.2__tar.gz → 0.9.3__tar.gz

{lbkit-0.9.2/lbkit.egg-info → lbkit-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.2
+Version: 0.9.3
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.9.3/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.9.3'

{lbkit-0.9.2 → lbkit-0.9.3}/lbkit/codegen/idf_interface.py

@@ -987,6 +987,8 @@ class IdfPluginAction(IdfMethod):
         self.policy = method_data.get("policy", "continue_always")
         super().__init__(intf, method_data)
         self.is_plugin = True
+        if self.policy == "continue_always" and method_data.get("returns", []):
+            raise Exception(f"The policy of plugin {self.name} is 'continue_always', does't supported 'returns' property, interface {self.intf.name} failed to generate code")
 
 
 class IdfEnumeration(IdfBase):

{lbkit-0.9.2 → lbkit-0.9.3}/lbkit/codegen/template/public.c.mako

@@ -1218,7 +1218,7 @@ int ${class_name}_${action.name}_register(const gchar *req_signature, const gcha
     g_mutex_lock(&_${class_name}_${action.name}_lock);
     for (GSList *item = _${class_name}_${action.name}_actions; item; item = item->next) {
         _${class_name}_${action.name}_PluginAction *old_handler = (_${class_name}_${action.name}_PluginAction *)item->data;
-        if (action == old_handler->action || user_data == old_handler->user_data) {
+        if (action == old_handler->action && user_data == old_handler->user_data) {
             g_mutex_unlock(&_${class_name}_${action.name}_lock);
             return 0;
         }
@@ -1256,9 +1256,18 @@ void ${class_name}_${action.name}_unregister(${class_name}_${action.name}_action
 <% REQ_PARA = f', const {class_name}_{action.name}_Req *req' %>\
 <% REQ_NAME = f', req' %>\
     % endif
+    % if action.policy == "continue_always":
+void ${class_name}_${action.name}_run(${class_name} obj${REQ_PARA}${RSP_PARA})
+    % else:
 int ${class_name}_${action.name}_run(${class_name} obj${REQ_PARA}${RSP_PARA})
+    % endif
 {
+    % if action.policy == "return_any_success":
+    gint result = -1;
+    % elif action.policy == "return_any_fail":
     gint result = 0;
+    % endif
+
     g_mutex_lock(&_${class_name}_${action.name}_lock);
     for (GSList *item = _${class_name}_${action.name}_actions; item; item = item->next) {
         _${class_name}_${action.name}_PluginAction *handler = (_${class_name}_${action.name}_PluginAction *)item->data;
@@ -1266,24 +1275,42 @@ int ${class_name}_${action.name}_run(${class_name} obj${REQ_PARA}${RSP_PARA})
         if (rsp && *rsp) {
             ${class_name}_${action.name}_Rsp_free(rsp);
         }
+        % if action.policy == "continue_always":
+        handler->action(obj${REQ_NAME}, rsp, handler->user_data);
+        % else:
         gint ret = handler->action(obj${REQ_NAME}, rsp, handler->user_data);
+        % endif
     % else:
+        % if action.policy == "continue_always":
+        handler->action(obj${REQ_NAME}, handler->user_data);
+        % else:
         gint ret = handler->action(obj${REQ_NAME}, handler->user_data);
+        % endif
     % endif
-        if (ret != 0)
-            result = ret;
         % if action.policy == "return_any_success":
         /* return when any action success(ret == 0) */
-        if (ret == 0)
+        if (ret == 0) {
+            result = 0;
             break;
+        }
         % elif action.policy == "return_any_fail":
         /* return when any action failed(ret != 0) */
-        if (ret != 0)
+        if (ret != 0) {
+            result = ret;
             break;
+        }
         % endif
     }
+    % if len(action.returns.parameters) > 0:
+    if (result != 0 && *rsp) {
+        ${class_name}_${action.name}_Rsp_free(rsp);
+        *rsp = NULL;
+    }
+    % endif
     g_mutex_unlock(&_${class_name}_${action.name}_lock);
+    % if action.policy != "continue_always":
     return result;
+    % endif
 }
 
     % endfor

{lbkit-0.9.2 → lbkit-0.9.3}/lbkit/codegen/template/public.h.mako

@@ -320,13 +320,21 @@ typedef struct {
     % if len(action.parameters.parameters) > 0:
 <% REQ_PARA = f', const {class_name}_{action.name}_Req *req' %>\
     % endif
+    % if action.policy == "continue_always":
+typedef void (*${class_name}_${action.name}_action)(${class_name} obj${REQ_PARA}${RSP_PARA}, gpointer user_data);
+    % else:
 typedef int (*${class_name}_${action.name}_action)(${class_name} obj${REQ_PARA}${RSP_PARA}, gpointer user_data);
+    % endif
 
 /* Register a new plugin action, can't register repeated with same action and user_data */
 int ${class_name}_${action.name}_register(const gchar *req_signature, const gchar *rsp_signature,
     ${class_name}_${action.name}_action action, gpointer user_data);
 void ${class_name}_${action.name}_unregister(${class_name}_${action.name}_action action);
+    % if action.policy == "continue_always":
+void ${class_name}_${action.name}_run(${class_name} obj${REQ_PARA}${RSP_PARA});
+    % else:
 int ${class_name}_${action.name}_run(${class_name} obj${REQ_PARA}${RSP_PARA});
+    % endif
 
 % endfor
 % endif

{lbkit-0.9.2 → lbkit-0.9.3}/lbkit/component/test.py

@@ -193,6 +193,7 @@ class TestComponent():
         with open(term_flag, "w") as fp:
             pass
         time.sleep(1)
+        os.unlink(term_flag)
         # 设置ROOTFS_DIR环境变量，为DT测试提供相对路径
         self._collect_coverage_data(build.build_folder, test_src_folder)
         log.success("Test finished")

{lbkit-0.9.2 → lbkit-0.9.3/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.2
+Version: 0.9.3
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.9.2/lbkit/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.9.2'