diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-03-09 16:47:44 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-03-09 16:47:44 +0000 |
| commit | 779ece3ce001d7edc79e5dce22816dde9f61ed27 (patch) | |
| tree | a399111a88528a71668ad657a8fecb81e24b2de6 /winsup/cygwin/pipe.cc | |
| parent | e7b5eaaac9c1c05b033c40228ac0662774c9a45b (diff) | |
| download | cygnal-779ece3ce001d7edc79e5dce22816dde9f61ed27.tar.gz cygnal-779ece3ce001d7edc79e5dce22816dde9f61ed27.tar.bz2 cygnal-779ece3ce001d7edc79e5dce22816dde9f61ed27.zip | |
* errno.cc (errmap): Change mapping of NO_SYSTEM_RESOURCES to EFBIG.
* fhandler.cc (MAX_OVERLAPPED_WRITE_LEN): New constant.
(MIN_OVERLAPPED_WRITE_LEN): Ditto.
(fhandler_base_overlapped::close): Accommodate change in arguments to
wait_overlapped.
(fhandler_base_overlapped::setup_overlapped): Add __stdcall and regparm
modifiers.
(fhandler_base_overlapped::destroy_overlapped): Ditto.
(fhandler_base_overlapped::has_ongoing_io): Ditto.
(fhandler_base_overlapped::wait_overlapped): Modify to return an enum returning
various states. Accept nonblocking parameter.
(fhandler_base_overlapped::read_overlapped): Add __stdcall and regparm
modifiers. Rework to attempt to be smarter about reacting to states returned
by wait_overlapped.
(fhandler_base_overlapped::write_overlapped): Ditto. Add fallback option for
when wait_overlapped detects that smaller chunks must be written.
(fhandler_base_overlapped::write_overlapped_fallback): Ditto.
* fhandler.h (DEFAULT_PIPEBUFSIZE): Move definition here from pipe.cc.
(fhandler_base::has_ongoing_io): Define with __stdcall and regparm modifiers.
(fhandler_base_overlapped::wait_return): New enum.
(fhandler_base_overlapped::max_atomic_write): New variable.
(fhandler_base_overlapped:: wait_overlapped): Accommodate changes mentioned
above to arguments and modifiers.
(fhandler_base_overlapped::setup_overlapped): Ditto for modifiers.
(fhandler_base_overlapped::read_overlapped): Ditto.
(fhandler_base_overlapped::write_overlapped): Ditto.
(fhandler_base_overlapped::destroy_overlapped): Ditto.
(fhandler_base_overlapped::has_ongoing_io): Ditto.
(fhandler_base_overlapped::fhandler_base_overlapped): Zero max_atomic_write.
* fhandler_fifo.cc (fhandler_fifo::fhandler_fifo): Set max_atomic_write to the
size of the DEFAULT_PIPEBUFSIZE.
(fhandler_fifo::wait): Accommodate change in arguments to wait_overlapped.
* pipe.cc (fhandler_pipe::fhandler_pipe): Set max_atomic_write to the size of
the DEFAULT_PIPEBUFSIZE.
(fhandler_pipe::create_selectable): Allow minimum size of DEFAULT_PIPEBUFSIZE.
(DEFAULT_PIPEBUFSIZE): Delete here, move to fhandler.h.
Diffstat (limited to 'winsup/cygwin/pipe.cc')
| -rw-r--r-- | winsup/cygwin/pipe.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc index 2f3bebe2c..2a44839f9 100644 --- a/winsup/cygwin/pipe.cc +++ b/winsup/cygwin/pipe.cc @@ -1,7 +1,7 @@ /* pipe.cc: pipe for Cygwin. Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Hat, Inc. + 2008, 2009, 2010, 2011 Hat, Inc. This file is part of Cygwin. @@ -26,6 +26,7 @@ details. */ fhandler_pipe::fhandler_pipe () : fhandler_base_overlapped (), popen_pid (0) { + max_atomic_write = DEFAULT_PIPEBUFSIZE; need_fork_fixup (true); uninterruptible_io (true); } @@ -217,8 +218,8 @@ fhandler_pipe::create_selectable (LPSECURITY_ATTRIBUTES sa_ptr, HANDLE& r, r = w = INVALID_HANDLE_VALUE; /* Ensure that there is enough pipe buffer space for atomic writes. */ - if (psize < PIPE_BUF) - psize = PIPE_BUF; + if (psize < DEFAULT_PIPEBUFSIZE) + psize = DEFAULT_PIPEBUFSIZE; char pipename[MAX_PATH]; const size_t len = __small_sprintf (pipename, PIPE_INTRO "%S-", @@ -373,8 +374,6 @@ fhandler_pipe::fstatvfs (struct statvfs *sfs) return -1; } -#define DEFAULT_PIPEBUFSIZE 65536 - extern "C" int pipe (int filedes[2]) { |