From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VP1c3-0005od-1f for qemu-devel@nongnu.org; Wed, 25 Sep 2013 22:47:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VP1bu-0002ZW-1f for qemu-devel@nongnu.org; Wed, 25 Sep 2013 22:47:30 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:50950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VP1bt-0002ZI-7S for qemu-devel@nongnu.org; Wed, 25 Sep 2013 22:47:21 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Sep 2013 12:37:01 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 3371D2CE8053 for ; Thu, 26 Sep 2013 12:36:58 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8Q2KHJG46530584 for ; Thu, 26 Sep 2013 12:20:17 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8Q2avIk015864 for ; Thu, 26 Sep 2013 12:36:57 +1000 Message-ID: <52439DC6.50007@linux.vnet.ibm.com> Date: Thu, 26 Sep 2013 10:36:54 +0800 From: Mark Wu MIME-Version: 1.0 References: <1380160599-15659-1-git-send-email-wudxw@linux.vnet.ibm.com> In-Reply-To: <1380160599-15659-1-git-send-email-wudxw@linux.vnet.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Add interface to traverse the qmp command list by QmpCommand List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark Wu Cc: qemu-devel@nongnu.org, Michael Roth , Luiz Capitulino It's verified by the following tests: 1. run ./qemu-ga -b help, it print a list of qga command names as expected 2. run ./guest-sync -b guest-ping, guest-sync .... command 'guest-info' show that guest-ping and guest-sync are disabled On Thu 26 Sep 2013 09:56:39 AM CST, Mark Wu wrote: > In the original code, qmp_get_command_list is used to construct > a list of all commands' name. To get the information of all qga > commands, it traverses the name list and search the command info > with its name. So it can cause O(n^2) in the number of commands. > > This patch adds an interface to traverse the qmp command list by > QmpCommand to replace qmp_get_command_list. It can decrease the > complexity from O(n) to O(n^2) > > Signed-off-by: Mark Wu > --- > include/qapi/qmp/dispatch.h | 3 +- > qapi/qmp-registry.c | 28 ++----------------- > qga/commands.c | 39 ++++++++++---------------- > qga/main.c | 68 +++++++++++++++++---------------------------- > 4 files changed, 45 insertions(+), 93 deletions(-) > > diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h > index 1ce11f5..fb174f6 100644 > --- a/include/qapi/qmp/dispatch.h > +++ b/include/qapi/qmp/dispatch.h > @@ -48,8 +48,9 @@ QObject *qmp_dispatch(QObject *request); > void qmp_disable_command(const char *name); > void qmp_enable_command(const char *name); > bool qmp_command_is_enabled(const char *name); > -char **qmp_get_command_list(void); > QObject *qmp_build_error_object(Error *errp); > +typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque); > +void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque); > > #endif > > diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c > index 28bbbe8..844d597 100644 > --- a/qapi/qmp-registry.c > +++ b/qapi/qmp-registry.c > @@ -66,35 +66,11 @@ void qmp_enable_command(const char *name) > qmp_toggle_command(name, true); > } > > -bool qmp_command_is_enabled(const char *name) > +void qmp_for_each_command(qmp_cmd_callback_fn fn, void *opaque) > { > QmpCommand *cmd; > > QTAILQ_FOREACH(cmd, &qmp_commands, node) { > - if (strcmp(cmd->name, name) == 0) { > - return cmd->enabled; > - } > + fn(cmd, opaque); > } > - > - return false; > -} > - > -char **qmp_get_command_list(void) > -{ > - QmpCommand *cmd; > - int count = 1; > - char **list_head, **list; > - > - QTAILQ_FOREACH(cmd, &qmp_commands, node) { > - count++; > - } > - > - list_head = list = g_malloc0(count * sizeof(char *)); > - > - QTAILQ_FOREACH(cmd, &qmp_commands, node) { > - *list = g_strdup(cmd->name); > - list++; > - } > - > - return list_head; > } > diff --git a/qga/commands.c b/qga/commands.c > index 528b082..602cd47 100644 > --- a/qga/commands.c > +++ b/qga/commands.c > @@ -45,35 +45,26 @@ void qmp_guest_ping(Error **err) > slog("guest-ping called"); > } > > -struct GuestAgentInfo *qmp_guest_info(Error **err) > +static void qmp_command_info(QmpCommand *cmd, void *opaque) > { > - GuestAgentInfo *info = g_malloc0(sizeof(GuestAgentInfo)); > + GuestAgentInfo *info = (GuestAgentInfo *)opaque; > GuestAgentCommandInfo *cmd_info; > GuestAgentCommandInfoList *cmd_info_list; > - char **cmd_list_head, **cmd_list; > - > - info->version = g_strdup(QEMU_VERSION); > - > - cmd_list_head = cmd_list = qmp_get_command_list(); > - if (*cmd_list_head == NULL) { > - goto out; > - } > - > - while (*cmd_list) { > - cmd_info = g_malloc0(sizeof(GuestAgentCommandInfo)); > - cmd_info->name = g_strdup(*cmd_list); > - cmd_info->enabled = qmp_command_is_enabled(cmd_info->name); > > - cmd_info_list = g_malloc0(sizeof(GuestAgentCommandInfoList)); > - cmd_info_list->value = cmd_info; > - cmd_info_list->next = info->supported_commands; > - info->supported_commands = cmd_info_list; > + cmd_info = g_malloc0(sizeof(GuestAgentCommandInfo)); > + cmd_info->name = g_strdup(cmd->name); > + cmd_info->enabled = cmd->enabled; > + cmd_info_list = g_malloc0(sizeof(GuestAgentCommandInfoList)); > + cmd_info_list->value = cmd_info; > + cmd_info_list->next = info->supported_commands; > + info->supported_commands = cmd_info_list; > +} > > - g_free(*cmd_list); > - cmd_list++; > - } > +struct GuestAgentInfo *qmp_guest_info(Error **err) > +{ > + GuestAgentInfo *info = g_malloc0(sizeof(GuestAgentInfo)); > > -out: > - g_free(cmd_list_head); > + info->version = g_strdup(QEMU_VERSION); > + qmp_for_each_command(qmp_command_info, info); > return info; > } > diff --git a/qga/main.c b/qga/main.c > index 6c746c8..1741d3f 100644 > --- a/qga/main.c > +++ b/qga/main.c > @@ -347,48 +347,34 @@ static gint ga_strcmp(gconstpointer str1, gconstpointer str2) > } > > /* disable commands that aren't safe for fsfreeze */ > -static void ga_disable_non_whitelisted(void) > +static void ga_disable_non_whitelisted(QmpCommand *cmd, void *opaque) > { > - char **list_head, **list; > bool whitelisted; > int i; > > - list_head = list = qmp_get_command_list(); > - while (*list != NULL) { > - whitelisted = false; > - i = 0; > - while (ga_freeze_whitelist[i] != NULL) { > - if (strcmp(*list, ga_freeze_whitelist[i]) == 0) { > - whitelisted = true; > - } > - i++; > - } > - if (!whitelisted) { > - g_debug("disabling command: %s", *list); > - qmp_disable_command(*list); > + whitelisted = false; > + i = 0; > + while (ga_freeze_whitelist[i] != NULL) { > + if (strcmp(cmd->name, ga_freeze_whitelist[i]) == 0) { > + whitelisted = true; > } > - g_free(*list); > - list++; > + i++; > + } > + if (!whitelisted) { > + g_debug("disabling command: %s", cmd->name); > + qmp_disable_command(cmd->name); > } > - g_free(list_head); > } > > /* [re-]enable all commands, except those explicitly blacklisted by user */ > -static void ga_enable_non_blacklisted(GList *blacklist) > +static void ga_enable_non_blacklisted(QmpCommand *cmd, void *opaque) > { > - char **list_head, **list; > - > - list_head = list = qmp_get_command_list(); > - while (*list != NULL) { > - if (g_list_find_custom(blacklist, *list, ga_strcmp) == NULL && > - !qmp_command_is_enabled(*list)) { > - g_debug("enabling command: %s", *list); > - qmp_enable_command(*list); > - } > - g_free(*list); > - list++; > + GList *blacklist = (GList *)opaque; > + if (g_list_find_custom(blacklist, cmd->name, ga_strcmp) == NULL && > + !cmd->enabled) { > + g_debug("enabling command: %s", cmd->name); > + qmp_enable_command(cmd->name); > } > - g_free(list_head); > } > > static bool ga_create_file(const char *path) > @@ -424,7 +410,7 @@ void ga_set_frozen(GAState *s) > return; > } > /* disable all non-whitelisted (for frozen state) commands */ > - ga_disable_non_whitelisted(); > + qmp_for_each_command(ga_disable_non_whitelisted, NULL); > g_warning("disabling logging due to filesystem freeze"); > ga_disable_logging(s); > s->frozen = true; > @@ -460,7 +446,7 @@ void ga_unset_frozen(GAState *s) > } > > /* enable all disabled, non-blacklisted commands */ > - ga_enable_non_blacklisted(s->blacklist); > + qmp_for_each_command(ga_enable_non_blacklisted, s->blacklist); > s->frozen = false; > if (!ga_delete_file(s->state_filepath_isfrozen)) { > g_warning("unable to delete %s, fsfreeze may not function properly", > @@ -920,6 +906,11 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp) > return handle; > } > > +static void ga_print_cmd(QmpCommand *cmd, void *opaque) > +{ > + printf("%s\n", cmd->name); > +} > + > int main(int argc, char **argv) > { > const char *sopt = "hVvdm:p:l:f:F::b:s:t:"; > @@ -996,15 +987,8 @@ int main(int argc, char **argv) > daemonize = 1; > break; > case 'b': { > - char **list_head, **list; > if (is_help_option(optarg)) { > - list_head = list = qmp_get_command_list(); > - while (*list != NULL) { > - printf("%s\n", *list); > - g_free(*list); > - list++; > - } > - g_free(list_head); > + qmp_for_each_command(ga_print_cmd, NULL); > return 0; > } > for (j = 0, i = 0, len = strlen(optarg); i < len; i++) { > @@ -1126,7 +1110,7 @@ int main(int argc, char **argv) > s->deferred_options.log_filepath = log_filepath; > } > ga_disable_logging(s); > - ga_disable_non_whitelisted(); > + qmp_for_each_command(ga_disable_non_whitelisted, NULL); > } else { > if (daemonize) { > become_daemon(pid_filepath);