From patchwork Tue Jul 5 13:29:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Dirk_M=C3=BCller?= X-Patchwork-Id: 12906604 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 851E2C43334 for ; Tue, 5 Jul 2022 13:53:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232758AbiGENxg (ORCPT ); Tue, 5 Jul 2022 09:53:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231289AbiGENxH (ORCPT ); Tue, 5 Jul 2022 09:53:07 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4DDA24BF1 for ; Tue, 5 Jul 2022 06:29:57 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 6C8ED1FED2; Tue, 5 Jul 2022 13:29:56 +0000 (UTC) Received: from oldboy.suse.de (unknown [10.168.4.145]) by relay2.suse.de (Postfix) with ESMTP id 5A6952C141; Tue, 5 Jul 2022 13:29:56 +0000 (UTC) From: =?utf-8?q?Dirk_M=C3=BCller?= To: io-uring@vger.kernel.org Cc: =?utf-8?q?Dirk_M=C3=BCller?= Subject: [PATCH] Handle EINTR in tests Date: Tue, 5 Jul 2022 15:29:39 +0200 Message-Id: <20220705132939.7744-1-dirk@dmllr.de> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org On an otherwise busy machine the test suite is quite flaky. Restart the syscalls that are aborted with EINTR. Signed-off-by: Dirk Müller --- test/ce593a6c480a.c | 5 ++++- test/io-cancel.c | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/ce593a6c480a.c b/test/ce593a6c480a.c index 1c5669e..4c71fbc 100644 --- a/test/ce593a6c480a.c +++ b/test/ce593a6c480a.c @@ -111,7 +111,10 @@ int main(int argc, char *argv[]) (void*) (intptr_t) other_fd); /* Wait on the event fd for an event to be ready */ - ret = read(loop_fd, buf, 8); + do { + ret = read(loop_fd, buf, 8); + } while (ret < 0 && errno == EINTR); + if (ret < 0) { perror("read"); return T_EXIT_FAIL; diff --git a/test/io-cancel.c b/test/io-cancel.c index d5e3ae9..13bf84f 100644 --- a/test/io-cancel.c +++ b/test/io-cancel.c @@ -365,8 +365,13 @@ static int test_cancel_req_across_fork(void) exit(0); } else { int wstatus; + pid_t childpid; - if (waitpid(p, &wstatus, 0) == (pid_t)-1) { + do { + childpid = waitpid(p, &wstatus, 0); + } while (childpid == (pid_t)-1 && errno == EINTR); + + if (childpid == (pid_t)-1) { perror("waitpid()"); return 1; }