From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2210) id 33859396EC8C; Fri, 8 May 2020 11:29:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33859396EC8C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: FIFO: remove the arm method X-Act-Checkin: newlib-cygwin X-Git-Author: Ken Brown X-Git-Refname: refs/heads/master X-Git-Oldrev: 9b2afd78ce612f4d1fda6d17149bb0c78b4a0e1c X-Git-Newrev: 25e8727368a1565dac565bf89c5effced5f0ada2 Message-Id: <20200508112927.33859396EC8C@sourceware.org> Date: Fri, 8 May 2020 11:29:27 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 11:29:27 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=25e8727368a1565dac565bf89c5effced5f0ada2 commit 25e8727368a1565dac565bf89c5effced5f0ada2 Author: Ken Brown Date: Thu Apr 23 08:14:05 2020 -0400 Cygwin: FIFO: remove the arm method There's no reason to check for errors when we set read_ready or write_ready. We don't do that for other events. Diff: --- winsup/cygwin/fhandler.h | 1 - winsup/cygwin/fhandler_fifo.cc | 34 +++------------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index c8f7a39a2..4d691a0fc 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1343,7 +1343,6 @@ public: void set_close_on_exec (bool val); void __reg3 raw_read (void *ptr, size_t& ulen); ssize_t __reg3 raw_write (const void *ptr, size_t ulen); - bool arm (HANDLE h); bool need_fixup_before () const { return reader; } int fixup_before_fork_exec (DWORD) { stop_listen_client (); return 0; } void init_fixup_before (); diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index fb20e5a7e..44919c19e 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -93,28 +93,6 @@ sec_user_cloexec (bool cloexec, PSECURITY_ATTRIBUTES sa, PSID sid) return cloexec ? sec_user_nih (sa, sid) : sec_user (sa, sid); } -bool inline -fhandler_fifo::arm (HANDLE h) -{ -#ifdef DEBUGGING - const char *what; - if (h == read_ready) - what = "reader"; - else - what = "writer"; - debug_only_printf ("arming %s", what); -#endif - - bool res = SetEvent (h); - if (!res) -#ifdef DEBUGGING - debug_printf ("SetEvent for %s failed, %E", what); -#else - debug_printf ("SetEvent failed, %E"); -#endif - return res; -} - static HANDLE create_event () { @@ -348,11 +326,7 @@ fhandler_fifo::listen_client_thread () api_fatal ("Can't add a client handler, %E"); /* Allow a writer to open. */ - if (!arm (read_ready)) - { - __seterrno (); - goto out; - } + SetEvent (read_ready); /* Listen for a writer to connect to the new client handler. */ fifo_client_handler& fc = fc_handler[nhandlers - 1]; @@ -555,10 +529,8 @@ fhandler_fifo::open (int flags, mode_t) if (NT_SUCCESS (status)) { set_pipe_non_blocking (get_handle (), flags & O_NONBLOCK); - if (!arm (write_ready)) - res = error_set_errno; - else - res = success; + SetEvent (write_ready); + res = success; goto out; } else if (STATUS_PIPE_NO_INSTANCE_AVAILABLE (status))