lbkit 0.5.11__tar.gz → 0.5.13__tar.gz

{lbkit-0.5.11/lbkit.egg-info → lbkit-0.5.13}/PKG-INFO

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

lbkit-0.5.13/lbkit/__init__.py

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

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/codegen.py

@@ -17,7 +17,7 @@ from lbkit.misc import SmartFormatter
 lb_cwd = os.path.split(os.path.realpath(__file__))[0]
 log = Logger("codegen")
 
-__version__=1
+__version__=2
 
 class CodeGen(object):
     def __init__(self, args):

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/ctype_defination.py

@@ -414,12 +414,26 @@ class RefObjArrayValidator(RefObjValidator):
 
 class CTypeBase(object):
     """C语言相关的操作函数＆类型定义"""
-    def __init__(self, declare, free_func, encode_func, decode_func, validator: IdfValidator = None):
+    def __init__(self, declare, free_func, encode_func, decode_func,
+                 validator: IdfValidator = None,
+                 const_declare = None,
+                 const_free_func = None,
+                 const_decode_func = None):
         self.declare = declare
         self.free_func = free_func
         self.encode_func = encode_func
         self.decode_func = decode_func
         self.validator = validator
+        # Req消息顶层数据结构的释放和解码函数，注意顶层的(string/signature/object_path)数据可以是const的
+        self.const_declare = const_declare
+        self.const_free_func = const_free_func
+        self.const_decode_func = const_decode_func
+        if const_declare is None:
+            self.const_declare = self.declare
+        if const_free_func is None:
+            self.const_free_func = self.free_func
+        if const_decode_func is None:
+            self.const_decode_func = self.decode_func
 
 
 """定义支持的C语言类型"""
