From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MY0sH-0006JM-M5 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:59:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MY0sC-0006H2-Te for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:59:01 -0400 Received: from [199.232.76.173] (port=55292 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY0sC-0006Gp-Nw for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:56 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56374) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MY0sC-0003DI-4B for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:56 -0400 From: Luiz Capitulino Date: Mon, 3 Aug 2009 13:57:16 -0300 Message-Id: <1249318642-19324-20-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> References: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 19/25] monitor: Split monitor_handle_command() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, avi@redhat.com In order to help the integration with unit-tests and having a better design, this commit splits monitor_handle_command() into two parts. The parsing code is moved to a function called monitor_parse_command(), while allocating memory and calling the handler is still done by monitor_handle_command(). Signed-off-by: Luiz Capitulino --- monitor.c | 64 +++++++++++++++++++++++++++++++----------------------------- 1 files changed, 33 insertions(+), 31 deletions(-) diff --git a/monitor.c b/monitor.c index b20f317..76154fd 100644 --- a/monitor.c +++ b/monitor.c @@ -2693,18 +2693,18 @@ static int default_fmt_size = 4; #define MAX_ARGS 16 -static void monitor_handle_command(Monitor *mon, const char *cmdline) +static const mon_cmd_t *monitor_parse_command(Monitor *mon, + const char *cmdline, + void *str_allocated[], + QDict *qdict) { const char *p, *typestr; - int c, nb_args, i, has_arg; + int c, nb_args, has_arg; const mon_cmd_t *cmd; char cmdname[256]; char buf[1024]; char *key; - void *str_allocated[MAX_ARGS]; void *args[MAX_ARGS]; - QDict *qdict; - void (*handler_d)(Monitor *mon, const QDict *qdict); #ifdef DEBUG monitor_printf(mon, "command='%s'\n", cmdline); @@ -2713,7 +2713,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) /* extract the command name */ p = get_command_name(cmdline, cmdname, sizeof(cmdname)); if (!p) - return; + return NULL; /* find the command */ for(cmd = mon_cmds; cmd->name != NULL; cmd++) { @@ -2723,14 +2723,9 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) if (cmd->name == NULL) { monitor_printf(mon, "unknown command: '%s'\n", cmdname); - return; + return NULL; } - qdict = qdict_new(); - - for(i = 0; i < MAX_ARGS; i++) - str_allocated[i] = NULL; - /* parse the parameters */ typestr = cmd->args_type; nb_args = 0; @@ -2984,27 +2979,34 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) goto fail; } - switch(nb_args) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 10: - handler_d = cmd->handler; - handler_d(mon, qdict); - break; - default: - monitor_printf(mon, "unsupported number of arguments: %d\n", nb_args); - goto fail; - } - fail: + return cmd; + +fail: qemu_free(key); + return NULL; +} + +static void monitor_handle_command(Monitor *mon, const char *cmdline) +{ + int i; + QDict *qdict; + const mon_cmd_t *cmd; + void *str_allocated[MAX_ARGS]; + + qdict = qdict_new(); + + for (i = 0; i < MAX_ARGS; i++) + str_allocated[i] = NULL; + + cmd = monitor_parse_command(mon, cmdline, str_allocated, qdict); + if (cmd) { + void (*handler)(Monitor *mon, const QDict *qdict); + handler = cmd->handler; + handler(mon, qdict); + } + qdict_destroy(qdict); - for(i = 0; i < MAX_ARGS; i++) + for (i = 0; i < MAX_ARGS; i++) qemu_free(str_allocated[i]); } -- 1.6.4.rc3.12.gdf73a