From patchwork Fri Jun 21 06:37:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 253143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CB5742C013D for ; Fri, 21 Jun 2013 16:41:21 +1000 (EST) Received: from localhost ([::1]:37705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upv27-0004GN-Uk for incoming@patchwork.ozlabs.org; Fri, 21 Jun 2013 02:41:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upv0H-0002GQ-Id for qemu-devel@nongnu.org; Fri, 21 Jun 2013 02:39:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Upv0G-0004f4-25 for qemu-devel@nongnu.org; Fri, 21 Jun 2013 02:39:25 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:53068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upv0F-0004en-Er for qemu-devel@nongnu.org; Fri, 21 Jun 2013 02:39:24 -0400 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Jun 2013 12:02:02 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp06.in.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 21 Jun 2013 12:01:59 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id A8F81E0054 for ; Fri, 21 Jun 2013 12:08:45 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5L6dQFW28967040 for ; Fri, 21 Jun 2013 12:09:26 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5L6dH62031955 for ; Fri, 21 Jun 2013 16:39:17 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.50]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5L6biWg027133; Fri, 21 Jun 2013 16:39:14 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 21 Jun 2013 14:37:37 +0800 Message-Id: <1371796658-15632-2-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1371796658-15632-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1371796658-15632-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062106-9574-0000-0000-0000086436EC X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.6 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 1/2] monitor: discard global variable in auto completion functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In monitor_find_completion() and related functions, Global variable *mon_cmds is not used any more, make them reenterable safely. *cur_mon is also not used now. *info_cmds is still there, but soon will be removed by a new way of sub command completion. Signed-off-by: Wenchao Xia --- include/monitor/readline.h | 8 ++++- monitor.c | 70 ++++++++++++++++++++++++++----------------- readline.c | 4 ++- 3 files changed, 52 insertions(+), 30 deletions(-) diff --git a/include/monitor/readline.h b/include/monitor/readline.h index fc9806e..a4c7bce 100644 --- a/include/monitor/readline.h +++ b/include/monitor/readline.h @@ -7,8 +7,12 @@ #define READLINE_MAX_CMDS 64 #define READLINE_MAX_COMPLETIONS 256 +typedef struct mon_cmd_t mon_cmd_t; + typedef void ReadLineFunc(Monitor *mon, const char *str, void *opaque); -typedef void ReadLineCompletionFunc(const char *cmdline); +typedef void ReadLineCompletionFunc(Monitor *mon, + mon_cmd_t *cmd_table, + const char *cmdline); typedef struct ReadLineState { char cmd_buf[READLINE_CMD_BUF_SIZE + 1]; @@ -35,6 +39,7 @@ typedef struct ReadLineState { int read_password; char prompt[256]; Monitor *mon; + mon_cmd_t *cmd_table; } ReadLineState; void readline_add_completion(ReadLineState *rs, const char *str); @@ -50,6 +55,7 @@ void readline_restart(ReadLineState *rs); void readline_show_prompt(ReadLineState *rs); ReadLineState *readline_init(Monitor *mon, + mon_cmd_t *cmd_table, ReadLineCompletionFunc *completion_finder); #endif /* !READLINE_H */ diff --git a/monitor.c b/monitor.c index 70ae8f5..bc60171 100644 --- a/monitor.c +++ b/monitor.c @@ -116,7 +116,7 @@ struct MonitorCompletionData { void (*user_print)(Monitor *mon, const QObject *data); }; -typedef struct mon_cmd_t { +struct mon_cmd_t { const char *name; const char *args_type; const char *params; @@ -134,7 +134,7 @@ typedef struct mon_cmd_t { * used, and mhandler of 1st level plays the role of help function. */ struct mon_cmd_t *sub_table; -} mon_cmd_t; +}; /* file descriptors passed via SCM_RIGHTS */ typedef struct mon_fd_t mon_fd_t; @@ -3999,7 +3999,7 @@ out: QDECREF(qdict); } -static void cmd_completion(const char *name, const char *list) +static void cmd_completion(Monitor *mon, const char *name, const char *list) { const char *p, *pstart; char cmd[128]; @@ -4017,7 +4017,7 @@ static void cmd_completion(const char *name, const char *list) memcpy(cmd, pstart, len); cmd[len] = '\0'; if (name[0] == '\0' || !strncmp(name, cmd, strlen(name))) { - readline_add_completion(cur_mon->rs, cmd); + readline_add_completion(mon->rs, cmd); } if (*p == '\0') break; @@ -4025,7 +4025,7 @@ static void cmd_completion(const char *name, const char *list) } } -static void file_completion(const char *input) +static void file_completion(Monitor *mon, const char *input) { DIR *ffs; struct dirent *d; @@ -4048,7 +4048,7 @@ static void file_completion(const char *input) pstrcpy(file_prefix, sizeof(file_prefix), p + 1); } #ifdef DEBUG_COMPLETION - monitor_printf(cur_mon, "input='%s' path='%s' prefix='%s'\n", + monitor_printf(mon, "input='%s' path='%s' prefix='%s'\n", input, path, file_prefix); #endif ffs = opendir(path); @@ -4075,20 +4075,28 @@ static void file_completion(const char *input) if (stat(file, &sb) == 0 && S_ISDIR(sb.st_mode)) { pstrcat(file, sizeof(file), "/"); } - readline_add_completion(cur_mon->rs, file); + readline_add_completion(mon->rs, file); } } closedir(ffs); } -static void block_completion_it(void *opaque, BlockDriverState *bs) +typedef struct MonitorBlockComplete { + Monitor *mon; + const char *input; +} MonitorBlockComplete; + +static void block_completion_it(void *opaque, + BlockDriverState *bs) { const char *name = bdrv_get_device_name(bs); - const char *input = opaque; + MonitorBlockComplete *mbc = opaque; + Monitor *mon = mbc->mon; + const char *input = mbc->input; if (input[0] == '\0' || !strncmp(name, (char *)input, strlen(input))) { - readline_add_completion(cur_mon->rs, name); + readline_add_completion(mon->rs, name); } } @@ -4124,18 +4132,21 @@ static const char *next_arg_type(const char *typestr) return (p != NULL ? ++p : typestr); } -static void monitor_find_completion(const char *cmdline) +static void monitor_find_completion(Monitor *mon, + mon_cmd_t *cmd_table, + const char *cmdline) { const char *cmdname; char *args[MAX_ARGS]; int nb_args, i, len; const char *ptype, *str; const mon_cmd_t *cmd; + MonitorBlockComplete mbs; parse_cmdline(cmdline, &nb_args, args); #ifdef DEBUG_COMPLETION for(i = 0; i < nb_args; i++) { - monitor_printf(cur_mon, "arg%d = '%s'\n", i, (char *)args[i]); + monitor_printf(mon, "arg%d = '%s'\n", i, (char *)args[i]); } #endif @@ -4154,13 +4165,13 @@ static void monitor_find_completion(const char *cmdline) cmdname = ""; else cmdname = args[0]; - readline_set_completion_index(cur_mon->rs, strlen(cmdname)); - for(cmd = mon_cmds; cmd->name != NULL; cmd++) { - cmd_completion(cmdname, cmd->name); + readline_set_completion_index(mon->rs, strlen(cmdname)); + for (cmd = cmd_table; cmd->name != NULL; cmd++) { + cmd_completion(mon, cmdname, cmd->name); } } else { /* find the command */ - for (cmd = mon_cmds; cmd->name != NULL; cmd++) { + for (cmd = cmd_table; cmd->name != NULL; cmd++) { if (compare_cmd(args[0], cmd->name)) { break; } @@ -4184,33 +4195,35 @@ static void monitor_find_completion(const char *cmdline) switch(*ptype) { case 'F': /* file completion */ - readline_set_completion_index(cur_mon->rs, strlen(str)); - file_completion(str); + readline_set_completion_index(mon->rs, strlen(str)); + file_completion(mon, str); break; case 'B': /* block device name completion */ - readline_set_completion_index(cur_mon->rs, strlen(str)); - bdrv_iterate(block_completion_it, (void *)str); + mbs.mon = mon; + mbs.input = str; + readline_set_completion_index(mon->rs, strlen(str)); + bdrv_iterate(block_completion_it, &mbs); break; case 's': /* XXX: more generic ? */ if (!strcmp(cmd->name, "info")) { - readline_set_completion_index(cur_mon->rs, strlen(str)); + readline_set_completion_index(mon->rs, strlen(str)); for(cmd = info_cmds; cmd->name != NULL; cmd++) { - cmd_completion(str, cmd->name); + cmd_completion(mon, str, cmd->name); } } else if (!strcmp(cmd->name, "sendkey")) { char *sep = strrchr(str, '-'); if (sep) str = sep + 1; - readline_set_completion_index(cur_mon->rs, strlen(str)); + readline_set_completion_index(mon->rs, strlen(str)); for (i = 0; i < Q_KEY_CODE_MAX; i++) { - cmd_completion(str, QKeyCode_lookup[i]); + cmd_completion(mon, str, QKeyCode_lookup[i]); } } else if (!strcmp(cmd->name, "help|?")) { - readline_set_completion_index(cur_mon->rs, strlen(str)); - for (cmd = mon_cmds; cmd->name != NULL; cmd++) { - cmd_completion(str, cmd->name); + readline_set_completion_index(mon->rs, strlen(str)); + for (cmd = cmd_table; cmd->name != NULL; cmd++) { + cmd_completion(mon, str, cmd->name); } } break; @@ -4751,7 +4764,8 @@ void monitor_init(CharDriverState *chr, int flags) mon->chr = chr; mon->flags = flags; if (flags & MONITOR_USE_READLINE) { - mon->rs = readline_init(mon, monitor_find_completion); + /* Always use *mon_cmds as entry now. */ + mon->rs = readline_init(mon, mon_cmds, monitor_find_completion); monitor_read_command(mon, 0); } diff --git a/readline.c b/readline.c index 1c0f7ee..d97e062 100644 --- a/readline.c +++ b/readline.c @@ -285,7 +285,7 @@ static void readline_completion(ReadLineState *rs) cmdline = g_malloc(rs->cmd_buf_index + 1); memcpy(cmdline, rs->cmd_buf, rs->cmd_buf_index); cmdline[rs->cmd_buf_index] = '\0'; - rs->completion_finder(cmdline); + rs->completion_finder(rs->mon, rs->cmd_table, cmdline); g_free(cmdline); /* no completion found */ @@ -482,12 +482,14 @@ const char *readline_get_history(ReadLineState *rs, unsigned int index) } ReadLineState *readline_init(Monitor *mon, + mon_cmd_t *cmd_table, ReadLineCompletionFunc *completion_finder) { ReadLineState *rs = g_malloc0(sizeof(*rs)); rs->hist_entry = -1; rs->mon = mon; + rs->cmd_table = cmd_table; rs->completion_finder = completion_finder; return rs;