@@ -513,21 +527,30 @@ CTYPE_OBJS = {
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_string_encode(<arg_name>)"],
         ["<arg_in> = g_strdup(g_variant_get_string(<arg_name>, NULL))"],
-        StringValidator("^.*$")
+        StringValidator("^.*$"),
+        ["const gchar *<arg_name>"],
+        [],
+        ["<arg_in> = g_variant_get_string(<arg_name>, NULL)"],
     ),
     "object_path": CTypeBase(
         ["<const>gchar *<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_object_path_encode(<arg_name>)"],
         ["<arg_in> = g_strdup(g_variant_get_string(<arg_name>, NULL))"],
-        StringValidator("^(/[A-Z0-9a-z_]+)*$")
+        StringValidator("^(/[A-Z0-9a-z_]+)*$"),
+        ["const gchar *<arg_name>"],
+        [],
+        ["<arg_in> = g_variant_get_string(<arg_name>, NULL)"],
     ),
     "signature": CTypeBase(
         ["<const>gchar *<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_signature_encode(<arg_name>)"],
         ["<arg_in> = g_strdup(g_variant_get_string(<arg_name>, NULL))"],
-        StringValidator("^([abynqiuxtdsogv\\\\{\\\\}\\\\(\\\\)])+$")
+        StringValidator("^([abynqiuxtdsogv\\\\{\\\\}\\\\(\\\\)])+$"),
+        ["const gchar *<arg_name>"],
+        [],
+        ["<arg_in> = g_variant_get_string(<arg_name>, NULL)"],
     ),
     "variant": CTypeBase(
         ["GVariant *<arg_name>"],

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/idf_interface.py

@@ -380,6 +380,45 @@ class IdfCtypeRender():
             else:
                 return [f"<arg_in> = {stru_name}_decode(<arg_name>)"]
 
+    def const_declare(self):
+        """常量申明，用于方法请求和信号消息结构体顶层成员申明"""
+        log.debug(f"Get const_declare info, name: {self.name}, ctype: {self.ctype}")
+        match = re.match(f"^({CTYPE_REGEX})$", self.ctype)
+        if match:
+            ctype_obj = CTYPE_OBJS.get(self.ctype)
+            return ctype_obj.const_declare
+        match = re.match(f"^({CTYPE_REGEX})$", self.ctype)
+        if match:
+            ctype_obj = CTYPE_OBJS.get(self.ctype)
+            return ctype_obj.const_declare
+        return self.declare()
+
+    def const_decode_func(self):
+        """常量反序列化申明，用于方法请求和信号消息结构体顶层成员反序列化"""
+        log.debug(f"Get const_declare_func info, name: {self.name}, ctype: {self.ctype}")
+        match = re.match(f"^({CTYPE_REGEX})$", self.ctype)
+        if match:
+            ctype_obj = CTYPE_OBJS.get(self.ctype)
+            return ctype_obj.const_decode_func
+        match = re.match(f"^({CTYPE_REGEX})$", self.ctype)
+        if match:
+            ctype_obj = CTYPE_OBJS.get(self.ctype)
+            return ctype_obj.const_decode_func
+        return self.decode_func()
+
+    def const_free_func(self):
+        """常量释放申明，用于方法请求和信号消息结构体顶层成员反序列化"""
+        log.debug(f"Get const_free_func info, name: {self.name}, ctype: {self.ctype}")
+        match = re.match(f"^({CTYPE_REGEX})$", self.ctype)
+        if match:
+            ctype_obj = CTYPE_OBJS.get(self.ctype)
+            return ctype_obj.const_free_func
+        match = re.match(f"^({CTYPE_REGEX})$", self.ctype)
+        if match:
+            ctype_obj = CTYPE_OBJS.get(self.ctype)
+            return ctype_obj.const_free_func
+        return self.free_func()
+
     def odf_load_func(self):
         log.debug(f"Get odf_load function, name: {self.name}, ctype: {self.ctype}")
         # odf不支持gariant

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/template/client.c.mako

@@ -11,7 +11,6 @@ static ${intf.alias}_Properties ${properties};
 static const ${intf.alias}_Signals *${signal_processer} = NULL;
 
 % for prop in intf.properties:
-/* ${prop.description} */
     % if prop.deprecated:
 __attribute__((__deprecated__)) gint ${class_name}_set_${prop.name}(const ${class_name} *object,
     ${", ".join(prop.declare()).replace("<arg_name>", prop.name).replace("<const>", "const ")}, GError **error)
@@ -53,17 +52,6 @@ gint ${class_name}_get_${prop.name}(const ${class_name} *object, GVariant **valu
     % if len(method.parameters.parameters) > 0:
 <% REQ_PARA = f'const {intf.alias}_{method.name}_Req *req, ' %>\
     % endif
-/*
- * ${method.description}
- *
- * method name: ${method.name}
-    % for arg in method.parameters.parameters:
- *   @in_${arg.name}: ${arg.description}, signature: ${arg.signature}
-    % endfor
-    % for arg in method.returns.parameters:
- *   @out_${arg.name}: ${arg.description}, signature: ${arg.signature}
-    % endfor
- */
 int ${class_name}_Call_${method.name}(const ${class_name} *object,
     ${REQ_PARA}${RSP_PARA}gint timeout,
     GError **error)
@@ -85,15 +73,10 @@ int ${class_name}_Call_${method.name}(const ${class_name} *object,
     return gcl_impl.call_method((GclObject *)object, (const GclMethod *)&${method_processer}->${method.name},
                                  (void *)req, (void **)rsp, timeout, error);
 }
-% endfor
 
-static GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque);
-/*
- * interface: ${intf.name}
-% for c in intf.description.split("\n"):
- * ${c}
 % endfor
- */
+static GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque);
+
 static GclInterface _${class_name}_interface = {
     .create = _${class_name}_create,
     .is_remote = 1,
@@ -121,10 +104,6 @@ GclObject *_${class_name}_create(const gchar *obj_name, gpointer opaque)
 }
 
 % for signal in intf.signals:
-/*
- * Send dbus signal: ${signal.name}
- * ${signal.description}
- */
 % if signal.deprecated:
 __attribute__((__deprecated__)) guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Signal handler,
     const gchar *bus_name, const gchar *object_path, const gchar *arg0, gpointer user_data)
@@ -148,7 +127,6 @@ void ${class_name}_Unsubscribe_${signal.name}(guint *id)
 }
 
 % endfor
