lbkit 0.8.0__tar.gz → 0.8.2__tar.gz

{lbkit-0.8.0/lbkit.egg-info → lbkit-0.8.2}/PKG-INFO

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

lbkit-0.8.2/lbkit/__init__.py

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

{lbkit-0.8.0 → lbkit-0.8.2}/lbkit/codegen/codegen.py

@@ -8,7 +8,6 @@ import json
 import yaml
 import argparse
 from lbkit.codegen.idf_interface import IdfInterface
-from lbkit.utils.version import Version, X_VER
 
 from mako.lookup import TemplateLookup
 from lbkit.log import Logger
@@ -21,16 +20,54 @@ log = Logger("codegen")
 
 
 class CodeGenHistory():
-    def __init__(self, lb_base: str, description: str):
+    def __init__(self, lb_base: str, description: str, lb_base_compatible_required: str):
         self.lb_base = lb_base
         self.description = description
+        # lb_base兼容性配置项
+        self.lb_base_compatible_required = lb_base_compatible_required
+
+
+class Version():
+    def __init__(self, ver_str):
+        if not re.match("^([0-9]|([1-9][0-9]*))\\.([0-9]|([1-9][0-9]*))$", ver_str):
+            raise Exception("Version string {ver_str} not match with regex ^([0-9]|([1-9][0-9]*))\\.([0-9]|([1-9][0-9]*))$")
+        self.info: CodeGenHistory = history_versions.get(ver_str)
+        chunks = ver_str.split(".")
+        self.major = int(chunks[0])
+        self.minor = int(chunks[1])
+        self.str = str(self.major) + "." + str(self.minor)
+
+    def bt(self, next_ver):
+        next = Version(next_ver)
+        if self.major > next.major or (self.major == next.major and self.minor > next.minor):
+            return True
+        return False
+
+    def be(self, next_ver):
+        next = Version(next_ver)
+        if self.major > next.major or (self.major == next.major and self.minor >= next.minor):
+            return True
+        return False
+
+    def lt(self, next_ver):
+        next = Version(next_ver)
+        if self.major < next.major or (self.major == next.major and self.minor < next.minor):
+            return True
+        return False
+
+    def le(self, next_ver):
+        next = Version(next_ver)
+        if self.major < next.major or (self.major == next.major and self.minor <= next.minor):
+            return True
+        return False
 
 # 历史自动生成版本号，计划用于用于生成代码稳定性测试
 # TODO： 支持生成代码稳定性测试，确保生成的代码一致性
 history_versions = {
-    "5.0": CodeGenHistory("lb_base/[>=0.8.1 <0.9.0]", "简化接口类名定义;简化枚举变量在接口间传递时的字符串定义")
+    "5.0": CodeGenHistory("lb_base/[>=0.8.1 <0.9.0]", "简化接口类名定义;简化枚举变量在接口间传递时的字符串定义", "0"),
+    "5.1": CodeGenHistory("lb_base/[>=0.8.3 <0.9.0]", "方法和信号添加保留字段用于功能扩展，同时设置请求和响应为空标志位", "8002")
 }
-__version__=Version("5.0")
+__version__=Version("5.1")
 
 
 def version_check(ver_str: str):
@@ -44,10 +81,17 @@ def version_check(ver_str: str):
             log.error(f"    {ver}: {msg}")
         raise Exception(f"Can't found the valid version for {ver_str}")
 
+def codegen_version_max():
+    max_v = __version__
+    for ver_str, _ in history_versions.items():
+        next_ver = Version(ver_str)
+        if next_ver.bt(max_v.str):
+            max_v = next_ver
+    return max_v.str
 
 def codegen_version_arg(parser: argparse.ArgumentParser, default=__version__.str, short_arg="-cv", full_arg="--codegen_version"):
     # 默认的自动生成工具版本号为2
