5:59 a.m.
Constify method tables with the following commands:
find . -name '*.[ch]' -exec sed -i \
's/\(c\)\(GDBusSignalTable .* =\)/\1 const \2/g' {} \;
find . -name '*.[ch]' -exec sed -i \
's/\(c\)\(GDBusMethodTable .* =\)/\1 const \2/g' {} \;
---
plugins/ofono.c | 2 +-
src/service.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/plugins/ofono.c b/plugins/ofono.c
index f598c5e..29e8f06 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -114,7 +114,7 @@ static DBusMessage *agent_release(DBusConnection *conn,
return NULL;
}
-static GDBusMethodTable agent_methods[] = {
+static const GDBusMethodTable agent_methods[] = {
{ "ReceiveNotification", "aya{sv}", "", agent_receive },
{ "Release", "", "", agent_release,
G_DBUS_METHOD_FLAG_NOREPLY },
diff --git a/src/service.c b/src/service.c
index 6bcdede..a269556 100644
--- a/src/service.c
+++ b/src/service.c
@@ -222,13 +222,13 @@ static DBusMessage *msg_mark_read(DBusConnection *conn,
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static GDBusMethodTable message_methods[] = {
+static const GDBusMethodTable message_methods[] = {
{ "MarkRead", "", "", msg_mark_read },
{ "Delete", "", "", msg_delete },
{ }
};
-static GDBusSignalTable message_signals[] = {
+static const GDBusSignalTable message_signals[] = {
{ "PropertyChanged", "sv" },
{ }
};
@@ -979,14 +979,14 @@ release_msg:
return __mms_error_trans_failure(dbus_msg);
}
-static GDBusMethodTable service_methods[] = {
+static const GDBusMethodTable service_methods[] = {
{ "SendMessage", "assa(sss)", "o", send_message },
{ "GetMessages", "", "a(oa{sv})", get_messages },
{ "GetConversation", "su", "a(oa{sv})", get_conversation
},
{ }
};
-static GDBusSignalTable service_signals[] = {
+static const GDBusSignalTable service_signals[] = {
{ "MessageAdded", "oa{sv}" },
{ "MessageRemoved", "o" },
{ }
@@ -2342,12 +2342,12 @@ static DBusMessage *get_services(DBusConnection *conn,
return reply;
}
-static GDBusMethodTable manager_methods[] = {
+static const GDBusMethodTable manager_methods[] = {
{ "GetServices", "", "a(oa{sv})", get_services },
{ }
};
-static GDBusSignalTable manager_signals[] = {
+static const GDBusSignalTable manager_signals[] = {
{ "ServiceAdded", "oa{sv}" },
{ "ServiceRemoved", "o" },
{ }
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 02/12] gdbus: add argument info to methods and signals
---
gdbus/gdbus.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h
index a0583e6..e5e7938 100644
--- a/gdbus/gdbus.h
+++ b/gdbus/gdbus.h
@@ -85,16 +85,24 @@ typedef enum {
typedef struct {
const char *name;
const char *signature;
+} GDBusArgInfo;
+
+typedef struct {
+ const char *name;
+ const char *signature;
const char *reply;
GDBusMethodFunction function;
GDBusMethodFlags flags;
unsigned int privilege;
+ const GDBusArgInfo *in_args;
+ const GDBusArgInfo *out_args;
} GDBusMethodTable;
typedef struct {
const char *name;
const char *signature;
GDBusSignalFlags flags;
+ const GDBusArgInfo *args;
} GDBusSignalTable;
typedef struct {
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 03/12] gdbus: add and use helpers for table declarations
---
gdbus/gdbus.h | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
gdbus/object.c | 3 +-
2 files changed, 88 insertions(+), 1 deletion(-)
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h
index e5e7938..8354633 100644
--- a/gdbus/gdbus.h
+++ b/gdbus/gdbus.h
@@ -118,6 +118,92 @@ typedef struct {
GDBusSecurityFunction function;
} GDBusSecurityTable;
+#define GDBUS_ARGS(args...) (const GDBusArgInfo[]) { args, { } }
+
+#define _GDBUS_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
+ .name = _name, \
+ .signature = _signature, \
+ .reply = _reply, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function
+
+#define _GDBUS_ASYNC_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
+ .name = _name, \
+ .signature = _signature, \
+ .reply = _reply, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function, \
+ .flags = G_DBUS_METHOD_FLAG_ASYNC
+
+#define _GDBUS_DEPRECATED_METHOD(_name, _signature, _reply, _in_args, _out_args,
_function) \
+ .name = _name, \
+ .signature = _signature, \
+ .reply = _reply, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function, \
+ .flags = G_DBUS_METHOD_FLAG_DEPRECATED
+
+#define _GDBUS_DEPRECATED_ASYNC_METHOD(_name, _signature, _reply, _in_args, _out_args,
_function) \
+ .name = _name, \
+ .signature = _signature, \
+ .reply = _reply, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function, \
+ .flags = G_DBUS_METHOD_FLAG_ASYNC | G_DBUS_METHOD_FLAG_DEPRECATED
+
+#define _GDBUS_SIGNAL(_name, _signature, _args) \
+ .name = _name, \
+ .signature = _signature, \
+ .args = _args
+
+#define _GDBUS_DEPRECATED_SIGNAL(_name, _signature, _args) \
+ .name = _name, \
+ .signature = _signature, \
+ .args = _args, \
+ .flags = G_DBUS_SIGNAL_FLAG_DEPRECATED
+
+/* Helpers with no signature and reply */
+
+#define GDBUS_METHOD(_name, _in_args, _out_args, _function) \
+ .name = _name, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function
+
+#define GDBUS_ASYNC_METHOD(_name, _in_args, _out_args, _function) \
+ .name = _name, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function, \
+ .flags = G_DBUS_METHOD_FLAG_ASYNC
+
+#define GDBUS_DEPRECATED_METHOD(_name, _in_args, _out_args, _function) \
+ .name = _name, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function, \
+ .flags = G_DBUS_METHOD_FLAG_DEPRECATED
+
+#define GDBUS_DEPRECATED_ASYNC_METHOD(_name, _in_args, _out_args, _function) \
+ .name = _name, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function, \
+ .flags = G_DBUS_METHOD_FLAG_ASYNC | G_DBUS_METHOD_FLAG_DEPRECATED
+
+#define GDBUS_SIGNAL(_name, _args) \
+ .name = _name, \
+ .args = _args
+
+#define GDBUS_DEPRECATED_SIGNAL(_name, _args) \
+ .name = _name, \
+ .args = _args, \
+ .flags = G_DBUS_SIGNAL_FLAG_DEPRECATED
+
gboolean g_dbus_register_interface(DBusConnection *connection,
const char *path, const char *name,
const GDBusMethodTable *methods,
diff --git a/gdbus/object.c b/gdbus/object.c
index 0ef6c80..2ddc574 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -497,7 +497,8 @@ done:
}
static const GDBusMethodTable introspect_methods[] = {
- { "Introspect", "", "s", introspect },
+ { _GDBUS_METHOD("Introspect", "", "s", NULL,
+ GDBUS_ARGS({ "xml", "s" }), introspect) },
{ }
};
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 04/12] gdbus: add macro for methods marked as NOREPLY
---
gdbus/gdbus.h | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h
index 8354633..868c8d5 100644
--- a/gdbus/gdbus.h
+++ b/gdbus/gdbus.h
@@ -155,6 +155,15 @@ typedef struct {
.function = _function, \
.flags = G_DBUS_METHOD_FLAG_ASYNC | G_DBUS_METHOD_FLAG_DEPRECATED
+#define _GDBUS_NOREPLY_METHOD(_name, _signature, _reply, _in_args, _out_args, _function)
\
+ .name = _name, \
+ .signature = _signature, \
+ .reply = _reply, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function, \
+ .flags = G_DBUS_METHOD_FLAG_NOREPLY
+
#define _GDBUS_SIGNAL(_name, _signature, _args) \
.name = _name, \
.signature = _signature, \
@@ -195,6 +204,13 @@ typedef struct {
.function = _function, \
.flags = G_DBUS_METHOD_FLAG_ASYNC | G_DBUS_METHOD_FLAG_DEPRECATED
+#define GDBUS_NOREPLY_METHOD(_name, _in_args, _out_args, _function) \
+ .name = _name, \
+ .in_args = _in_args, \
+ .out_args = _out_args, \
+ .function = _function, \
+ .flags = G_DBUS_METHOD_FLAG_NOREPLY
+
#define GDBUS_SIGNAL(_name, _args) \
.name = _name, \
.args = _args
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 05/12] Convert GDBus methods to use macro helpers
With these macro helpers we can separate in/out arguments and use their
own vector.
---
plugins/ofono.c | 8 +++++---
src/service.c | 40 +++++++++++++++++++++++++++++-----------
2 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/plugins/ofono.c b/plugins/ofono.c
index 29e8f06..fcdb228 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -115,9 +115,11 @@ static DBusMessage *agent_release(DBusConnection *conn,
}
static const GDBusMethodTable agent_methods[] = {
- { "ReceiveNotification", "aya{sv}", "", agent_receive },
- { "Release", "", "", agent_release,
- G_DBUS_METHOD_FLAG_NOREPLY },
+ { _GDBUS_METHOD("ReceiveNotification", "aya{sv}", "",
+ GDBUS_ARGS({ "notification", "ay" },
+ { "info", "a{sv}" }),
+ NULL, agent_receive) },
+ { _GDBUS_NOREPLY_METHOD("Release", "", "", NULL, NULL,
agent_release) },
{ }
};
diff --git a/src/service.c b/src/service.c
index a269556..669d10e 100644
--- a/src/service.c
+++ b/src/service.c
@@ -223,13 +223,14 @@ static DBusMessage *msg_mark_read(DBusConnection *conn,
}
static const GDBusMethodTable message_methods[] = {
- { "MarkRead", "", "", msg_mark_read },
- { "Delete", "", "", msg_delete },
+ { _GDBUS_METHOD("MarkRead", "", "", NULL, NULL,
msg_mark_read) },
+ { _GDBUS_METHOD("Delete", "", "", NULL, NULL, msg_delete)
},
{ }
};
static const GDBusSignalTable message_signals[] = {
- { "PropertyChanged", "sv" },
+ { _GDBUS_SIGNAL("PropertyChanged", "sv",
+ GDBUS_ARGS({ "name", "s" }, { "value", "v" }))
},
{ }
};
@@ -980,15 +981,27 @@ release_msg:
}
static const GDBusMethodTable service_methods[] = {
- { "SendMessage", "assa(sss)", "o", send_message },
- { "GetMessages", "", "a(oa{sv})", get_messages },
- { "GetConversation", "su", "a(oa{sv})", get_conversation
},
+ { _GDBUS_METHOD("SendMessage", "assa(sss)", "o",
+ GDBUS_ARGS({ "recipients", "as" }, { "smil",
"s" },
+ { "attachments", "a(sss)" }),
+ GDBUS_ARGS({ "path", "o" }),
+ send_message) },
+ { _GDBUS_METHOD("GetMessages", "", "a(oa{sv})",
+ NULL,
+ GDBUS_ARGS({ "messages_with_properties", "a(oa{sv})" }),
+ get_messages) },
+ { _GDBUS_METHOD("GetConversation", "su", "a(oa{sv})",
+ GDBUS_ARGS({ "number", "s" }, { "count", "s"
}),
+ GDBUS_ARGS({ "messages_with_properties", "a(oa{sv}" }),
+ get_conversation) },
{ }
};
static const GDBusSignalTable service_signals[] = {
- { "MessageAdded", "oa{sv}" },
- { "MessageRemoved", "o" },
+ { _GDBUS_SIGNAL("MessageAdded", "oa{sv}",
+ GDBUS_ARGS({ "path", "o" },
+ { "properties", "a{sv}" })) },
+ { _GDBUS_SIGNAL("MessageRemoved", "o", GDBUS_ARGS({
"path", "o" })) },
{ }
};
@@ -2343,13 +2356,18 @@ static DBusMessage *get_services(DBusConnection *conn,
}
static const GDBusMethodTable manager_methods[] = {
- { "GetServices", "", "a(oa{sv})", get_services },
+ { _GDBUS_METHOD("GetServices", "", "a(oa{sv})",
+ NULL,
+ GDBUS_ARGS({ "services_with_properties", "a(oa{sv})" }),
+ get_services) },
{ }
};
static const GDBusSignalTable manager_signals[] = {
- { "ServiceAdded", "oa{sv}" },
- { "ServiceRemoved", "o" },
+ { _GDBUS_SIGNAL("ServiceAdded", "oa{sv}",
+ GDBUS_ARGS({ "path", "o" },
+ { "properties", "a{sv}" })) },
+ { _GDBUS_SIGNAL("ServiceRemoved", "o", GDBUS_ARGS({
"path", "o" })) },
{ }
};
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 06/12] gdbus: use GDBusArgInfo to generate introspection
By using GDBusArgInfo in methods and signals, the introspection
generation is much simpler and we can add each argument name.
---
gdbus/object.c | 75 +++++++++++---------------------------------------------
1 file changed, 14 insertions(+), 61 deletions(-)
diff --git a/gdbus/object.c b/gdbus/object.c
index 2ddc574..3ac6a0b 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -59,68 +59,20 @@ struct security_data {
void *iface_user_data;
};
-static void print_arguments(GString *gstr, const char *sig,
+static void print_arguments(GString *gstr, const GDBusArgInfo *args,
const char *direction)
{
- int i;
-
- for (i = 0; sig[i]; i++) {
- char type[32];
- int struct_level, dict_level;
- unsigned int len;
- gboolean complete;
-
- complete = FALSE;
- struct_level = dict_level = 0;
-
- /* Gather enough data to have a single complete type */
- for (len = 0; len < (sizeof(type) - 1) && sig[i]; len++, i++) {
- switch (sig[i]) {
- case '(':
- struct_level++;
- break;
- case ')':
- struct_level--;
- if (struct_level <= 0 && dict_level <= 0)
- complete = TRUE;
- break;
- case '{':
- dict_level++;
- break;
- case '}':
- dict_level--;
- if (struct_level <= 0 && dict_level <= 0)
- complete = TRUE;
- break;
- case 'a':
- break;
- default:
- if (struct_level <= 0 && dict_level <= 0)
- complete = TRUE;
- break;
- }
-
- type[len] = sig[i];
-
- if (complete)
- break;
- }
-
- type[len + 1] = '\0';
-
- if (!complete) {
- error("Unexpected signature: %s", sig);
- return;
- }
+ for (; args && args->name; args++) {
+ g_string_append_printf(gstr,
+ "\t\t\t<arg name=\"%s\" type=\"%s\"",
+ args->name, args->signature);
if (direction)
g_string_append_printf(gstr,
- "\t\t\t<arg type=\"%s\" direction=\"%s\"/>\n",
- type, direction);
+ " direction=\"%s\"/>\n", direction);
else
- g_string_append_printf(gstr,
- "\t\t\t<arg type=\"%s\"/>\n",
- type);
+ g_string_append_printf(gstr, "/>\n");
+
}
}
@@ -130,26 +82,27 @@ static void generate_interface_xml(GString *gstr, struct
interface_data *iface)
const GDBusSignalTable *signal;
for (method = iface->methods; method && method->name; method++) {
- if (!strlen(method->signature) && !strlen(method->reply))
+ if (!(method->in_args && method->in_args->name) &&
+ !(method->out_args && method->out_args->name))
g_string_append_printf(gstr, "\t\t<method name=\"%s\"/>\n",
method->name);
else {
g_string_append_printf(gstr, "\t\t<method name=\"%s\">\n",
method->name);
- print_arguments(gstr, method->signature, "in");
- print_arguments(gstr, method->reply, "out");
+ print_arguments(gstr, method->in_args, "in");
+ print_arguments(gstr, method->out_args, "out");
g_string_append_printf(gstr, "\t\t</method>\n");
}
}
for (signal = iface->signals; signal && signal->name; signal++) {
- if (!strlen(signal->signature))
+ if (!(signal->args && signal->args->name))
g_string_append_printf(gstr, "\t\t<signal name=\"%s\"/>\n",
signal->name);
else {
g_string_append_printf(gstr, "\t\t<signal name=\"%s\">\n",
signal->name);
- print_arguments(gstr, signal->signature, NULL);
+ print_arguments(gstr, signal->args, NULL);
g_string_append_printf(gstr, "\t\t</signal>\n");
}
}
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 07/12] gdbus: loop over args to check message signature
---
gdbus/object.c | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/gdbus/object.c b/gdbus/object.c
index 3ac6a0b..b187bb5 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -374,6 +374,27 @@ static struct interface_data *find_interface(GSList *interfaces,
return NULL;
}
+static gboolean g_dbus_args_have_signature(const GDBusArgInfo *args,
+ DBusMessage *message)
+{
+ const char *sig = dbus_message_get_signature(message);
+ const char *p = NULL;
+
+ for (; args && args->signature && *sig; args++) {
+ p = args->signature;
+
+ for (; *sig && *p; sig++, p++) {
+ if (*p != *sig)
+ return FALSE;
+ }
+ }
+
+ if (*sig || (p && *p) || (args && args->signature))
+ return FALSE;
+
+ return TRUE;
+}
+
static DBusHandlerResult generic_message(DBusConnection *connection,
DBusMessage *message, void *user_data)
{
@@ -394,8 +415,8 @@ static DBusHandlerResult generic_message(DBusConnection *connection,
method->name) == FALSE)
continue;
- if (dbus_message_has_signature(message,
- method->signature) == FALSE)
+ if (g_dbus_args_have_signature(method->in_args,
+ message) == FALSE)
continue;
if (check_privilege(connection, message, method,
@@ -552,7 +573,7 @@ static void object_path_unref(DBusConnection *connection, const char
*path)
static gboolean check_signal(DBusConnection *conn, const char *path,
const char *interface, const char *name,
- const char **args)
+ const GDBusArgInfo **args)
{
struct generic_data *data = NULL;
struct interface_data *iface;
@@ -575,7 +596,7 @@ static gboolean check_signal(DBusConnection *conn, const char *path,
for (signal = iface->signals; signal && signal->name; signal++) {
if (!strcmp(signal->name, name)) {
- *args = signal->signature;
+ *args = signal->args;
break;
}
}
@@ -597,7 +618,7 @@ static dbus_bool_t emit_signal_valist(DBusConnection *conn,
{
DBusMessage *signal;
dbus_bool_t ret;
- const char *signature, *args;
+ const GDBusArgInfo *args;
if (!check_signal(conn, path, interface, name, &args))
return FALSE;
@@ -612,8 +633,7 @@ static dbus_bool_t emit_signal_valist(DBusConnection *conn,
if (!ret)
goto fail;
- signature = dbus_message_get_signature(signal);
- if (strcmp(args, signature) != 0) {
+ if (g_dbus_args_have_signature(args, signal) == FALSE) {
error("%s.%s: expected signature'%s' but got '%s'",
interface, name, args, signature);
ret = FALSE;
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 08/12] Do not set signature and reply in GDBus tables
Use GDBUS_* macros, so signature and reply fields are not set in each
method/signal.
---
plugins/ofono.c | 4 ++--
src/service.c | 25 +++++++++++--------------
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/plugins/ofono.c b/plugins/ofono.c
index fcdb228..45fac91 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -115,11 +115,11 @@ static DBusMessage *agent_release(DBusConnection *conn,
}
static const GDBusMethodTable agent_methods[] = {
- { _GDBUS_METHOD("ReceiveNotification", "aya{sv}", "",
+ { GDBUS_METHOD("ReceiveNotification",
GDBUS_ARGS({ "notification", "ay" },
{ "info", "a{sv}" }),
NULL, agent_receive) },
- { _GDBUS_NOREPLY_METHOD("Release", "", "", NULL, NULL,
agent_release) },
+ { GDBUS_NOREPLY_METHOD("Release", NULL, NULL, agent_release) },
{ }
};
diff --git a/src/service.c b/src/service.c
index 669d10e..83e1fe1 100644
--- a/src/service.c
+++ b/src/service.c
@@ -223,13 +223,13 @@ static DBusMessage *msg_mark_read(DBusConnection *conn,
}
static const GDBusMethodTable message_methods[] = {
- { _GDBUS_METHOD("MarkRead", "", "", NULL, NULL,
msg_mark_read) },
- { _GDBUS_METHOD("Delete", "", "", NULL, NULL, msg_delete)
},
+ { GDBUS_METHOD("MarkRead", NULL, NULL, msg_mark_read) },
+ { GDBUS_METHOD("Delete", NULL, NULL, msg_delete) },
{ }
};
static const GDBusSignalTable message_signals[] = {
- { _GDBUS_SIGNAL("PropertyChanged", "sv",
+ { GDBUS_SIGNAL("PropertyChanged",
GDBUS_ARGS({ "name", "s" }, { "value", "v" }))
},
{ }
};
@@ -981,16 +981,16 @@ release_msg:
}
static const GDBusMethodTable service_methods[] = {
- { _GDBUS_METHOD("SendMessage", "assa(sss)", "o",
+ { GDBUS_METHOD("SendMessage",
GDBUS_ARGS({ "recipients", "as" }, { "smil",
"s" },
{ "attachments", "a(sss)" }),
GDBUS_ARGS({ "path", "o" }),
send_message) },
- { _GDBUS_METHOD("GetMessages", "", "a(oa{sv})",
+ { GDBUS_METHOD("GetMessages",
NULL,
GDBUS_ARGS({ "messages_with_properties", "a(oa{sv})" }),
get_messages) },
- { _GDBUS_METHOD("GetConversation", "su", "a(oa{sv})",
+ { GDBUS_METHOD("GetConversation",
GDBUS_ARGS({ "number", "s" }, { "count", "s"
}),
GDBUS_ARGS({ "messages_with_properties", "a(oa{sv}" }),
get_conversation) },
@@ -998,10 +998,9 @@ static const GDBusMethodTable service_methods[] = {
};
static const GDBusSignalTable service_signals[] = {
- { _GDBUS_SIGNAL("MessageAdded", "oa{sv}",
- GDBUS_ARGS({ "path", "o" },
+ { GDBUS_SIGNAL("MessageAdded", GDBUS_ARGS({ "path", "o"
},
{ "properties", "a{sv}" })) },
- { _GDBUS_SIGNAL("MessageRemoved", "o", GDBUS_ARGS({
"path", "o" })) },
+ { GDBUS_SIGNAL("MessageRemoved", GDBUS_ARGS({ "path", "o"
})) },
{ }
};
@@ -2356,18 +2355,16 @@ static DBusMessage *get_services(DBusConnection *conn,
}
static const GDBusMethodTable manager_methods[] = {
- { _GDBUS_METHOD("GetServices", "", "a(oa{sv})",
- NULL,
+ { GDBUS_METHOD("GetServices", NULL,
GDBUS_ARGS({ "services_with_properties", "a(oa{sv})" }),
get_services) },
{ }
};
static const GDBusSignalTable manager_signals[] = {
- { _GDBUS_SIGNAL("ServiceAdded", "oa{sv}",
- GDBUS_ARGS({ "path", "o" },
+ { GDBUS_SIGNAL("ServiceAdded", GDBUS_ARGS({ "path", "o"
},
{ "properties", "a{sv}" })) },
- { _GDBUS_SIGNAL("ServiceRemoved", "o", GDBUS_ARGS({
"path", "o" })) },
+ { GDBUS_SIGNAL("ServiceRemoved", GDBUS_ARGS({ "path", "o"
})) },
{ }
};
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 09/12] gdbus: remove signature and reply from tables
---
gdbus/gdbus.h | 60 --------------------------------------------------------
gdbus/object.c | 2 +-
2 files changed, 1 insertion(+), 61 deletions(-)
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h
index 868c8d5..0a8a27c 100644
--- a/gdbus/gdbus.h
+++ b/gdbus/gdbus.h
@@ -89,8 +89,6 @@ typedef struct {
typedef struct {
const char *name;
- const char *signature;
- const char *reply;
GDBusMethodFunction function;
GDBusMethodFlags flags;
unsigned int privilege;
@@ -100,7 +98,6 @@ typedef struct {
typedef struct {
const char *name;
- const char *signature;
GDBusSignalFlags flags;
const GDBusArgInfo *args;
} GDBusSignalTable;
@@ -120,63 +117,6 @@ typedef struct {
#define GDBUS_ARGS(args...) (const GDBusArgInfo[]) { args, { } }
-#define _GDBUS_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
- .name = _name, \
- .signature = _signature, \
- .reply = _reply, \
- .in_args = _in_args, \
- .out_args = _out_args, \
- .function = _function
-
-#define _GDBUS_ASYNC_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
- .name = _name, \
- .signature = _signature, \
- .reply = _reply, \
- .in_args = _in_args, \
- .out_args = _out_args, \
- .function = _function, \
- .flags = G_DBUS_METHOD_FLAG_ASYNC
-
-#define _GDBUS_DEPRECATED_METHOD(_name, _signature, _reply, _in_args, _out_args,
_function) \
- .name = _name, \
- .signature = _signature, \
- .reply = _reply, \
- .in_args = _in_args, \
- .out_args = _out_args, \
- .function = _function, \
- .flags = G_DBUS_METHOD_FLAG_DEPRECATED
-
-#define _GDBUS_DEPRECATED_ASYNC_METHOD(_name, _signature, _reply, _in_args, _out_args,
_function) \
- .name = _name, \
- .signature = _signature, \
- .reply = _reply, \
- .in_args = _in_args, \
- .out_args = _out_args, \
- .function = _function, \
- .flags = G_DBUS_METHOD_FLAG_ASYNC | G_DBUS_METHOD_FLAG_DEPRECATED
-
-#define _GDBUS_NOREPLY_METHOD(_name, _signature, _reply, _in_args, _out_args, _function)
\
- .name = _name, \
- .signature = _signature, \
- .reply = _reply, \
- .in_args = _in_args, \
- .out_args = _out_args, \
- .function = _function, \
- .flags = G_DBUS_METHOD_FLAG_NOREPLY
-
-#define _GDBUS_SIGNAL(_name, _signature, _args) \
- .name = _name, \
- .signature = _signature, \
- .args = _args
-
-#define _GDBUS_DEPRECATED_SIGNAL(_name, _signature, _args) \
- .name = _name, \
- .signature = _signature, \
- .args = _args, \
- .flags = G_DBUS_SIGNAL_FLAG_DEPRECATED
-
-/* Helpers with no signature and reply */
-
#define GDBUS_METHOD(_name, _in_args, _out_args, _function) \
.name = _name, \
.in_args = _in_args, \
diff --git a/gdbus/object.c b/gdbus/object.c
index b187bb5..fcdd6ec 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -471,7 +471,7 @@ done:
}
static const GDBusMethodTable introspect_methods[] = {
- { _GDBUS_METHOD("Introspect", "", "s", NULL,
+ { GDBUS_METHOD("Introspect", NULL,
GDBUS_ARGS({ "xml", "s" }), introspect) },
{ }
};
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 10/12] gdbus: add Deprecated annotation in introspection
---
gdbus/object.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/gdbus/object.c b/gdbus/object.c
index fcdd6ec..95947f3 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -82,7 +82,11 @@ static void generate_interface_xml(GString *gstr, struct interface_data
*iface)
const GDBusSignalTable *signal;
for (method = iface->methods; method && method->name; method++) {
- if (!(method->in_args && method->in_args->name) &&
+ gboolean deprecated = method->flags &
+ G_DBUS_METHOD_FLAG_DEPRECATED;
+
+ if (!deprecated &&
+ !(method->in_args && method->in_args->name) &&
!(method->out_args && method->out_args->name))
g_string_append_printf(gstr, "\t\t<method name=\"%s\"/>\n",
method->name);
@@ -91,18 +95,29 @@ static void generate_interface_xml(GString *gstr, struct
interface_data *iface)
method->name);
print_arguments(gstr, method->in_args, "in");
print_arguments(gstr, method->out_args, "out");
+
+ if (deprecated)
+ g_string_append_printf(gstr, "\t\t\t<annotation
name=\"org.freedesktop.DBus.Deprecated\"
value=\"true\"/>\n");
+
g_string_append_printf(gstr, "\t\t</method>\n");
}
}
for (signal = iface->signals; signal && signal->name; signal++) {
- if (!(signal->args && signal->args->name))
+ gboolean deprecated = signal->flags &
+ G_DBUS_SIGNAL_FLAG_DEPRECATED;
+
+ if (!deprecated && !(signal->args && signal->args->name))
g_string_append_printf(gstr, "\t\t<signal name=\"%s\"/>\n",
signal->name);
else {
g_string_append_printf(gstr, "\t\t<signal name=\"%s\">\n",
signal->name);
print_arguments(gstr, signal->args, NULL);
+
+ if (deprecated)
+ g_string_append_printf(gstr, "\t\t\t<annotation
name=\"org.freedesktop.DBus.Deprecated\"
value=\"true\"/>\n");
+
g_string_append_printf(gstr, "\t\t</signal>\n");
}
}
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 11/12] gdbus: add Method.NoReply annotation in introspection
---
gdbus/object.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gdbus/object.c b/gdbus/object.c
index 95947f3..dacbe58 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -84,8 +84,10 @@ static void generate_interface_xml(GString *gstr, struct interface_data
*iface)
for (method = iface->methods; method && method->name; method++) {
gboolean deprecated = method->flags &
G_DBUS_METHOD_FLAG_DEPRECATED;
+ gboolean noreply = method->flags &
+ G_DBUS_METHOD_FLAG_NOREPLY;
- if (!deprecated &&
+ if (!deprecated && !noreply &&
!(method->in_args && method->in_args->name) &&
!(method->out_args && method->out_args->name))
g_string_append_printf(gstr, "\t\t<method name=\"%s\"/>\n",
@@ -99,6 +101,9 @@ static void generate_interface_xml(GString *gstr, struct interface_data
*iface)
if (deprecated)
g_string_append_printf(gstr, "\t\t\t<annotation
name=\"org.freedesktop.DBus.Deprecated\"
value=\"true\"/>\n");
+ if (noreply)
+ g_string_append_printf(gstr, "\t\t\t<annotation
name=\"org.freedesktop.DBus.Method.NoReply\"
value=\"true\"/>\n");
+
g_string_append_printf(gstr, "\t\t</method>\n");
}
}
--
1.7.10.2
5:59 a.m.
New subject: [PATCH mmsd 12/12] gdbus: do not check signature twice
Message signature is already checked in generic_message(), so there's no
need to check again in the callback.
---
gdbus/object.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/gdbus/object.c b/gdbus/object.c
index dacbe58..2dd7c0e 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -174,11 +174,6 @@ static DBusMessage *introspect(DBusConnection *connection,
struct generic_data *data = user_data;
DBusMessage *reply;
- if (!dbus_message_has_signature(message, DBUS_TYPE_INVALID_AS_STRING)) {
- error("Unexpected signature to introspect call");
- return NULL;
- }
-
if (data->introspect == NULL)
generate_introspection_xml(connection, data,
dbus_message_get_path(message));
--
1.7.10.2
8:05 a.m.
Hi Lucas,
Constify method tables with the following commands:
find . -name '*.[ch]' -exec sed -i \
's/\(c\)\(GDBusSignalTable .* =\)/\1 const \2/g' {} \;
find . -name '*.[ch]' -exec sed -i \
's/\(c\)\(GDBusMethodTable .* =\)/\1 const \2/g' {} \;
---
plugins/ofono.c | 2 +-
src/service.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
all 12 patches have been applied.
Regards
Marcel
3775
days inactive
3775
days old
12 comments
2 participants
participants (2)
-
Lucas De Marchi -
Marcel Holtmann