From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THAk7-0003wI-9n for qemu-devel@nongnu.org; Thu, 27 Sep 2012 05:50:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THAjz-0003x5-Hr for qemu-devel@nongnu.org; Thu, 27 Sep 2012 05:50:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THAjz-0003wv-AA for qemu-devel@nongnu.org; Thu, 27 Sep 2012 05:50:43 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8R9og8v010737 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 27 Sep 2012 05:50:42 -0400 From: Markus Armbruster References: <1348691138-12879-1-git-send-email-lcapitulino@redhat.com> <1348691138-12879-2-git-send-email-lcapitulino@redhat.com> Date: Thu, 27 Sep 2012 11:50:40 +0200 In-Reply-To: <1348691138-12879-2-git-send-email-lcapitulino@redhat.com> (Luiz Capitulino's message of "Wed, 26 Sep 2012 17:25:36 -0300") Message-ID: <87vcezg5fz.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/3] input: qmp_send_key(): simplify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: akong@redhat.com, eblake@redhat.com, qemu-devel@nongnu.org, avi@redhat.com Luiz Capitulino writes: > The current code duplicates the QKeyCodeList keys in order to store > the key values for release_keys() late run. This is a bit complicated > though, as we have to care about correct ordering and then release_keys() > will have to index key_defs[] over again. > > Switch to an array of integers, which is dynamically allocated and stores > the already converted key value. > > This simplifies the current code and the next commit. > > Signed-off-by: Luiz Capitulino > --- > input.c | 36 ++++++++++++++---------------------- > 1 file changed, 14 insertions(+), 22 deletions(-) > > diff --git a/input.c b/input.c > index c4b0619..32c6057 100644 > --- a/input.c > +++ b/input.c > @@ -224,30 +224,31 @@ int index_from_keycode(int code) > return i; > } > > -static QKeyCodeList *keycodes; > +static int *keycodes; > +static int keycodes_size; > static QEMUTimer *key_timer; > > static void release_keys(void *opaque) > { > - int keycode; > - QKeyCodeList *p; > + int i; > > - for (p = keycodes; p != NULL; p = p->next) { > - keycode = key_defs[p->value]; > - if (keycode & 0x80) { > + for (i = 0; i < keycodes_size; i++) { > + if (keycodes[i] & 0x80) { > kbd_put_keycode(0xe0); > } > - kbd_put_keycode(keycode | 0x80); > + kbd_put_keycode(keycodes[i]| 0x80); > } > - qapi_free_QKeyCodeList(keycodes); > + > + g_free(keycodes); > keycodes = NULL; > + keycodes_size = 0; > } > > void qmp_send_key(QKeyCodeList *keys, bool has_hold_time, int64_t hold_time, > Error **errp) > { > int keycode; > - QKeyCodeList *p, *keylist, *head = NULL, *tmp = NULL; > + QKeyCodeList *p; > > if (!key_timer) { > key_timer = qemu_new_timer_ns(vm_clock, release_keys, NULL); > @@ -257,31 +258,22 @@ void qmp_send_key(QKeyCodeList *keys, bool has_hold_time, int64_t hold_time, > qemu_del_timer(key_timer); > release_keys(NULL); > } > + > if (!has_hold_time) { > hold_time = 100; > } > > for (p = keys; p != NULL; p = p->next) { > - keylist = g_malloc0(sizeof(*keylist)); > - keylist->value = p->value; > - keylist->next = NULL; > - > - if (!head) { > - head = keylist; > - } > - if (tmp) { > - tmp->next = keylist; > - } > - tmp = keylist; > - > /* key down events */ > keycode = key_defs[p->value]; > if (keycode & 0x80) { > kbd_put_keycode(0xe0); > } > kbd_put_keycode(keycode & 0x7f); > + > + keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1)); > + keycodes[keycodes_size++] = keycode; One realloc per key is a bit wasteful (the common efficient way to grow a flexible array is to double it), but it takes a mighty fast typist to make that matter. > } > - keycodes = head; > > /* delayed key up events */ > qemu_mod_timer(key_timer, qemu_get_clock_ns(vm_clock) +