-    help=f'''must less than or equal to {__version__.str}, default: {default}
+    help=f'''must less than or equal to {codegen_version_max()}, default: {default}
 
         codegen versions:
         '''
@@ -67,6 +111,7 @@ class CodeGen(object):
         code_types = ["server", "client", "public"]
         if code_type != "all":
             code_types = [code_type]
+        log.info(f"Codegen version: {self.codegen_version.str}")
         for ct in code_types:
             os.makedirs(os.path.join(directory, ct), exist_ok=True)
             out_file = os.path.join(directory, ct, interface.name + ".xml")
@@ -118,7 +163,9 @@ class CodeGen(object):
                 raise ArgException(f"argument -c/--cdf_file: {args.cdf_file} not exist")
             configs = Helper.read_yaml(args.cdf_file, "codegen", [])
             # 为保障兼容，package.yml未指定版本号的，默认使用2，该版本配套lb_base/0.6.0版本，其LBProperty无set/get成员
-            ver_str = Helper.read_yaml(args.cdf_file, "codegen_version", args.codegen_version)
+            ver_str = os.environ.get("CODEGEN_VERSION")
+            if ver_str is None:
+                ver_str = Helper.read_yaml(args.cdf_file, "codegen_version", args.codegen_version)
             version_check(ver_str)
             self.codegen_version = Version(ver_str)
             for cfg in configs:
@@ -136,15 +183,18 @@ class CodeGen(object):
                 self._gen(file, outdir)
             return
         else:
-            version_check(args.codegen_version)
-            self.codegen_version = Version(args.codegen_version)
+            ver_str = os.environ.get("CODEGEN_VERSION")
+            if ver_str is None:
+                ver_str = args.codegen_version
+            version_check(ver_str)
+            self.codegen_version = Version(ver_str)
 
         intf_file = args.idf_file
         if not intf_file:
             raise ArgException(f"argument error, arguments -c/--cdf_file and -i/--idf_file are not set")
         if not os.path.isfile(intf_file):
             raise ArgException(f"argument -i/--idf_file: {args.idf_file} not exist")
-        if self.codegen_version.bt(__version__.str):
+        if self.codegen_version.bt(codegen_version_max()):
             raise ArgException(f"argument -cv/--codegen_version: validate failed, must less than or equal to {__version__.str}")
         out_dir = os.path.join(os.getcwd(), args.directory)
         if not intf_file.endswith(".yaml"):

{lbkit-0.8.0 → lbkit-0.8.2}/lbkit/codegen/idf_interface.py

@@ -9,7 +9,6 @@ from lbkit.codegen.ctype_defination import CTYPE_OBJS, RefObjArrayValidator, Ref
 from lbkit.misc import load_yml_with_json_schema_validate
 from lbkit.errors import OdfValidateException, LiteBmcException
 from lbkit.helper import SigInvalidException, validate_glib_signature
-from lbkit.utils.version import Version
 
 log = Logger("gen_interface")
 
@@ -36,7 +35,7 @@ class IdfInterfaceBase(Renderer):
         self.description = None
         self.version = None
         self.alias = None
-        self.codegen_version: Version = None
+        self.codegen_version = None
 
 class IdfAnnotation():
     def __init__(self, name, value):
@@ -914,9 +913,9 @@ class IdfStructure(IdfBase):
 
 class IdfPluginAction(IdfMethod):
     def __init__(self, intf: IdfInterfaceBase, method_data):
-        self.is_plugin = True
         self.policy = method_data.get("policy", "continue_always")
         super().__init__(intf, method_data)
+        self.is_plugin = True
 
 
 class IdfEnumeration(IdfBase):
@@ -1035,7 +1034,7 @@ class IdfDictionary():
 
 
 class IdfInterface(IdfInterfaceBase):
-    def __init__(self, lookup, idf_file, codegen_version: Version):
+    def __init__(self, lookup, idf_file, codegen_version):
         if not idf_file.endswith(".yaml") and not idf_file.endswith(".yml"):
             raise IDFException(f"IDF file {idf_file} neither endswith .yaml nor endswith .yml")
         super().__init__()

{lbkit-0.8.0 → lbkit-0.8.2}/lbkit/codegen/template/client.c.mako

@@ -14,10 +14,10 @@ static const ${intf.alias}_Signals *${signal_processer} = NULL;
 ## 私有属性或者只读属性
 % if not prop.private and prop.access != "read":
     % if prop.deprecated:
-__attribute__((__deprecated__)) gint ${class_name}_set_${prop.name}(${class_name} object,
+__deprecated gint ${class_name}_set_${prop.name}(${class_name} obj,
     ${", ".join(prop.declare()).replace("<arg_name>", prop.name).replace("<const>", "const ")}, GError **error)
     % else:
-gint ${class_name}_set_${prop.name}(${class_name} object,
+gint ${class_name}_set_${prop.name}(${class_name} obj,
     ${", ".join(prop.declare()).replace("<arg_name>", prop.name).replace("<const>", "const ")}, GError **error)
     % endif
 {
@@ -25,17 +25,17 @@ gint ${class_name}_set_${prop.name}(${class_name} object,
     % for line in prop.encode_func():
     ${line.replace("<arg_out>", "tmp").replace("n_<arg_name>", "n_" + prop.name).replace("<arg_name>", prop.name)};
     % endfor
-    return lb_impl.write_property((LBO *)object, &${properties}.${prop.name}, tmp, error);
+    return lb_impl.write_property((LBO *)obj, &${properties}.${prop.name}, tmp, error);
 }
 
 % endif
 ## 私有或只写属性不允许读
 % if not prop.private and prop.access != "write":
     % if prop.deprecated:
-__attribute__((__deprecated__)) gint ${class_name}_get_${prop.name}(${class_name} object,
+__deprecated gint ${class_name}_get_${prop.name}(${class_name} obj,
     ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
     % else:
-gint ${class_name}_get_${prop.name}(${class_name} object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
+gint ${class_name}_get_${prop.name}(${class_name} obj, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
     % endif
 {
     % if "gsize n_" in prop.declare()[0]:
@@ -52,7 +52,7 @@ gint ${class_name}_get_${prop.name}(${class_name} object, ${", ".join(prop.out_d
     % endfor
     GVariant *out = NULL;
 
-    gint ret = lb_impl.read_property((LBO *)object, &${properties}.${prop.name}, &out, error);
+    gint ret = lb_impl.read_property((LBO *)obj, &${properties}.${prop.name}, &out, error);
     if (ret == 0 && out) {
     % for line in prop.decode_func():
         ${line.replace("<arg_in>", "tmp_value").replace("<arg_name>", "out")};
@@ -80,7 +80,7 @@ gint ${class_name}_get_${prop.name}(${class_name} object, ${", ".join(prop.out_d
     % if len(method.parameters.parameters) > 0:
 <% REQ_PARA = f'const {intf.alias}_{method.name}_Req *req, ' %>\
     % endif
-int ${class_name}_Call_${method.name}(${class_name} object,
+int ${class_name}_Call_${method.name}(${class_name} obj,
     ${REQ_PARA}${RSP_PARA}gint timeout,
     GError **error)
 {
@@ -88,8 +88,8 @@ int ${class_name}_Call_${method.name}(${class_name} object,
         log_error("Emit method ${method.name} with parameter error, error is NULL");
         return -1;
     }
-    if (object == NULL) {
-        *error = g_error_new(G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Call method ${method.name} with parameter error, object is NULL");
+    if (obj == NULL) {
+        *error = g_error_new(G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Call method ${method.name} with parameter error, obj is NULL");
         return -1;
     }
     % if len(method.returns.parameters) == 0:
@@ -98,12 +98,12 @@ int ${class_name}_Call_${method.name}(${class_name} object,
     % if len(method.parameters.parameters) == 0:
     void *req = NULL;
     % endif
-    return lb_impl.call_method((LBO *)object, (const LBMethod *)&${method_processer}->${method.name},
+    return lb_impl.call_method((LBO *)obj, (const LBMethod *)&${method_processer}->${method.name},
                                  (void *)req, (void **)rsp, timeout, error);
 }
 
 % endfor
-static LBO *_${class_name}_create(const gchar *obj_name, gpointer opaque);
+static LBO *_${class_name}_create(const gchar *name, gpointer opaque);
 static void _${class_name}_destroy(LBO *obj);
 
 static LBInterface _${class_name}_interface = {
@@ -115,10 +115,10 @@ static LBInterface _${class_name}_interface = {
     .interface = NULL, /* load from usr/share/dbus-1/interfaces/${intf.name}.xml by lb_init */
 };
 
-static LBBase *_get_real_object(LBO *object)
+static LBBase *_get_real_object(LBO *obj)
 {
-    LBBase *real = (LBBase *)strstr((const char *)object, LB_MAGIC);
-    if ((gconstpointer)real != (gconstpointer)object) {
+    LBBase *real = (LBBase *)strstr((const char *)obj, LB_MAGIC);
+    if ((gconstpointer)real != (gconstpointer)obj) {
         log_error("Get real object fail, Perhaps the memory has been freed, call abort() now");
         abort();
     }
@@ -128,31 +128,31 @@ static LBBase *_get_real_object(LBO *object)
 /**
  * @brief 销毁对象
  *
- * @param lb_obj 待销毁的对象句柄
+ * @param obj 待销毁的对象句柄
  */
-static void _${class_name}_destroy(LBO *lb_obj)
+static void _${class_name}_destroy(LBO *obj)
 {
-    g_assert(lb_obj);
-    struct _${intf.alias} *obj = (struct _${intf.alias} *)_get_real_object(lb_obj);
-    g_rec_mutex_clear(obj->_base.lock);
-    g_free(obj->_base.lock);
-    ${intf.alias}_clean(obj);
-    memset(obj, 0, sizeof(struct _${intf.alias}));
+    g_assert(obj);
+    struct _${intf.alias} *real_obj = (struct _${intf.alias} *)_get_real_object(obj);
+    g_rec_mutex_clear(real_obj->_base.lock);
+    g_free(real_obj->_base.lock);
+    ${intf.alias}_clean(real_obj);
+    memset(real_obj, 0, sizeof(struct _${intf.alias}));
 }
 
 /**
  * @brief 分配对象
  *
- * @param obj_name 对象名，需要由调用者分配内存
+ * @param name 对象名，需要由调用者分配内存
  * @param opaque 上层应用需要写入对象的用户数据，由上层应用使用
  */
-static LBO *_${class_name}_create(const gchar *obj_name, gpointer opaque)
+static LBO *_${class_name}_create(const gchar *name, gpointer opaque)
 {
     struct _${intf.alias} *obj = g_new0(struct _${intf.alias}, 1);
     memcpy(obj->_base.magic, LB_MAGIC, strlen(LB_MAGIC) + 1);
     obj->_base.lock = g_new0(GRecMutex, 1);
     g_rec_mutex_init(obj->_base.lock);
-    obj->_base.name = obj_name;
+    obj->_base.name = name;
     obj->_base.intf = &_${class_name}_interface;
     obj->_base.opaque = opaque;
     return (LBO *)obj;
@@ -160,10 +160,18 @@ static LBO *_${class_name}_create(const gchar *obj_name, gpointer opaque)
 
 % for signal in intf.signals:
 % if signal.deprecated:
-__attribute__((__deprecated__)) guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Signal handler,
+    % if codegen_version.be("5.1"):
+__deprecated guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Callback handler,
+    % else:
+__deprecated guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Signal handler,
+    % endif
     const gchar *bus_name, const gchar *object_path, const gchar *arg0, gpointer user_data)
 % else:
+    % if codegen_version.be("5.1"):
+guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Callback handler,
+    % else:
 guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Signal handler,
+    % endif
     const gchar *bus_name, const gchar *object_path, const gchar *arg0, gpointer user_data)
 % endif
 {
@@ -173,7 +181,7 @@ guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Signal
 }
 
 % if signal.deprecated:
-__attribute__((__deprecated__)) void ${class_name}_Unsubscribe_${signal.name}(guint *id)
+__deprecated void ${class_name}_Unsubscribe_${signal.name}(guint *id)
 % else:
 void ${class_name}_Unsubscribe_${signal.name}(guint *id)
 % endif
@@ -198,9 +206,9 @@ ${class_name} ${class_name}_get(const gchar *well_known, const gchar *name)
     return lb_impl._cli_get(&_${class_name}_interface, well_known, name);
 }
 
-${class_name} ${class_name}_new(const gchar *well_known, const gchar *obj_name)
+${class_name} ${class_name}_new(const gchar *well_known, const gchar *name)
 {
-    LBO *obj = lb_impl._cli_new(&_${class_name}_interface, well_known, obj_name);
+    LBO *obj = lb_impl._cli_new(&_${class_name}_interface, well_known, name);
     return (${class_name} )obj;
 }
 
@@ -229,27 +237,27 @@ gboolean ${class_name}_present(${class_name} obj)
 }
 
 /* 绑定数据 */
-void ${class_name}_bind(${class_name} lb_obj, gpointer data, GDestroyNotify destroy_func)
+void ${class_name}_bind(${class_name} obj, gpointer data, GDestroyNotify destroy_func)
 {
-    lb_impl._bind((LBO *)lb_obj, data, destroy_func);
+    lb_impl._bind((LBO *)obj, data, destroy_func);
 }
 
 /* 获取绑定数据 */
-gpointer ${class_name}_data(${class_name} lb_obj)
+gpointer ${class_name}_data(${class_name} obj)
 {
-    return lb_impl._data((LBO *)lb_obj);
+    return lb_impl._data((LBO *)obj);
 }
 
 /* @notes 属性对象属性值变更(后)事件 */
-gint ${class_name}_on_prop_changed(${class_name} lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gpointer user_data, GDestroyNotify destroy)
+gint ${class_name}_on_prop_changed(${class_name} obj, const gchar *prop, ${class_name}_after_changed_hook pc, gpointer user_data, GDestroyNotify destroy)
 {
-    return lb_impl._on_prop_changed((LBO *)lb_obj, prop, (lbo_after_changed_hook)pc, user_data, destroy);
+    return lb_impl._on_prop_changed((LBO *)obj, prop, (lbo_after_changed_hook)pc, user_data, destroy);
 }
 
 /* 取消监听，成功取消监听时会调用监听时设置的destroy回调清除注册时的user_data */
-void ${class_name}_on_prop_changed_cancel(${class_name} lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gconstpointer user_data)
+void ${class_name}_on_prop_changed_cancel(${class_name} obj, const gchar *prop, ${class_name}_after_changed_hook pc, gconstpointer user_data)
 {
-    lb_impl._on_prop_changed_cancel((LBO *)lb_obj, prop, (lbo_after_changed_hook)pc, user_data);
+    lb_impl._on_prop_changed_cancel((LBO *)obj, prop, (lbo_after_changed_hook)pc, user_data);
 }
 
 /* 对象变更事件 */
@@ -259,9 +267,9 @@ void ${class_name}_on_changed(${class_name}_on_changed_hook cb, gpointer user_da
 }
 
 /* 注册对象释放回调 */
-void ${class_name}_before_destroy(${class_name} lb_obj, GHookFunc cb, gpointer user_data)
+void ${class_name}_before_destroy(${class_name} obj, GHookFunc cb, gpointer user_data)
 {
-    lb_impl._before_destroy((LBO *)lb_obj, cb, user_data);
+    lb_impl._before_destroy((LBO *)obj, cb, user_data);
 }
 
 /* 查询第n个对象 */
@@ -296,14 +304,18 @@ GSList *${class_name}_list(void)
 
 % for prop in intf.properties:
 /* 监听属性${prop.name}变更 */
-void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook)
+void ${class_name}_${prop.name}_hook(${class_name}_after_changed_hook after, gpointer user_data)
 {
-    lb_impl._prop_hook(&${properties}.${prop.name}, (const LBPropertyHook *)hook);
+    LBPropertyHook hook = {
+        .after = (lbo_after_changed_hook)after,
+        .user_data = user_data
+    };
+    lb_impl._prop_hook(&${properties}.${prop.name}, &hook);
 }
 
 % endfor
 % endif
-static void __attribute__((constructor(150))) ${class_name}_register(void)
+static void __constructor(150) ${class_name}_register(void)
 {
     // 从公共库中复制信号处理函数
     ${signal_processer} = ${intf.alias}_signals();

{lbkit-0.8.0 → lbkit-0.8.2}/lbkit/codegen/template/client.h.mako

@@ -30,16 +30,16 @@ typedef ${intf.alias}_Properties ${class_name}_Properties;
 ## 私有属性或者只读属性不允许写
 % if not prop.private and prop.access != "read":
     % if prop.deprecated:
-__attribute__((__deprecated__)) gint ${class_name}_set_${prop.name}(${class_name} object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")}, GError **error);
+__deprecated gint ${class_name}_set_${prop.name}(${class_name} obj, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")}, GError **error);
     % else:
-gint ${class_name}_set_${prop.name}(${class_name} object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")}, GError **error);
+gint ${class_name}_set_${prop.name}(${class_name} obj, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")}, GError **error);
     % endif
 % endif
 % if not prop.private and prop.access != "write":
     % if prop.deprecated:
-__attribute__((__deprecated__)) gint ${class_name}_get_${prop.name}(${class_name} object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
+__deprecated gint ${class_name}_get_${prop.name}(${class_name} obj, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
     % else:
-gint ${class_name}_get_${prop.name}(${class_name} object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
+gint ${class_name}_get_${prop.name}(${class_name} obj, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
     % endif
 % endif
 % endif
@@ -66,11 +66,11 @@ gint ${class_name}_get_${prop.name}(${class_name} object, ${", ".join(prop.out_d
 % endif
  */
     % if method.deprecated:
-__attribute__((__deprecated__)) int ${class_name}_Call_${method.name}(${class_name} object,
+__deprecated int ${class_name}_Call_${method.name}(${class_name} obj,
     ${REQ_PARA}${RSP_PARA}gint timeout,
     GError **error);
     % else:
-int ${class_name}_Call_${method.name}(${class_name} object,
+int ${class_name}_Call_${method.name}(${class_name} obj,
     ${REQ_PARA}${RSP_PARA}gint timeout,
     GError **error);
     % endif
@@ -88,18 +88,33 @@ int ${class_name}_Call_${method.name}(${class_name} object,
  % endfor
 % endif
  */
-typedef void (*${class_name}_${signal.name}_Signal)(${class_name} object, const gchar *destination,
+    % if codegen_version.be("5.1"):
+typedef void (*${class_name}_${signal.name}_Callback)(${class_name} obj, const gchar *destination,
+    const ${intf.alias}_${signal.name}_Msg *req, gpointer user_data, const LBSignalExtData *ext_data);
+    % else:
+typedef void (*${class_name}_${signal.name}_Signal)(${class_name} obj, const gchar *destination,
     const ${intf.alias}_${signal.name}_Msg *req, gpointer user_data);
+    % endif
 /**/
-    % if signal.deprecated:
-__attribute__((__deprecated__)) guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Signal handler,
+    % if codegen_version.be("5.1"):
+        % if signal.deprecated:
+__deprecated guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Callback handler,
     const gchar *bus_name, const gchar *object_path, const gchar *arg0, gpointer user_data);
+        % else:
+guint ${class_name}_Subscribe_${signal.name}(${class_name}_${signal.name}_Callback handler,
+    const gchar *bus_name, const gchar *object_path, const gchar *arg0, gpointer user_data);
+        % endif
     % else:
+        % if signal.deprecated:
+__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);
+        % else:
 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);
+        % endif
     % endif
     % if signal.deprecated:
-__attribute__((__deprecated__)) void ${class_name}_Unsubscribe_${signal.name}(guint *id);
+__deprecated void ${class_name}_Unsubscribe_${signal.name}(guint *id);
     % else:
 void ${class_name}_Unsubscribe_${signal.name}(guint *id);
     % endif
@@ -112,22 +127,16 @@ LBInterface *${class_name}_interface(void);
 
 % if codegen_version.be("4.0"):
 /* notes: 对象变更加回调函数 */
-typedef void (*${class_name}_on_changed_hook)(${class_name} lb_obj, gpointer user_data);
+typedef void (*${class_name}_on_changed_hook)(${class_name} obj, gpointer user_data);
 /* notes: 属性变更后回调，远程对象或本地对象变更后都会调用 */
-typedef void (*${class_name}_after_changed_hook)(${class_name} object, const LBProperty *prop, GVariant *value, gpointer user_data);
+typedef void (*${class_name}_after_changed_hook)(${class_name} obj, const LBProperty *prop, GVariant *value, gpointer user_data);
 /* notes: 属性变更前回调，返回-1表示阻止值变更，一般用于值合法性校验，只在被远程操作时才会生效，本地变更值不会回调 */
-typedef gint (*${class_name}_before_change_hook)(${class_name} object, const LBProperty *prop, GVariant *value, gpointer user_data, GError **error);
+typedef gint (*${class_name}_before_change_hook)(${class_name} obj, const LBProperty *prop, GVariant *value, gpointer user_data, GError **error);
 
-/* 属性值变更回调钩子 */
-typedef struct {
-    ${class_name}_after_changed_hook after; /* 属性变更(写入对象数据区后)后回调函数 */
-    ${class_name}_before_change_hook before; /* 属性变更前回调函数，返回0后继续调用，返回非0时中止，所有before都成功时执行属性变更 */
-    gpointer user_data;
-} ${class_name}_property_hook;
 /* 查询对象 */
 ${class_name} ${class_name}_get(const gchar *well_known, const gchar *name);
 /* 创建对象 */
-${class_name} ${class_name}_new(const gchar *well_known, const gchar *obj_name);
+${class_name} ${class_name}_new(const gchar *well_known, const gchar *name);
 /* 减对象引用计数 */
 void ${class_name}_unref(${class_name} *obj);
 /* 加对象引用计数 */
@@ -137,17 +146,17 @@ void ${class_name}_present_set(${class_name} obj, gboolean present);
 /* 获取在位状态 */
 gboolean ${class_name}_present(${class_name} obj);
 /* 绑定数据 */
-void ${class_name}_bind(${class_name} lb_obj, gpointer data, GDestroyNotify destroy_func);
+void ${class_name}_bind(${class_name} obj, gpointer data, GDestroyNotify destroy_func);
 /* 获取绑定数据 */
-gpointer ${class_name}_data(${class_name} lb_obj);
+gpointer ${class_name}_data(${class_name} obj);
 /* @notes 属性对象属性值变更(后)事件 */
-gint ${class_name}_on_prop_changed(${class_name} lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gpointer user_data, GDestroyNotify destroy);
+gint ${class_name}_on_prop_changed(${class_name} obj, const gchar *prop, ${class_name}_after_changed_hook pc, gpointer user_data, GDestroyNotify destroy);
 /* 取消监听，成功取消监听时会调用监听时设置的destroy回调清除注册时的user_data */
-void ${class_name}_on_prop_changed_cancel(${class_name} lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gconstpointer user_data);
+void ${class_name}_on_prop_changed_cancel(${class_name} obj, const gchar *prop, ${class_name}_after_changed_hook pc, gconstpointer user_data);
 /* 对象变更事件 */
 void ${class_name}_on_changed(${class_name}_on_changed_hook cb, gpointer user_data, GDestroyNotify destroy);
 /* 注册对象释放回调 */
-void ${class_name}_before_destroy(${class_name} lb_obj, GHookFunc cb, gpointer user_data);
+void ${class_name}_before_destroy(${class_name} obj, GHookFunc cb, gpointer user_data);
 /*
  * 查询第n个对象
  * @notes: 支持正逆向查询第n个对象，返回的对象需要使用lbo_unref减引用计数
@@ -165,7 +174,7 @@ void ${class_name}_unlock(${class_name} obj);
 GSList *${class_name}_list(void);
 /* 监听属性 */
 % for prop in intf.properties:
-void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook);
+void ${class_name}_${prop.name}_hook(${class_name}_after_changed_hook after, gpointer user_data);
 % endfor
 
 static inline void ${class_name}_unref_p(${class_name} obj)