-
 GclInterface *${class_name}_interface(void)
 {
     return &_${class_name}_interface;

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/template/client.h.mako

@@ -14,7 +14,17 @@ typedef ${intf.alias} ${class_name};
 typedef ${intf.alias}_Properties ${class_name}_Properties;
 
 % for prop in intf.properties:
-/* ${prop.description} */
+/*
+ * property: ${prop.name}
+% if len(prop.description.strip()) > 0:
+ *
+ % for line in prop.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
     % if prop.deprecated:
 __attribute__((__deprecated__)) gint ${class_name}_set_${prop.name}(const ${class_name} *object,
     ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")},
@@ -37,7 +47,17 @@ gint ${class_name}_get_${prop.name}(const ${class_name} *object, GVariant **valu
     % if len(method.parameters.parameters) > 0:
 <% REQ_PARA = f'const {intf.alias}_{method.name}_Req *req, ' %>\
     % endif
-/* method.description */
+/*
+ * method: ${method.name}
+% if len(method.description.strip()) > 0:
+ *
+ % for line in method.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
     % if method.deprecated:
 __attribute__((__deprecated__)) int ${class_name}_Call_${method.name}(const ${class_name} *object,
     ${REQ_PARA}${RSP_PARA}gint timeout,
@@ -50,7 +70,17 @@ int ${class_name}_Call_${method.name}(const ${class_name} *object,
 % endfor
 
 % for signal in intf.signals:
-/* ${signal.description} */
+/*
+ * signal: ${signal.name}
+% if len(signal.description.strip()) > 0:
+ *
+ % for line in signal.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
 typedef void (*${class_name}_${signal.name}_Signal)(const ${class_name} *object, const gchar *destination,
     const ${intf.alias}_${signal.name}_Msg *req, gpointer user_data);
 /**/

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/template/public.c.mako

@@ -771,11 +771,8 @@ static GDBusAnnotationInfo *${class_name}_prop_${prop.name}_annotations[] =
             % endfor
     NULL,
 };
-        % endif
 
-        % for c in prop.description.split("\n"):
-/* ${c} */
-        % endfor
+        % endif
 static GDBusPropertyInfo ${class_name}_property_${prop.name} =
 {
     .ref_count = -1,
@@ -786,9 +783,9 @@ static GDBusPropertyInfo ${class_name}_property_${prop.name} =
     .annotations = ${class_name}_prop_${prop.name}_annotations,
         % endif
 };
+
     % endif
 % endfor
