[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/25] monitor: Split monitor_handle_command()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 19/25] monitor: Split monitor_handle_command() |
Date: |
Mon, 3 Aug 2009 13:57:16 -0300 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 09/25] monitor: Port handler_0 to use the dictionary, (continued)
- [Qemu-devel] [PATCH 09/25] monitor: Port handler_0 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 10/25] monitor: Port handler_1 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 11/25] monitor: Port handler_2 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 12/25] monitor: Port handler_3 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 14/25] monitor: Port handler_5 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 15/25] monitor: Port handler_6 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 17/25] monitor: Drop handler_8 and handler_9 handling, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 16/25] monitor: Port handler_7 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 18/25] monitor: Port handler_10 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 19/25] monitor: Split monitor_handle_command(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 20/25] monitor: Add a new index for str_allocated[], Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 21/25] monitor: Drop args[] from monitor_parse_command(), Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 22/25] monitor: Drop 'nb_args' from monitor_parse_command(), Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 23/25] Add check support, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 24/25] Introduce dictionary test data file, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 25/25] Introduce QDict unit-tests, Luiz Capitulino, 2009/08/03
- Re: [Qemu-devel] [PATCH v1 00/25] Monitor handlers new structure phase 1, Anthony Liguori, 2009/08/10