lbkit 0.6.8__tar.gz → 0.7.1__tar.gz

{lbkit-0.6.8/lbkit.egg-info → lbkit-0.7.1}/PKG-INFO

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

lbkit-0.7.1/lbkit/__init__.py

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

{lbkit-0.6.8 → lbkit-0.7.1}/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__=3
+__version__=4
 
 class CodeGen(object):
     def __init__(self, args):

{lbkit-0.6.8 → lbkit-0.7.1}/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}(const ${class_name} *object,
+__attribute__((__deprecated__)) gint ${class_name}_set_${prop.name}(${class_name} object,
     ${", ".join(prop.declare()).replace("<arg_name>", prop.name).replace("<const>", "const ")}, GError **error)
     % else:
-gint ${class_name}_set_${prop.name}(const ${class_name} *object,
+gint ${class_name}_set_${prop.name}(${class_name} object,
     ${", ".join(prop.declare()).replace("<arg_name>", prop.name).replace("<const>", "const ")}, GError **error)
     % endif
 {
@@ -32,10 +32,10 @@ gint ${class_name}_set_${prop.name}(const ${class_name} *object,
 ## 私有或只写属性不允许读
 % if not prop.private and prop.access != "write":
     % if prop.deprecated:
-__attribute__((__deprecated__)) gint ${class_name}_get_${prop.name}(const ${class_name} *object,
+__attribute__((__deprecated__)) gint ${class_name}_get_${prop.name}(${class_name} object,
     ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
     % else:
-gint ${class_name}_get_${prop.name}(const ${class_name} *object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
+gint ${class_name}_get_${prop.name}(${class_name} object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
     % endif
 {
     % if "gsize n_" in prop.declare()[0]:
@@ -80,7 +80,7 @@ gint ${class_name}_get_${prop.name}(const ${class_name} *object, ${", ".join(pro
     % if len(method.parameters.parameters) > 0:
 <% REQ_PARA = f'const {intf.alias}_{method.name}_Req *req, ' %>\
     % endif
-int ${class_name}_Call_${method.name}(const ${class_name} *object,
+int ${class_name}_Call_${method.name}(${class_name} object,
     ${REQ_PARA}${RSP_PARA}gint timeout,
     GError **error)
 {
@@ -115,6 +115,16 @@ 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)
+{
+    LBBase *real = (LBBase *)strstr((const char *)object, LB_MAGIC);
+    if ((gconstpointer)real != (gconstpointer)object) {
+        log_error("Get real object fail, Perhaps the memory has been freed, call abort() now");
+        abort();
+    }
+    return real;
+}
+
 /**
  * @brief 销毁对象
  *
@@ -123,11 +133,11 @@ static LBInterface _${class_name}_interface = {
 static void _${class_name}_destroy(LBO *lb_obj)
 {
     g_assert(lb_obj);
-    ${class_name} *obj = (${class_name} *)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(${class_name}));
+    memset(obj, 0, sizeof(struct _${intf.alias}));
 }
 
 /**
@@ -138,7 +148,7 @@ static void _${class_name}_destroy(LBO *lb_obj)
  */
 static LBO *_${class_name}_create(const gchar *obj_name, gpointer opaque)
 {
-    ${class_name} *obj = g_new0(${class_name}, 1);
+    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);
@@ -182,6 +192,117 @@ ${class_name}_Properties *${class_name}_properties(void)
     return &${properties};
 }
 
+% if codegen_version >= 4:
+${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)
+{
+    LBO *obj = lb_impl._cli_new(&_${class_name}_interface, well_known, obj_name);
+    return (${class_name} )obj;
+}
+
+/* 减对象引用计数 */
+void ${class_name}_unref(${class_name} *obj)
+{
+    lb_impl._unref((LBO **)obj);
+}
+
+/* 加对象引用计数 */
+${class_name} ${class_name}_ref(${class_name} obj)
+{
+    return (${class_name} )lb_impl._ref((LBO *)obj);
+}
+
+/* 设置在位状态 */
+void ${class_name}_present_set(${class_name} obj, gboolean present)
+{
+    lb_impl._present_set((LBO *)obj, present);
+}
+
+/* 获取在位状态 */
+gboolean ${class_name}_present(${class_name} obj)
+{
+    return lb_impl._present((LBO *)obj);
+}
+
+/* 绑定数据 */
+void ${class_name}_bind(${class_name} lb_obj, gpointer data, GDestroyNotify destroy_func)
+{
+    lb_impl._bind((LBO *)lb_obj, data, destroy_func);
+}
+
+/* 获取绑定数据 */
+gpointer ${class_name}_data(${class_name} lb_obj)
+{
+    return lb_impl._data((LBO *)lb_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)
+{
+    return lb_impl._on_prop_changed((LBO *)lb_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)
+{
+    lb_impl._on_prop_changed_cancel((LBO *)lb_obj, prop, (lbo_after_changed_hook)pc, user_data);
+}
+
+/* 对象变更事件 */
+void ${class_name}_on_changed(${class_name}_on_changed_hook cb, gpointer user_data, GDestroyNotify destroy)
+{
+    lb_impl._on_changed(&_${class_name}_interface, (LbObjectHook)cb, user_data, destroy);
+}
+
+/* 注册对象释放回调 */
+void ${class_name}_before_destroy(${class_name} lb_obj, GHookFunc cb, gpointer user_data)
+{
+    lb_impl._before_destroy((LBO *)lb_obj, cb, user_data);
+}
+
+/* 查询第n个对象 */
+${class_name} ${class_name}_nth(int nth)
+{
+    return (${class_name} )lb_impl._nth(&_${class_name}_interface, nth);
+}
+
+/* 查询对象名称 */
+const gchar *${class_name}_name(${class_name} obj)
+{
+    return lbo_name((LBO *)obj);
+}
+
+/* 对象加锁 */
+void ${class_name}_lock(${class_name} obj)
+{
+    lbo_lock((LBO *)obj);
+}
+
+/* 对象解锁 */
+void ${class_name}_unlock(${class_name} obj)
+{
+    lbo_unlock((LBO *)obj);
+}
+
+/* 对象列表查询接口 */
+GSList *${class_name}_list(void)
+{
+    return lb_impl._list(&_${class_name}_interface);
+}
+
+% for prop in intf.properties:
+/* 监听属性${prop.name}变更 */
+void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook)
+{
+    lb_impl._prop_hook(&${properties}.${prop.name}, (const LBPropertyHook *)hook);
+}
+
+% endfor
+% endif
 static void __attribute__((constructor(150))) ${class_name}_register(void)
 {
     // 从公共库中复制信号处理函数

lbkit-0.7.1/lbkit/codegen/template/client.h.mako

@@ -0,0 +1,204 @@
+<% from lbkit.tools import hump2underline %>\
+#ifndef __${"_".join(intf.name.upper().split(".", -1))}_CLI_H__
+#define __${"_".join(intf.name.upper().split(".", -1))}_CLI_H__
+
+#include <glib-2.0/glib.h>
+#include <glib-2.0/gio/gio.h>
+#include "lb_base.h"
+#include "public/${intf.name}.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+<% class_name = intf.alias + "_Cli"%>
+typedef ${intf.alias} ${class_name};
+typedef ${intf.alias}_Properties ${class_name}_Properties;
+
+% for prop in intf.properties:
+% if not prop.private:
+/*
+ * 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 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);
+    % else:
+gint ${class_name}_set_${prop.name}(${class_name} object, ${", ".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);
+    % else:
+gint ${class_name}_get_${prop.name}(${class_name} object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
+    % endif
+% endif
+% endif
+% endfor
+
+% for method in intf.methods:
+<% RSP_PARA = f'' %>\
+<% REQ_PARA = f'' %>\
+    % if len(method.returns.parameters) > 0:
+<% RSP_PARA = f'{intf.alias}_{method.name}_Rsp **rsp, ' %>\
+    % endif
+    % if len(method.parameters.parameters) > 0:
+<% REQ_PARA = f'const {intf.alias}_{method.name}_Req *req, ' %>\
+    % endif
+/*
+ * 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}(${class_name} object,
+    ${REQ_PARA}${RSP_PARA}gint timeout,
+    GError **error);
+    % else:
+int ${class_name}_Call_${method.name}(${class_name} object,
+    ${REQ_PARA}${RSP_PARA}gint timeout,
+    GError **error);
+    % endif
+% endfor
+
+% for signal in intf.signals:
+/*
+ * 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)(${class_name} object, const gchar *destination,
+    const ${intf.alias}_${signal.name}_Msg *req, gpointer user_data);
+/**/
+    % 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);
+    % 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
+    % if signal.deprecated:
+__attribute__((__deprecated__)) void ${class_name}_Unsubscribe_${signal.name}(guint *id);
+    % else:
+void ${class_name}_Unsubscribe_${signal.name}(guint *id);
+    % endif
+
+% endfor
+
+${class_name}_Properties *${class_name}_properties(void);
+LBInterface *${class_name}_interface(void);
+#define ${hump2underline(class_name).upper()}    ${class_name}_interface()
+
+% if codegen_version >= 4:
+/* notes: 对象变更加回调函数 */
+typedef void (*${class_name}_on_changed_hook)(${class_name} lb_obj, gpointer user_data);
+/* notes: 属性变更后回调，远程对象或本地对象变更后都会调用 */
+typedef void (*${class_name}_after_changed_hook)(${class_name} object, 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 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);
+/* 减对象引用计数 */
+void ${class_name}_unref(${class_name} *obj);
+/* 加对象引用计数 */
+${class_name} ${class_name}_ref(${class_name} obj);
+/* 设置在位状态 */
+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);
+/* 获取绑定数据 */
+gpointer ${class_name}_data(${class_name} lb_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);
+/* 取消监听，成功取消监听时会调用监听时设置的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_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);
+/*
+ * 查询第n个对象
+ * @notes: 支持正逆向查询第n个对象，返回的对象需要使用lbo_unref减引用计数
+ *     正向查找传入非负n，以0开始计数，表示查找最早创建的第n个对象;
+ *     逆向查找传入负数n，以-1开始计数，依次为-2、-3等，表示查找最后创建的第n个对象。
+ */
+${class_name} ${class_name}_nth(int nth);
+/* 查询对象名称 */
+const gchar *${class_name}_name(${class_name} obj);
+/* 对象加锁 */
+void ${class_name}_lock(${class_name} obj);
+/* 对象解锁 */
+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);
+% endfor
+
+static inline void ${class_name}_unref_p(${class_name} obj)
+{
+    ${class_name}_unref(&obj);
+}
+
+static inline void _cleanup_${class_name}_(${class_name} *ptr)
+{
+    if (ptr && *ptr) {
+        ${class_name}_unref(ptr);
+    }
+}
+
+static inline void ${class_name}_list_free(GSList **list)
+{
+    g_assert(list);
+    g_slist_free_full(*list, (GDestroyNotify)${class_name}_unref_p);
+    *list = NULL;
+}
+
+static inline void _cleanup_${class_name}_list(GSList **ptr)
+{
+    if (ptr && *ptr) {
+        ${class_name}_list_free(ptr);
+    }
+}
+
+#define cleanup_${class_name} __attribute__((cleanup(_cleanup_${class_name}_)))
+#define cleanup_${class_name}_list __attribute__((cleanup(_cleanup_${class_name}_list)))
+% endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __${"_".join(intf.name.upper().split(".", -1))}_CLI_H__ */

{lbkit-0.6.8 → lbkit-0.7.1}/lbkit/codegen/template/public.c.mako

@@ -83,13 +83,13 @@ static gboolean __attribute__((unused)) _validate_odf_as_dict_${name}_v(yaml_doc
 % endfor
 % for name, stru in intf.structures.items():
 /* ${name}结构体类型序列化（struct转GVariant）函数 */
-GVariant *${name}_encode(const ${name} *value)
+GVariant *${name}_encode(const struct _${name} *value)
 {
     % if stru.values.has_variant_value:
     g_assert(value);
 
     % else:
-    static ${name} default_val;
+    static struct _${name} default_val;
     if (value == NULL) {
         value = &default_val;
     }
@@ -111,11 +111,11 @@ GVariant *${name}_encode(const ${name} *value)
  * ${name}结构体类型反序列化（GVariant转struct）函数，返回以NULL结束的指针数组
  * Note: return an EMPTY ${name} object when `in` is NULL
  */
-${name} *${name}_decode(GVariant *in)
+struct _${name} *${name}_decode(GVariant *in)
 {
     GVariantIter iter;
     __attribute__((unused)) GVariant *tmp = NULL;
-    ${name} *output = g_new0(${name}, 1);
+    struct _${name} *output = g_new0(struct _${name}, 1);
     if (!in) {
         return output;
     }
@@ -133,7 +133,7 @@ ${name} *${name}_decode(GVariant *in)
 }
 
 /* ${name}结构体指针释放 */
-void ${name}_free(${name} **value)
+void ${name}_free(struct _${name} **value)
 {
     if (!value || !(*value)) {
         return;
@@ -145,7 +145,7 @@ void ${name}_free(${name} **value)
 }
 
 /* ${name}结构体指针释放 */
-void ${name}_clean(${name} *value)
+void ${name}_clean(struct _${name} *value)
 {
     if (!value) {
         return;
@@ -159,7 +159,7 @@ void ${name}_clean(${name} *value)
 }
 
 /* ${name}结构体组件类型序列化（struct转GVariant）函数，values以NULL结束的数组 */
-GVariant *${name}_encode_v(${name} * const *values)
+GVariant *${name}_encode_v(struct _${name} * const *values)
 {
     GVariantBuilder builder;
     GVariant *tmp = NULL;
@@ -173,7 +173,7 @@ GVariant *${name}_encode_v(${name} * const *values)
 }
 
 /* ${name}结构体数组类型反序列化（GVariant转struct）函数，返回以NULL结束的指针数组 */
-${name} **${name}_decode_v(GVariant *in)
+struct _${name} **${name}_decode_v(GVariant *in)
 {
     if (!in) {
         return NULL;
@@ -187,7 +187,7 @@ ${name} **${name}_decode_v(GVariant *in)
     if (n == 0) {
         return NULL;
     }
-    ${name} **output = g_new0(${name} *, n + 1);
+    struct _${name} **output = g_new0(struct _${name} *, n + 1);
     for (gsize i = 0; i < n; i++) {
         tmp = g_variant_iter_next_value(&iter);
         output[i] = ${name}_decode(tmp);
@@ -197,7 +197,7 @@ ${name} **${name}_decode_v(GVariant *in)
 }
 
 /* ${name}结构体指针数组释放 */
-void ${name}_free_v(${name} ***value)
+void ${name}_free_v(struct _${name} ***value)
 {
     if(!value || !(*value)) {
         return;
@@ -356,7 +356,7 @@ gboolean _validate_odf_as_enum_${name}(yaml_document_t *doc, yaml_node_t *node,
     if (!valid) {
         return FALSE;
     }
-    const gchar *value = node->data.scalar.value;
+    const gchar *value = (const gchar *)node->data.scalar.value;
     for (int i = 0; i <= ${len(enum.values.parameters)}; i++) {
         if (g_strcmp0(value, ${name}_as_string(i)) == 0) {
             return TRUE;
@@ -843,8 +843,10 @@ static GDBusPropertyInfo ${class_name}_property_${prop.name} =
 
     % endif
 % endfor
+## 只有自动生成工具版本号大于等于3的才会生成get和set方法
+% if codegen_version >= 3:
 % if len(intf.properties):
-LBBase *_get_real_object(const ${class_name} *object)
+static LBBase *_get_real_object(${class_name} object)
 {
     LBBase *real = (LBBase *)strstr((const char *)object, LB_MAGIC);
     if ((gconstpointer)real != (gconstpointer)object) {
@@ -854,13 +856,11 @@ LBBase *_get_real_object(const ${class_name} *object)
     return real;
 }
 % endif
-## 只有自动生成工具版本号大于等于3的才会生成get和set方法
-% if codegen_version >= 3:
 % for prop in intf.properties:
 static void ${class_name}_set_${prop.name}_variant(LBO *object, GVariant *value)
 {
     g_assert(value && object);
-    ${class_name} *real_obj = (${class_name} *)_get_real_object(object);
+    struct _${class_name} *real_obj = (struct _${class_name} *)_get_real_object(object);
     % for line in prop.free_func():
     ${line.replace("<arg_name>", "real_obj->" + prop.name)};
     % endfor
@@ -873,7 +873,7 @@ static GVariant *${class_name}_get_${prop.name}_variant(LBO *object)
 {
     g_assert(object);
     GVariant *out = NULL;
-    ${class_name} *real_obj = (${class_name} *)_get_real_object(object);
+    struct _${class_name} *real_obj = (struct _${class_name} *)_get_real_object(object);
     % for line in prop.encode_func():
     ${line.replace("<arg_out>", "out").replace("n_<arg_name>", "real_obj->n_" + prop.name).replace("<arg_name>", "real_obj->" + prop.name)};
     % endfor
@@ -894,7 +894,7 @@ static ${class_name}_Properties _${class_name}_properties =
         % else:
         .info = NULL, /* load from /usr/share/dbus-1/interfaces/${intf.name} by lb_init */
         % endif
-        .offset = offsetof(${class_name}, ${prop.name}),
+        .offset = offsetof(struct _${class_name}, ${prop.name}),
 % if codegen_version >= 3:
         .flags = ${prop.desc_flags},
         .set = ${class_name}_set_${prop.name}_variant,
@@ -1138,7 +1138,7 @@ 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
-int ${class_name}_${action.name}_run(const ${class_name} *object${REQ_PARA}${RSP_PARA})
+int ${class_name}_${action.name}_run(${class_name} object${REQ_PARA}${RSP_PARA})
 {
     gint result = 0;
     g_mutex_lock(&_${class_name}_${action.name}_lock);

{lbkit-0.6.8 → lbkit-0.7.1}/lbkit/codegen/template/public.h.mako

@@ -38,7 +38,11 @@ typedef enum {
  % endfor
 % endif
  */
+% if name != class_name:
 typedef struct _${name} ${name};
+% else:
+typedef const struct _${name} * ${name};
+% endif
 % endfor
 % for name, enum in intf.enumerations.items():
 /*
@@ -151,18 +155,18 @@ ${name} *${name}_new(void);
 % for name, stru in intf.structures.items():
 /* ${name} structure object */
 /* START: 结构体${name}及其数组类型的序列化、反序列化、释放函数 */
-GVariant *${name}_encode(const ${name} *value);
-${name} *${name}_decode(GVariant *in);
+GVariant *${name}_encode(const struct _${name} *value);
+struct _${name} *${name}_decode(GVariant *in);
 // Clean up the memory of structure and it's all members, `*value` will to NULL
-void ${name}_free(${name} **value);
+void ${name}_free(struct _${name} **value);
 // Clean up the memory of members managed by structure ${name}
-void ${name}_clean(${name} *value);
+void ${name}_clean(struct _${name} *value);
 
-${name} **${name}_decode_v(GVariant *in);
-GVariant *${name}_encode_v(${name} * const *value);
+struct _${name} **${name}_decode_v(GVariant *in);
+GVariant *${name}_encode_v(struct _${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}及其数组类型的序列化、反序列化、释放函数 */
+void ${name}_free_v(struct _${name} ***value);
+/* END: 结构体struct _${name}及其数组类型的序列化、反序列化、释放函数 */
 
 % endfor
 ## 定义枚举编解码函数
@@ -210,7 +214,7 @@ typedef struct {
 } ${class_name}_${method.name}_Rsp;
 
 % if not method.is_plugin:
-typedef int (*${class_name}_${method.name}_Method)(const ${class_name} *object,
+typedef int (*${class_name}_${method.name}_Method)(${class_name} object,
     const ${class_name}_${method.name}_Req *req,
     ${class_name}_${method.name}_Rsp **rsp,
     GError **error, gpointer ext_data);
@@ -252,13 +256,13 @@ typedef struct {
     % if len(action.parameters.parameters) > 0:
 <% REQ_PARA = f', const {class_name}_{action.name}_Req *req' %>\
     % endif
-typedef int (*${class_name}_${action.name}_action)(const ${class_name} *object${REQ_PARA}${RSP_PARA}, gpointer user_data);
+typedef int (*${class_name}_${action.name}_action)(${class_name} object${REQ_PARA}${RSP_PARA}, gpointer user_data);
 
 /* 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);
-int ${class_name}_${action.name}_run(const ${class_name} *object${REQ_PARA}${RSP_PARA});
+int ${class_name}_${action.name}_run(${class_name} object${REQ_PARA}${RSP_PARA});
 
 % endfor
 % endif