-
 static ${class_name}_Properties _${class_name}_properties =
 {
 <% id = 0 %>\
@@ -821,7 +818,7 @@ const ${class_name}_Properties *${class_name}_properties_const(void)
 % if not method.is_plugin:
 ## 方法${method.name}的请求体序列化函数
 /* ${class_name}_${method.name}_Req请求结构体类型序列化（struct转GVariant）函数 */
-static GVariant *${class_name}_${method.name}_Req_encode(${class_name}_${method.name}_Req *value)
+GVariant *${class_name}_${method.name}_Req_encode(${class_name}_${method.name}_Req *value)
 {
     static ${class_name}_${method.name}_Req default_val;
     if (!value) {
@@ -842,7 +839,7 @@ static GVariant *${class_name}_${method.name}_Req_encode(${class_name}_${method.
 
 ## 方法${method.name}的请求体反序列化函数
 /* ${class_name}_${method.name}_Req结构体类型反序列化（GVariant转struct）函数，返回以NULL结束的指针数组 */
-static ${class_name}_${method.name}_Req *${class_name}_${method.name}_Req_decode(GVariant *in)
+${class_name}_${method.name}_Req *${class_name}_${method.name}_Req_decode(GVariant *in)
 {
     GVariantIter iter;
     GVariant *tmp = NULL;
@@ -855,7 +852,7 @@ static ${class_name}_${method.name}_Req *${class_name}_${method.name}_Req_decode
     % for prop in method.parameters.parameters:
     /* process ${prop.name} */
     tmp = g_variant_iter_next_value(&iter);
-        % for line in prop.decode_func():
+        % for line in prop.const_decode_func():
     ${line.replace("<arg_name>", "tmp").replace("n_<arg_in>", "output->n_" + prop.name).replace("<arg_in>", "output->" + prop.name)};
         % endfor
     g_variant_unref(tmp);
@@ -872,7 +869,7 @@ void ${class_name}_${method.name}_Req_free(${class_name}_${method.name}_Req **va
         return;
     }
     % for prop in method.parameters.parameters:
-        % for line in prop.free_func():
+        % for line in prop.const_free_func():
     ${line.replace("<arg_name>", "(*value)->" + prop.name)};
         % endfor
     % endfor
@@ -882,7 +879,7 @@ void ${class_name}_${method.name}_Req_free(${class_name}_${method.name}_Req **va
 
 % if not method.is_plugin:
 /* ${class_name}_${method.name}_Rsp请求结构体类型序列化（struct转GVariant）函数 */
-static GVariant *${class_name}_${method.name}_Rsp_encode(${class_name}_${method.name}_Rsp *value)
+GVariant *${class_name}_${method.name}_Rsp_encode(${class_name}_${method.name}_Rsp *value)
 {
     static ${class_name}_${method.name}_Rsp default_val;
     if (!value) {
@@ -903,7 +900,7 @@ static GVariant *${class_name}_${method.name}_Rsp_encode(${class_name}_${method.
 
 ## 方法${method.name}的响应体反序列化函数
 /* ${class_name}_${method.name}_Rsp结构体类型反序列化（GVariant转struct）函数，返回以NULL结束的指针数组 */
-static ${class_name}_${method.name}_Rsp *${class_name}_${method.name}_Rsp_decode(GVariant *in)
+${class_name}_${method.name}_Rsp *${class_name}_${method.name}_Rsp_decode(GVariant *in)
 {
     GVariantIter iter;
     GVariant *tmp = NULL;
@@ -1074,7 +1071,7 @@ int ${class_name}_${action.name}_run(const ${class_name} *object${REQ_PARA}${RSP
 % for signal in intf.signals:
 ## 方法${method.name}的响应体序列化函数
 /* ${class_name}_${signal.name}_Msg请求结构体类型序列化（struct转GVariant）函数 */
-static GVariant *${class_name}_${signal.name}_Msg_encode(${class_name}_${signal.name}_Msg *value)
+GVariant *${class_name}_${signal.name}_Msg_encode(${class_name}_${signal.name}_Msg *value)
 {
     static ${class_name}_${signal.name}_Msg default_val;
     if (!value) {
@@ -1095,7 +1092,7 @@ static GVariant *${class_name}_${signal.name}_Msg_encode(${class_name}_${signal.
 
 ## 方法${signal.name}的响应体反序列化函数
 /* ${class_name}_${signal.name}_Msg结构体类型反序列化（GVariant转struct）函数，返回以NULL结束的指针数组 */
-static ${class_name}_${signal.name}_Msg *${class_name}_${signal.name}_Msg_decode(GVariant *in)
+${class_name}_${signal.name}_Msg *${class_name}_${signal.name}_Msg_decode(GVariant *in)
 {
     GVariantIter iter;
     GVariant *tmp = NULL;
@@ -1108,7 +1105,7 @@ static ${class_name}_${signal.name}_Msg *${class_name}_${signal.name}_Msg_decode
     % for prop in signal.properties.parameters:
     /* process ${prop.name} */
     tmp = g_variant_iter_next_value(&iter);
-        % for line in prop.decode_func():
+        % for line in prop.const_decode_func():
     ${line.replace("<arg_name>", "tmp").replace("n_<arg_in>", "output->n_" + prop.name).replace("<arg_in>", "output->" + prop.name)};
         % endfor
     g_variant_unref(tmp);
@@ -1125,7 +1122,7 @@ void ${class_name}_${signal.name}_Msg_free(${class_name}_${signal.name}_Msg **va
     }
 
     % for prop in signal.properties.parameters:
-        % for line in prop.free_func():
+        % for line in prop.const_free_func():
     ${line.replace("<arg_name>", "(*value)->" + prop.name)};
         % endfor
     % endfor

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/template/public.h.mako

@@ -10,26 +10,65 @@ extern "C" {
 #endif
 
 /* Interface ${intf.alias} codegen start */
+
 <% class_name = intf.alias %>\
 % for name, stru in intf.structures.items():
-/* ${stru.description} */
+/*
+ * structure: ${name}
+% if len(stru.description.strip()) > 0:
+ *
+ % for line in stru.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
 typedef struct _${name} ${name};
 % endfor
-
 % for name, enum in intf.enumerations.items():
-/* ${enum.description} */
-typedef enum _${name} ${name};
+/*
+ * enumeration: ${name}
+% if len(enum.description.strip()) > 0:
+ *
+ % for line in enum.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
  % endfor
-
+% endif
+ */
+typedef enum _${name} ${name};
+% endfor
 % for name, dictionary in intf.dictionaries.items():
-/* ${dictionary.description} */
+/*
+ * dictionary: ${name}
+% if len(dictionary.description.strip()) > 0:
+ *
+ % for line in dictionary.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
 typedef struct _${name}${dictionary.key} ${name}${dictionary.key};
 typedef struct _${name} ${name};
 % endfor
 
 % for name, stru in intf.structures.items():
     % if name != class_name:
-/* ${stru.description} */
+/*
+ * structure: ${name}
+% if len(stru.description.strip()) > 0:
+ *
+ % for line in stru.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
 struct _${name} {
         % for prop in stru.values.parameters:
             % for dec in prop.declare():
@@ -42,7 +81,6 @@ struct _${name} {
 %endfor
 % for name, enum in intf.enumerations.items():
 ## 枚举定义
-/* ${enum.description} */
 enum _${name} {
     % for value in enum.values.parameters:
     ${name}_${value.name},
@@ -54,8 +92,6 @@ const gchar *${name}_as_string(${name} value);
 
 % endfor
 % for name, dictionary in intf.dictionaries.items():
-
-/* ${dictionary.description} */
 struct _${name}${dictionary.key} {
     % for value in dictionary.values.parameters:
         % for line in value.declare():
@@ -81,7 +117,6 @@ struct _${name} {
 ${name} *${name}_new(void);
 
 % endfor
-
 ## 定义结构体编解码和释放函数
 % for name, stru in intf.structures.items():
 /* ${name} structure object */
@@ -97,13 +132,11 @@ ${name} **${name}_decode_v(GVariant *in);
 GVariant *${name}_encode_v(${name} * const *value);
 // Clean up the memory of structure array and it's all members, `*value` will to NULL
 void ${name}_free_v(${name} ***value);
-
 /* END: 结构体${name}及其数组类型的序列化、反序列化、释放函数 */
 
 % endfor
 ## 定义枚举编解码函数
 % for name, enum in intf.enumerations.items():
-/* ${enum.description} */
 /* START: 枚举${name}及其数组类型的序列化、反序列化、释放函数 */
 GVariant *${name}_encode(${name} value);
 ${name} ${name}_decode(GVariant *in);
@@ -115,7 +148,6 @@ ${name} *${name}_decode_v(GVariant *in, gsize *n);
 % endfor
 ## 定义字典编解码和释放函数
 % for name, dictionary in intf.dictionaries.items():
-/* ${dictionary.description} */
 /* START: 字典${name}及其数组类型的序列化、反序列化、释放函数 */
 GVariant *${name}_encode(const ${name} *value);
 ${name} *${name}_decode(GVariant *in);
@@ -127,13 +159,12 @@ void ${name}_free_v(${name} ***value);
 /* END: 字典${name}及其数组类型的序列化、反序列化、释放函数 */
 
 % endfor
-
 ### 开始生成方法的请求体、响应体和处理函数
 % for method in intf.fake_methods:
 /* ${method.name}方法的请求体 */
 typedef struct {
         % for arg in method.parameters.parameters:
-            % for dec in arg.declare():
+            % for dec in arg.const_declare():
     ${dec.replace("<arg_name>", arg.name).replace("<const>", "")};
             % endfor
         % endfor
@@ -149,9 +180,16 @@ typedef struct {
 } ${class_name}_${method.name}_Rsp;
 
 % if not method.is_plugin:
-typedef int (*${class_name}_${method.name}_Method)(const ${class_name} *object, const ${class_name}_${method.name}_Req *req, ${class_name}_${method.name}_Rsp **rsp, GError **error);
+typedef int (*${class_name}_${method.name}_Method)(const ${class_name} *object,
+    const ${class_name}_${method.name}_Req *req,
+    ${class_name}_${method.name}_Rsp **rsp,
+    GError **error, gpointer ext_data);
 % endif
+GVariant *${class_name}_${method.name}_Req_encode(${class_name}_${method.name}_Req *value);
+${class_name}_${method.name}_Req *${class_name}_${method.name}_Req_decode(GVariant *in);
 void ${class_name}_${method.name}_Req_free(${class_name}_${method.name}_Req **value);
+GVariant *${class_name}_${method.name}_Rsp_encode(${class_name}_${method.name}_Rsp *value);
+${class_name}_${method.name}_Rsp *${class_name}_${method.name}_Rsp_decode(GVariant *in);
 void ${class_name}_${method.name}_Rsp_free(${class_name}_${method.name}_Rsp **value);
 %endfor
 
@@ -199,11 +237,13 @@ int ${class_name}_${action.name}_run(const ${class_name} *object${REQ_PARA}${RSP
 /* ${signal.name}信号的消息体 */
 typedef struct {
         % for arg in signal.properties.parameters:
-            % for dec in arg.declare():
+            % for dec in arg.const_declare():
     ${dec.replace("<arg_name>", arg.name).replace("<const>", "")};
             % endfor
         % endfor
 } ${class_name}_${signal.name}_Msg;
+${class_name}_${signal.name}_Msg *${class_name}_${signal.name}_Msg_decode(GVariant *in);
+GVariant *${class_name}_${signal.name}_Msg_encode(${class_name}_${signal.name}_Msg *value);
 void ${class_name}_${signal.name}_Msg_free(${class_name}_${signal.name}_Msg **value);
 
 %endfor
@@ -222,7 +262,6 @@ typedef struct {
 
 % for name, stru in intf.structures.items():
     % if name == class_name:
-/* ${stru.description} */
 struct _${name} {
     GclBase _base;        /* Notice: property name can't be _base */
     char __reserved__[8]; /* 8bytes reserved space, can't be modified */
@@ -242,7 +281,6 @@ typedef struct {
     GclProperty __reserved__;
 } ${class_name}_Properties;
 
-
 gboolean ${intf.name.replace(".", "_")}_validate_odf(yaml_document_t *doc, yaml_node_t *node,
     const gchar *object_name, GSList **error_list);
 // 不要使用此函数返回的对象，需要使用${class_name}_properties() 或${class_name}_Cli_properties()

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/template/server.c.mako

@@ -33,7 +33,6 @@ ${name} **_load_odf_as_${name}_v(yaml_document_t *doc, yaml_node_t *node);
 % for name, stru in intf.structures.items():
 /* ${name} structure object */
 /* START: 结构体${name}及其数组类型的ODF加载函数 */
-
 ${name} *_load_odf_as_${name}(yaml_document_t *doc, yaml_node_t *node)
 {
 <% cnt = 0 %>\
@@ -85,7 +84,6 @@ ${name} **_load_odf_as_${name}_v(yaml_document_t *doc, yaml_node_t *node)
 % endfor
 ## 定义枚举ODF加载函数
 % for name, enum in intf.enumerations.items():
-
 ${name} _load_odf_as_${name}(yaml_document_t *doc, yaml_node_t *node)
 {
     g_assert(node->type == YAML_SCALAR_NODE);
@@ -125,7 +123,6 @@ ${name} *_load_odf_as_${name}_v(yaml_document_t *doc, yaml_node_t *node, gsize *
 % endfor
 ## 定义字典ODF加载函数
 % for name, dictionary in intf.dictionaries.items():
-
 ${name} *_load_odf_as_${name}(yaml_document_t *doc, yaml_node_t *node)
 {
     GHashTable *prop_table = NULL;
@@ -190,7 +187,6 @@ static ${class_name}_Properties ${properties};
 static const ${class_name}_Signals *${signal_processer} = NULL;
 
 % for prop in intf.properties:
-/* ${prop.description} */
     % if prop.deprecated:
 __attribute__((__deprecated__)) void ${class_name}_set_${prop.name}(const ${class_name} *object,
     ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")})
@@ -209,10 +205,6 @@ void ${class_name}_set_${prop.name}(const ${class_name} *object,
 
 % endfor
 % for signal in intf.signals:
-/*
- * Signal: ${signal.name}
- * ${signal.description}
- */
 <% REQ_PARA = f'' %>\
     % if len(signal.properties.parameters) > 0:
 <% REQ_PARA = f'const {class_name}_{signal.name}_Msg *msg, ' %>\
@@ -246,12 +238,6 @@ static void _load_from_odf(yaml_document_t *doc, yaml_node_t *node, GclObject *g
     property_reference_loaded ref_loaded, gpointer user_data);
 static void _valid_from_odf(yaml_document_t *doc, yaml_node_t *node, const gchar *object_name);
 
-/*
- * interface: ${intf.name}
-% for c in intf.description.split("\n"):
- * ${c}
-% endfor
- */
 static GclInterface _${class_name}_interface = {
     .create = _${intf.alias}_create,
     .validate_odf = ${intf.name.replace(".", "_")}_validate_odf,
@@ -355,7 +341,6 @@ ${class_name}_Properties *${class_name}_properties(void)
 
 static void __attribute__((constructor(150))) ${class_name}_register(void)
 {
-
     // 从公共库中复制信号处理函数
     ${signal_processer} = ${class_name}_signals();
     // 从公共库中复制方法处理函数

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/codegen/template/server.h.mako

@@ -4,30 +4,47 @@
 #include <glib-2.0/glib.h>
 #include <glib-2.0/gio/gio.h>
 #include "gcl_base.h"
+#include "public/${intf.name}.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "public/${intf.name}.h"
 <% class_name = intf.alias %>\
 
 % for prop in intf.properties:
-/* ${prop.description} */
+/*
+ * property: ${prop.name}
+% if len(prop.description.strip()) > 0:
+ *
+ % for line in prop.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
     % if prop.deprecated:
-__attribute__((__deprecated__)) void ${class_name}_set_${prop.name}(const ${class_name} *object,
-    ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")});
+__attribute__((__deprecated__)) void ${class_name}_set_${prop.name}(const ${class_name} *object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")});
     % else:
-void ${class_name}_set_${prop.name}(const ${class_name} *object,
-    ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")});
+void ${class_name}_set_${prop.name}(const ${class_name} *object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")});
     % endif
 % endfor
 
 % for signal in intf.signals:
 /*
- * ${signal.description}
+ * signal: ${signal.name}
+% if len(signal.description.strip()) > 0:
+ *
+ % for line in signal.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
  */
     % if len(signal.properties.parameters) > 0:
-gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const gchar *destination, const ${class_name}_${signal.name}_Msg *msg, GError **error);
+gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const gchar *destination,
+    const ${class_name}_${signal.name}_Msg *msg, GError **error);
     % else:
 gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const gchar *destination, GError **error);
     % endif

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/component/build.py

@@ -4,6 +4,7 @@ import yaml
 import shutil
 import re
 import json
+from multiprocessing import Pool
 import traceback
 from argparse import ArgumentParser
 from jsonschema import validate, ValidationError
@@ -34,11 +35,22 @@ class DeployComponent():
         package_folder = tools.run(cmd).stdout.strip()
         log.info(f">>>> deploy {self.package_ref}")
         cmd = f"cp -rT {package_folder}/ {self.rootfs_dir}"
-        tools.exec(cmd)
+        cnt = 10
+        while cnt > 0:
+            try:
+                cnt -= 1
+                tools.exec(cmd)
+                return
+            except Exception as e:
+                if cnt == 0:
+                    log.warn("Copy failed, msg: " + str(e))
+                    raise e
+                log.info("Copy {self.package_ref} failed, try again")
 
 
 class BuildComponent():
     def __init__(self, args_parser: ArgumentParser, args=None):
+        self.deploy_success = True
         self.options = args_parser.parse_args(args)
         self.options.build_type = self.options.build_type.capitalize()
         if self.options.channel is None or self.options.channel.strip() == "":
@@ -56,8 +68,9 @@ class BuildComponent():
         os.makedirs(self.rootfs_dir, exist_ok=True)
 
         self.pkg = None
+        self.base_cmd = ""
         self.gen_conaninfo()
-        self.base_cmd = f" --user {self.user} --channel {self.channel}"
+        self.base_cmd += f" --user {self.user} --channel {self.channel}"
         self.base_cmd += f" -pr {self.profile} -s build_type={self.build_type} -r " + self.options.remote
         self.base_cmd += f" -pr:b {self.profile_build}"
         if self.options.cov:
@@ -116,16 +129,26 @@ class BuildComponent():
             "@" + self.user + "/" + self.channel
         # 准备部署依赖
         requires = pkg.get("requires")
+        deps = []
         if requires is not None:
-            for rt in requires.get("test", []):
-                conan = rt.get("conan")
-                if conan is not None:
-                    self.runtime_packages.append(conan)
+            if self.options.test:
+                for rt in requires.get("test", []):
+                    deps.append(rt)
+                    conan = rt.get("conan")
+                    if conan is not None:
+                        self.runtime_packages.append(conan)
             for rt in requires.get("compile", []):
+                deps.append(rt)
                 conan = rt.get("conan")
                 if conan is not None:
                     self.runtime_packages.append(conan)
 
+        for dep in deps:
+            option = dep.get("option", {})
+            conan = dep.get("conan").split("/")[0]
+            for k, v in option.items():
+                self.base_cmd += f" -o {conan}/*:{k}={v}"
+
         # 生成conan构建脚本
         conanfile = os.path.join(cwd, "conanbase.py")
         # 当git未跟踪conanfile.py时生成新的conanfile.py
@@ -171,6 +194,10 @@ class BuildComponent():
         tools.exec(cmd, verbose=True)
         os.chdir(cwd)
 
+    def _copy_failed(self, result):
+        print(result)
+        self.deploy_success = False
+
     def deploy(self):
         log.success(f"start deplay {self.package} and it's dependencies to ./temp/rootfs")
         # 生成部署deploy命令
@@ -193,6 +220,7 @@ class BuildComponent():
         res = tools.run(cmd).stdout.strip()
         graph = json.loads(res)
         nodes = graph.get("graph", {}).get("nodes", {})
+        pool = Pool()
         for id, info in nodes.items():
             ref = info.get("ref")
             id = info.get("package_id")
@@ -200,7 +228,11 @@ class BuildComponent():
             if context != "host":
                 continue
             dep = DeployComponent(ref, id, self.rootfs_dir)
-            dep.run()
+            pool.apply_async(dep.run, error_callback=self._copy_failed)
+        pool.close()
+        pool.join()
+        if not self.deploy_success:
+            raise Exception("Deploy component failed")
 
         # 设置ROOTFS_DIR环境变量，为DT测试提供相对路径
         os.environ["ROOTFS_DIR"] = self.rootfs_dir

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/component/template/conanbase.mako

@@ -45,7 +45,7 @@ class LiteBmcConan(ConanFile):
         "test": [False, True],
 % if len(pkg.get("options", [])) > 0:
     % for op, ctx in pkg["options"].items():
-        "${op}": [${",".join(("\"" + i + "\"") if isinstance(i, str) else str(i) for i in ctx["option"])}],
+        "${op}": [${", ".join(("\"" + i + "\"") if isinstance(i, str) else str(i) for i in ctx["option"])}],
     % endfor
 % endif
     }
@@ -57,7 +57,7 @@ class LiteBmcConan(ConanFile):
         "test": False,
 % if len(pkg.get("options", [])) > 0:
     % for op, ctx in pkg["options"].items():
-        "${op}": ${("\"" + ctx["default"] + "\"") if isinstance(ctx["default"], str) else str(ctx["default"])}
+        "${op}": ${("\"" + ctx["default"] + "\"") if isinstance(ctx["default"], str) else str(ctx["default"])},
     % endfor
 % endif
     }

{lbkit-0.5.11 → lbkit-0.5.13}/lbkit/component/test.py

@@ -33,6 +33,8 @@ class TestComponent():
         for dir in test_src_folder:
             cmd = f"lcov -r  {coverage_dir}/cover.info \"{build_folder}/{dir}/*\" -o {coverage_dir}/cover.info"
             tool.exec(cmd)
+        cmd = f"lcov -r  {coverage_dir}/cover.info \"*/include/*\" -o {coverage_dir}/cover.info"
+        tool.exec(cmd)
         cmd = f"genhtml -o {coverage_dir}/html --legend {coverage_dir}/cover.info"
         tool.exec(cmd)
 

{lbkit-0.5.11 → lbkit-0.5.13/lbkit.egg-info}/PKG-INFO

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

lbkit-0.5.11/lbkit/__init__.py

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