From nobody Mon Feb 9 12:14:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550166762221913.7796936462263; Thu, 14 Feb 2019 09:52:42 -0800 (PST) Received: from localhost ([127.0.0.1]:52437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guLBe-0007Rp-4q for importer@patchew.org; Thu, 14 Feb 2019 12:52:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guL4K-0002MK-A6 for qemu-devel@nongnu.org; Thu, 14 Feb 2019 12:45:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guKvf-0003NL-9I for qemu-devel@nongnu.org; Thu, 14 Feb 2019 12:36:08 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39545) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guKvf-0003Mr-2m for qemu-devel@nongnu.org; Thu, 14 Feb 2019 12:36:07 -0500 Received: by mail-wr1-x443.google.com with SMTP id l5so6320983wrw.6 for ; Thu, 14 Feb 2019 09:36:07 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s3sm1906796wmj.23.2019.02.14.09.36.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 09:36:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DSulPWQgJdJCTZCEmW1X1jrLHeqMGDLh5xF76rbzgr8=; b=Rfog5NQ4f9k90dwylyQC58/Jr1A++N25RNOZ4uU8aoIYDU+PFBhj0/X1ZRqoUUBEam cK+PYWJeA8qoj47MEoRUgGcgZMLvkWq+7hhW3KoSpwKSpmDSmSZrdmP6mU4/JbpT+IhN DUveZBLeTnwoJDJSOd5Oj1rwzoxzpbiXRyVQgapVkwOrEz78uD+sj0407vDoclsuxr3n x9UqwcE33ZrBPD9kcWpGLlkdb3qGwScG+ZNXNXnIjwAa6FupV88dJXgG9stDEDvrfdDM WhRCh8C3uXf1uD7++0VGAa+jZS15v8vsLQnXlmgNPBhD8fJaFwh/SHaAiLt5xUFcLb5J IiMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DSulPWQgJdJCTZCEmW1X1jrLHeqMGDLh5xF76rbzgr8=; b=PbW6oFy8ciZ0zmjZb5+tmarIxPGmF/vs0tP+z5f4cptplIyxrCoxLqGrCZA4AQorjT +/hrpiyfQndyklzpBSdshHoIjHevM53Or9QUawRV2elGXedg+8VwSi8B8+998y8q+udV d7qd/JzVWZ0phYtzBBo6mlbrCE6/LwN0eC/td/BHnHF+STRYlEOefVFf6/64GuhbnPMz H7quv8+8vnXS7Dyubs+/QYlq2DyZ1wfMY+Nteu3CdtVvem75djhuc4DhXVRKj8mgtk3j SDh8mUr6pntl8U7i3uJXODGK1wwKdt3CjG0M7X9YDR86Y72CLgMLrp9+xYBe32rhrJTG 6nAQ== X-Gm-Message-State: AHQUAuZ+uH+E8w3mh0giA57B1dTTSjXrnRRAFCG0ZRPvAe6ZeMJSJQQi amnEgt6UC5LAFJ4viebn47/b7Jib X-Google-Smtp-Source: AHgI3IaalsDWw9q2mfou9oqkZyh2zIxkzeVgF42iFwv5AO6qyuZ7bZ+alq1A21JwMfQZMTFexpoeQw== X-Received: by 2002:a5d:538a:: with SMTP id d10mr3745636wrv.121.1550165765750; Thu, 14 Feb 2019 09:36:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 18:35:54 +0100 Message-Id: <1550165756-21617-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550165756-21617-1-git-send-email-pbonzini@redhat.com> References: <1550165756-21617-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 7/9] vhost-user-test: create a main loop per TestServer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This makes the tests more independent and removes the need to defer test_se= rver_free via an idle event source. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini Message-Id: <1543851204-41186-13-git-send-email-pbonzini@redhat.com> --- tests/vhost-user-test.c | 53 +++++++++++++++++++++++++--------------------= ---- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index cdbdf3d..33030e0 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -146,6 +146,9 @@ typedef struct TestServer { int fds_num; int fds[VHOST_MEMORY_MAX_NREGIONS]; VhostUserMemory memory; + GMainContext *context; + GMainLoop *loop; + GThread *thread; GMutex data_mutex; GCond data_cond; int log_fd; @@ -495,6 +498,12 @@ static TestServer *test_server_new(const gchar *name) { TestServer *server =3D g_new0(TestServer, 1); =20 + server->context =3D g_main_context_new(); + server->loop =3D g_main_loop_new(server->context, FALSE); + + /* run the main loop thread so the chardev may operate */ + server->thread =3D g_thread_new(NULL, thread_function, server->loop); + server->socket_path =3D g_strdup_printf("%s/%s.sock", tmpfs, name); server->mig_path =3D g_strdup_printf("%s/%s.mig", tmpfs, name); server->chr_name =3D g_strdup_printf("chr-%s", name); @@ -524,13 +533,13 @@ static void test_server_create_chr(TestServer *server= , const gchar *opt) Chardev *chr; =20 chr_path =3D g_strdup_printf("unix:%s%s", server->socket_path, opt); - chr =3D qemu_chr_new(server->chr_name, chr_path, NULL); + chr =3D qemu_chr_new(server->chr_name, chr_path, server->context); g_free(chr_path); =20 g_assert_nonnull(chr); qemu_chr_fe_init(&server->chr, chr, &error_abort); qemu_chr_fe_set_handlers(&server->chr, chr_can_read, chr_read, - chr_event, NULL, server, NULL, true); + chr_event, NULL, server, server->context, tru= e); } =20 static void test_server_listen(TestServer *server) @@ -538,10 +547,19 @@ static void test_server_listen(TestServer *server) test_server_create_chr(server, ",server,nowait"); } =20 -static gboolean _test_server_free(TestServer *server) +static void test_server_free(TestServer *server) { int i; =20 + /* finish the helper thread and dispatch pending sources */ + g_main_loop_quit(server->loop); + g_thread_join(server->thread); + while (g_main_context_pending(NULL)) { + g_main_context_iteration(NULL, TRUE); + } + g_main_loop_unref(server->loop); + g_main_context_unref(server->context); + qemu_chr_fe_deinit(&server->chr, true); =20 for (i =3D 0; i < server->fds_num; i++) { @@ -563,13 +581,6 @@ static gboolean _test_server_free(TestServer *server) qpci_free_pc(server->bus); =20 g_free(server); - - return FALSE; -} - -static void test_server_free(TestServer *server) -{ - g_idle_add((GSourceFunc)_test_server_free, server); } =20 static void wait_for_log_fd(TestServer *s) @@ -728,7 +739,7 @@ static void test_migrate(void) sizeof(TestMigrateSource)); ((TestMigrateSource *)source)->src =3D s; ((TestMigrateSource *)source)->dest =3D dest; - g_source_attach(source, NULL); + g_source_attach(source, s->context); =20 /* slow down migration to have time to fiddle with log */ /* TODO: qtest could learn to break on some places */ @@ -825,6 +836,7 @@ connect_thread(gpointer data) static void test_reconnect_subprocess(void) { TestServer *s =3D test_server_new("reconnect"); + GSource *src; char *cmd; =20 g_thread_new("connect", connect_thread, s); @@ -842,7 +854,10 @@ static void test_reconnect_subprocess(void) /* reconnect */ s->fds_num =3D 0; s->rings =3D 0; - g_idle_add(reconnect_cb, s); + src =3D g_idle_source_new(); + g_source_set_callback(src, reconnect_cb, s, NULL); + g_source_attach(src, s->context); + g_source_unref(src); g_assert(wait_for_fds(s)); wait_for_rings_started(s, 2); =20 @@ -974,8 +989,6 @@ int main(int argc, char **argv) const char *hugefs; int ret; char template[] =3D "/tmp/vhost-test-XXXXXX"; - GMainLoop *loop; - GThread *thread; =20 g_test_init(&argc, &argv, NULL); =20 @@ -997,10 +1010,6 @@ int main(int argc, char **argv) } #endif =20 - loop =3D g_main_loop_new(NULL, FALSE); - /* run the main loop thread so the chardev may operate */ - thread =3D g_thread_new(NULL, thread_function, loop); - if (qemu_memfd_check(0)) { qtest_add_data_func("/vhost-user/read-guest-mem/memfd", GINT_TO_POINTER(TEST_MEMFD_YES), @@ -1028,14 +1037,6 @@ int main(int argc, char **argv) =20 /* cleanup */ =20 - /* finish the helper thread and dispatch pending sources */ - g_main_loop_quit(loop); - g_thread_join(thread); - while (g_main_context_pending(NULL)) { - g_main_context_iteration (NULL, TRUE); - } - g_main_loop_unref(loop); - ret =3D rmdir(tmpfs); if (ret !=3D 0) { g_test_message("unable to rmdir: path (%s): %s\n", --=20 1.8.3.1