diff options
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 21 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.h | 30 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_fifo.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_mailslot.cc | 8 | ||||
| -rw-r--r-- | winsup/cygwin/pipe.cc | 12 |
6 files changed, 39 insertions, 40 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index b3c051ca0..6bd2b500c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,26 @@ 2011-05-05 Christopher Faylor <me.cygwin2011@cgf.cx> + * fhandler.cc (fhandler_base_overlapped::raw_read): Rename from + read_overlapped. + (fhandler_base_overlapped::raw_e): Rename from write_overlapped. + * fhandler.h (fhandler_*::raw_read): Add reparm decoration. + (fhandler_*::raw_write): Ditto. + (fhandler_base_overlapped::raw_read): Rename from read_overlapped. + (fhandler_base_overlapped::raw_write): Rename from write_overlapped. + (fhandler_pipe::raw_read): Delete. + (fhandler_pipe::raw_write): Ditto. + (fhandler_mailslot::raw_read): Ditto. + * fhandler_fifo.cc (fhandler_fifo::raw_read): Reflect read_overlapped + -> raw_read rename. + (fhandler_fifo::raw_write): Ditto. + * fhandler_mailslot.cc (fhandler_mailslot::raw_read): Delete. + (fhandler_mailslot::raw_write): Reflect read_overlapped -> raw_read + rename. + * pipe.cc (fhandler_pipe::raw_read): Delete. + (fhandler_pipe::raw_write): Ditto. + +2011-05-05 Christopher Faylor <me.cygwin2011@cgf.cx> + * fork.cc (fork): Clear PID_REAPED. * pinfo.cc (pinfo_init): Ditto. (pinfo::init): Check for PID_REAPED. diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index a4a256383..9fad7ce4d 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -1817,7 +1817,7 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte } void __stdcall __attribute__ ((regparm (3))) -fhandler_base_overlapped::read_overlapped (void *ptr, size_t& len) +fhandler_base_overlapped::raw_read (void *ptr, size_t& len) { DWORD nbytes; if (has_ongoing_io ()) @@ -1847,7 +1847,7 @@ fhandler_base_overlapped::read_overlapped (void *ptr, size_t& len) } ssize_t __stdcall __attribute__ ((regparm (3))) -fhandler_base_overlapped::write_overlapped (const void *ptr, size_t len) +fhandler_base_overlapped::raw_write (const void *ptr, size_t len) { size_t nbytes; if (has_ongoing_io ()) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index fc76c3f26..14922b8b9 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -360,8 +360,8 @@ public: virtual class fhandler_console *is_console () { return 0; } virtual int is_windows () {return 0; } - virtual void __stdcall raw_read (void *ptr, size_t& ulen); - virtual ssize_t __stdcall raw_write (const void *ptr, size_t ulen); + virtual void __stdcall raw_read (void *ptr, size_t& ulen) __attribute__ ((regparm (3))); + virtual ssize_t __stdcall raw_write (const void *ptr, size_t ulen) __attribute__ ((regparm (3))); /* Virtual accessor functions to hide the fact that some fd's have two handles. */ @@ -567,9 +567,8 @@ public: wait_return __stdcall wait_overlapped (bool, bool, DWORD *, bool, DWORD = 0) __attribute__ ((regparm (3))); int __stdcall setup_overlapped () __attribute__ ((regparm (1))); void __stdcall destroy_overlapped () __attribute__ ((regparm (1))); - void __stdcall read_overlapped (void *ptr, size_t& len) __attribute__ ((regparm (3))); - ssize_t __stdcall write_overlapped (const void *ptr, size_t len) __attribute__ ((regparm (3))); - __attribute__ ((regparm (3))); + virtual void __stdcall raw_read (void *ptr, size_t& len) __attribute__ ((regparm (3))); + virtual ssize_t __stdcall raw_write (const void *ptr, size_t len) __attribute__ ((regparm (3))); OVERLAPPED *&get_overlapped () {return overlapped;} OVERLAPPED *get_overlapped_buffer () {return &io_status;} void set_overlapped (OVERLAPPED *ov) {overlapped = ov;} @@ -603,8 +602,6 @@ public: select_record *select_write (select_stuff *); select_record *select_except (select_stuff *); char *get_proc_fd_name (char *buf); - void __stdcall raw_read (void *ptr, size_t& len); - ssize_t __stdcall raw_write (const void *, size_t); int open (int flags, mode_t mode = 0); int dup (fhandler_base *child); int ioctl (unsigned int cmd, void *); @@ -637,8 +634,8 @@ class fhandler_fifo: public fhandler_base_overlapped char *fifo_name (char *) __attribute__ ((regparm (2))); public: fhandler_fifo (); - void __stdcall raw_read (void *, size_t&); - ssize_t __stdcall raw_write (const void *, size_t); + void __stdcall raw_read (void *, size_t&) __attribute__ ((regparm (3))); + ssize_t __stdcall raw_write (const void *, size_t) __attribute__ ((regparm (3))); int open (int, mode_t); int close (); int dup (fhandler_base *child); @@ -657,8 +654,7 @@ class fhandler_mailslot : public fhandler_base_overlapped fhandler_mailslot (); int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2))); int open (int flags, mode_t mode = 0); - void __stdcall raw_read (void *ptr, size_t& len); - ssize_t __stdcall raw_write (const void *, size_t); + ssize_t __stdcall raw_write (const void *, size_t) __attribute__ ((regparm (3))); int ioctl (unsigned int cmd, void *); select_record *select_read (select_stuff *); }; @@ -732,8 +728,8 @@ class fhandler_dev_floppy: public fhandler_dev_raw int open (int flags, mode_t mode = 0); int close (); int dup (fhandler_base *child); - void __stdcall raw_read (void *ptr, size_t& ulen); - ssize_t __stdcall raw_write (const void *ptr, size_t ulen); + void __stdcall raw_read (void *ptr, size_t& ulen) __attribute__ ((regparm (3))); + ssize_t __stdcall raw_write (const void *ptr, size_t ulen) __attribute__ ((regparm (3))); _off64_t lseek (_off64_t offset, int whence); int ioctl (unsigned int cmd, void *buf); }; @@ -756,8 +752,8 @@ class fhandler_dev_tape: public fhandler_dev_raw virtual int open (int flags, mode_t mode = 0); virtual int close (); - void __stdcall raw_read (void *ptr, size_t& ulen); - ssize_t __stdcall raw_write (const void *ptr, size_t ulen); + void __stdcall raw_read (void *ptr, size_t& ulen) __attribute__ ((regparm (3))); + ssize_t __stdcall raw_write (const void *ptr, size_t ulen) __attribute__ ((regparm (3))); virtual _off64_t lseek (_off64_t offset, int whence); @@ -855,8 +851,8 @@ class fhandler_serial: public fhandler_base int init (HANDLE h, DWORD a, mode_t flags); void overlapped_setup (); int dup (fhandler_base *child); - void __stdcall raw_read (void *ptr, size_t& ulen); - ssize_t __stdcall raw_write (const void *ptr, size_t ulen); + void __stdcall raw_read (void *ptr, size_t& ulen) __attribute__ ((regparm (3))); + ssize_t __stdcall raw_write (const void *ptr, size_t ulen) __attribute__ ((regparm (3))); int tcsendbreak (int); int tcdrain (); int tcflow (int); diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index 72a5bd6c1..8c0fbc9b0 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -265,7 +265,7 @@ fhandler_fifo::raw_read (void *in_ptr, size_t& len) else { size_t prev_len = len; - read_overlapped (in_ptr, len); + fhandler_base_overlapped::raw_read (in_ptr, len); if (len) break; wait_state = fifo_wait_for_next_client; @@ -279,7 +279,7 @@ fhandler_fifo::raw_read (void *in_ptr, size_t& len) ssize_t __stdcall fhandler_fifo::raw_write (const void *ptr, size_t len) { - return wait (true) ? write_overlapped (ptr, len) : -1; + return wait (true) ? fhandler_base_overlapped::raw_write (ptr, len) : -1; } int __stdcall diff --git a/winsup/cygwin/fhandler_mailslot.cc b/winsup/cygwin/fhandler_mailslot.cc index 3cea8b45c..5d977e767 100644 --- a/winsup/cygwin/fhandler_mailslot.cc +++ b/winsup/cygwin/fhandler_mailslot.cc @@ -143,12 +143,6 @@ fhandler_mailslot::open (int flags, mode_t mode) return res; } -void __stdcall -fhandler_mailslot::raw_read (void *in_ptr, size_t& len) -{ - read_overlapped (in_ptr, len); -} - ssize_t __stdcall fhandler_mailslot::raw_write (const void *ptr, size_t len) { @@ -160,7 +154,7 @@ fhandler_mailslot::raw_write (const void *ptr, size_t len) memcpy (buf, ptr, len); return raw_write (buf, 427); } - return write_overlapped (ptr, len); + return fhandler_base_overlapped::raw_write (ptr, len); } int diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc index 9fa52cd5e..3995aa557 100644 --- a/winsup/cygwin/pipe.cc +++ b/winsup/cygwin/pipe.cc @@ -171,18 +171,6 @@ fhandler_pipe::get_proc_fd_name (char *buf) return buf; } -void -fhandler_pipe::raw_read (void *in_ptr, size_t& in_len) -{ - return read_overlapped (in_ptr, in_len); -} - -int -fhandler_pipe::raw_write (const void *ptr, size_t len) -{ - return write_overlapped (ptr, len); -} - int fhandler_pipe::dup (fhandler_base *child) { |