diff options
author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2021-09-16 22:23:12 +0300 |
---|---|---|
committer | Ken Brown <kbrown@cornell.edu> | 2021-09-16 22:53:57 +0300 |
commit | 9814cfd8f693f61e602a5436b3fd6502907bfb11 (patch) | |
tree | 945f1995a59ce3cd8f3716d3f69c9878634a600d | |
parent | 199482654b07e0603f668caaba8cddb2070cfdb8 (diff) |
Cygwin: pipe, fifo: Move query_hdl and hdl_cnt_mtx to fhandler_pipe.
- query_hdl and hdl_cnt_mtx are moved from fhandler_pipe_fifo to
fhandler_pipe. Then reader_closed() is changed to virtual and
overridden in fhandler_pipe.
-rw-r--r-- | winsup/cygwin/fhandler.h | 27 | ||||
-rw-r--r-- | winsup/cygwin/fhandler_pipe.cc | 2 |
2 files changed, 14 insertions, 15 deletions
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 31edb1822..61113e698 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1175,26 +1175,13 @@ class fhandler_pipe_fifo: public fhandler_base { protected: size_t pipe_buf_size; - HANDLE query_hdl; - HANDLE hdl_cnt_mtx; virtual void release_select_sem (const char *) {}; public: fhandler_pipe_fifo (); - HANDLE get_query_handle () const { return query_hdl; } - void close_query_handle () - { - if (query_hdl) - { - CloseHandle (query_hdl); - query_hdl = NULL; - } - } - bool reader_closed (); - + virtual bool reader_closed () { return false; }; ssize_t __reg3 raw_write (const void *ptr, size_t len); - }; class fhandler_pipe: public fhandler_pipe_fifo @@ -1202,6 +1189,8 @@ class fhandler_pipe: public fhandler_pipe_fifo private: HANDLE read_mtx; pid_t popen_pid; + HANDLE query_hdl; + HANDLE hdl_cnt_mtx; void release_select_sem (const char *); public: fhandler_pipe (); @@ -1250,6 +1239,16 @@ public: return fh; } void set_pipe_non_blocking (bool nonblocking); + HANDLE get_query_handle () const { return query_hdl; } + void close_query_handle () + { + if (query_hdl) + { + CloseHandle (query_hdl); + query_hdl = NULL; + } + } + bool reader_closed (); }; #define CYGWIN_FIFO_PIPE_NAME_LEN 47 diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc index 2068a943e..73ace3ac5 100644 --- a/winsup/cygwin/fhandler_pipe.cc +++ b/winsup/cygwin/fhandler_pipe.cc @@ -393,7 +393,7 @@ fhandler_pipe::raw_read (void *ptr, size_t& len) } bool -fhandler_pipe_fifo::reader_closed () +fhandler_pipe::reader_closed () { if (!query_hdl) return false; |