{"id":815740,"url":"http://patchwork.ozlabs.org/api/patches/815740/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-24-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919165226.23022-24-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:22","name":"[v2,23/27] vhost-user-scsi: simplify source handling","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3e5d155456492a1e829c69a4bcef73b438382303","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-24-marcandre.lureau@redhat.com/mbox/","series":[{"id":3931,"url":"http://patchwork.ozlabs.org/api/series/3931/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3931","date":"2017-09-19T16:51:59","name":"vhost-user-scsi: code clean-up","version":2,"mbox":"http://patchwork.ozlabs.org/series/3931/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815740/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815740/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxVXs3VWgz9sMN\n\tfor ;\n\tWed, 20 Sep 2017 03:41:17 +1000 (AEST)","from localhost ([::1]:44386 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMWJ-0005Bf-H8\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:41:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47618)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLn6-0006dG-Im\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:37 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLn5-0002qg-CA\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:32 -0400","from mx1.redhat.com ([209.132.183.28]:42486)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1duLn5-0002q2-3n\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:31 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 1331380476;\n\tTue, 19 Sep 2017 16:54:30 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 2BB955D980;\n\tTue, 19 Sep 2017 16:54:28 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 1331380476","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:22 +0200","Message-Id":"<20170919165226.23022-24-marcandre.lureau@redhat.com>","In-Reply-To":"<20170919165226.23022-1-marcandre.lureau@redhat.com>","References":"<20170919165226.23022-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tTue, 19 Sep 2017 16:54:30 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 23/27] vhost-user-scsi: simplify source\n\thandling","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\tf4bug@amsat.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Using a hashtable.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Paolo Bonzini \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 45 +++++++++----------------------\n 1 file changed, 12 insertions(+), 33 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex 0e6784187c..2e1100dea3 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -65,7 +65,7 @@ typedef struct VusDev {\n VuDev vu_dev;\n int server_sock;\n GMainLoop *loop;\n- GTree *fdmap; /* fd -> gsource context id */\n+ GHashTable *fdmap; /* fd -> gsource */\n VusIscsiLun lun;\n } VusDev;\n \n@@ -83,11 +83,6 @@ typedef struct vus_gsrc {\n GPollFD gfd;\n } vus_gsrc_t;\n \n-static gint vus_fdmap_compare(gconstpointer a, gconstpointer b)\n-{\n- return (b > a) - (b < a);\n-}\n-\n static gboolean vus_gsrc_prepare(GSource *src, gint *timeout)\n {\n assert(timeout);\n@@ -128,8 +123,8 @@ static GSourceFuncs vus_gsrc_funcs = {\n NULL\n };\n \n-static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,\n- vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)\n+static GSource *vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,\n+ vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)\n {\n GSource *vus_gsrc;\n vus_gsrc_t *vus_src;\n@@ -143,7 +138,6 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,\n vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));\n g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);\n vus_src = (vus_gsrc_t *)vus_gsrc;\n-\n vus_src->vdev_scsi = vdev_scsi;\n vus_src->gfd.fd = fd;\n vus_src->gfd.events = cond;\n@@ -154,8 +148,7 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,\n assert(id);\n g_source_unref(vus_gsrc);\n \n- g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd,\n- (gpointer)(uintptr_t)id);\n+ return vus_gsrc;\n }\n \n /** libiscsi integration **/\n@@ -348,43 +341,27 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)\n static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,\n void *pvt)\n {\n+ GSource *src;\n VusDev *vdev_scsi;\n- guint id;\n \n assert(vu_dev);\n assert(fd >= 0);\n assert(cb);\n \n vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n- id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,\n- (gpointer)(uintptr_t)fd);\n- if (id) {\n- GSource *vus_src = g_main_context_find_source_by_id(NULL, id);\n- assert(vus_src);\n- g_source_destroy(vus_src);\n- (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd);\n- }\n-\n- vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);\n+ src = vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);\n+ g_hash_table_replace(vdev_scsi->fdmap, GINT_TO_POINTER(fd), src);\n }\n \n static void vus_del_watch_cb(VuDev *vu_dev, int fd)\n {\n VusDev *vdev_scsi;\n- guint id;\n \n assert(vu_dev);\n assert(fd >= 0);\n \n vdev_scsi = container_of(vu_dev, VusDev, vu_dev);\n- id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,\n- (gpointer)(uintptr_t)fd);\n- if (id) {\n- GSource *vus_src = g_main_context_find_source_by_id(NULL, id);\n- assert(vus_src);\n- g_source_destroy(vus_src);\n- (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd);\n- }\n+ g_hash_table_remove(vdev_scsi->fdmap, GINT_TO_POINTER(fd));\n }\n \n static void vus_proc_req(VuDev *vu_dev, int idx)\n@@ -540,7 +517,7 @@ static void vdev_scsi_free(VusDev *vdev_scsi)\n close(vdev_scsi->server_sock);\n }\n g_main_loop_unref(vdev_scsi->loop);\n- g_tree_destroy(vdev_scsi->fdmap);\n+ g_hash_table_unref(vdev_scsi->fdmap);\n g_free(vdev_scsi);\n }\n \n@@ -551,7 +528,9 @@ static VusDev *vdev_scsi_new(int server_sock)\n vdev_scsi = g_new0(VusDev, 1);\n vdev_scsi->server_sock = server_sock;\n vdev_scsi->loop = g_main_loop_new(NULL, FALSE);\n- vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);\n+ vdev_scsi->fdmap =\n+ g_hash_table_new_full(NULL, NULL, NULL,\n+ (GDestroyNotify) g_source_destroy);\n \n return vdev_scsi;\n }\n","prefixes":["v2","23/27"]}