From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DCB064320A; Thu, 26 Oct 2023 19:11:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCBFD40A76; Thu, 26 Oct 2023 19:11:45 +0200 (CEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id 0F5F340A6D for ; Thu, 26 Oct 2023 19:11:44 +0200 (CEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1c5cd27b1acso10144415ad.2 for ; Thu, 26 Oct 2023 10:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1698340303; x=1698945103; darn=dpdk.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rQN8UFzsSVcfIaC0+2M1k6tpz1w0Bp4NxDKbZ+lI7PQ=; b=Oav2gluIUhV8oHFQF7xdfgsO/D5vHUqr10c7qTiVhjuI9RXlEbyFvRku7PFxKxfWSN OKPW0G5IetXX7NyRZtcLsEgE/e6lJpZyoF3PfSWhK5/o7bGAwJYgrgZXKdHOCCe0rxnT mWvqg/jlXWJaTsQ6thXDyqng0vhvmt9JB4KS6R9GHYCV8rHZhrdAwVt2XaOslvLm/gL/ qB1dh3ww0QshvtZ2iAo1z/kmGWyo6f75C/CdCjfooHhly5HrjyCxl7bnc72sJmChjFDi AX8zWMeuXxTknxkvveHC+vQJWOSmF2QW2r9KIGQ6XAOaCoRTsZsY+Ru9Kef3GVhUvs7R irsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698340303; x=1698945103; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rQN8UFzsSVcfIaC0+2M1k6tpz1w0Bp4NxDKbZ+lI7PQ=; b=vyRwRxQ5f2xMJxbdfRAwGu/rVwjv2wshxJaoAdgxyAPCmkkKMOiL5WsqOUyO4vt2lD v3T4wvTPRV61US9N8RmGm5MyYzY98yZ0BKM172xt94303SPXZOV/j29CHpMvzfkk7yeH 1tYMjeKM8LepRLI6GW6SNquoOmmhdtvHGlJljAUjoVZfK/xmryxYamkmRmr1a8kg5RfS 64GG/UizZjyxDcz4oT+OygBRDMDv8FD4R8PA8Ph6ckLV2qfO92yWLg+Sk1xh/W6eOS57 mF0C405fKUUzLfKkcVlK5mM90dYDR4n0Uig/l3NnwQ9YoInO8y1Fru6aQBGXWXn4oVks jQ9g== X-Gm-Message-State: AOJu0Yz5WwgaPuKB9Yor3shWpOuzWC6/kSSO+8I1vIvvttrCpA2wDo8J NWqS0v/WjdgJkgWfwf+rvLIOhfx5on4DVD1IQNFg1A== X-Google-Smtp-Source: AGHT+IECazqTPHYTbaRBvbdofGHuQ2kxwpqFbFAkMMpjYSai13zWRu2NEgloVlu1lNQmXUt7nxvjog== X-Received: by 2002:a17:902:e5c1:b0:1ca:86db:1d44 with SMTP id u1-20020a170902e5c100b001ca86db1d44mr136239plf.50.1698340302986; Thu, 26 Oct 2023 10:11:42 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id 13-20020a170902c24d00b001c74876f018sm11347484plg.18.2023.10.26.10.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 10:11:42 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: david.marchand@redhat.com, Stephen Hemminger Subject: [PATCH] testpmd: fix early exit from signal Date: Thu, 26 Oct 2023 10:11:33 -0700 Message-Id: <20231026171133.250715-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Other signals may occur causing read to get interrupted. Loop until quit flag is set by signal, a character is entered, or end of file. This fixes bug where testpmd would exit early because of signal used by TAP device. Bugzilla ID: 1305 Fixes: 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal") Signed-off-by: Stephen Hemminger --- app/test-pmd/testpmd.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 595b77748c2a..619a59f5b891 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -11,7 +11,6 @@ #include #ifndef RTE_EXEC_ENV_WINDOWS #include -#include #endif #include #include @@ -4743,25 +4742,18 @@ main(int argc, char** argv) } } else { char c; - fd_set fds; printf("Press enter to exit\n"); + while (f_quit == 0) { + /* end-of-file or any character exits loop */ + if (read(0, &c, 1) >= 0) + break; - FD_ZERO(&fds); - FD_SET(0, &fds); - - /* wait for signal or enter */ - ret = select(1, &fds, NULL, NULL, NULL); - if (ret < 0 && errno != EINTR) - rte_exit(EXIT_FAILURE, - "Select failed: %s\n", - strerror(errno)); - - /* if got enter then consume it */ - if (ret == 1 && read(0, &c, 1) < 0) - rte_exit(EXIT_FAILURE, - "Read failed: %s\n", - strerror(errno)); + if (errno == EINTR) + continue; + rte_exit(EXIT_FAILURE, "Read failed: %s\n", + strerror(errno)); + } } } -- 2.39.2