libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-21 16:26:12 +08:00
Code Issues Projects Releases Wiki Activity

* fhandler.cc (fhandler_base_overlapped::raw_read): Rename from

Browse Source 
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.
This commit is contained in:
Christopher Faylor 2011-05-05 17:44:42 +00:00
parent b8424c5e9a
commit 8ea8474947
6 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,24 @@
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> 2011-05-05 Christopher Faylor <me.cygwin2011@cgf.cx>
* fork.cc (fork): Clear PID_REAPED. * fork.cc (fork): Clear PID_REAPED.

4
winsup/cygwin/fhandler.cc
View File

@ -1817,7 +1817,7 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte
} }
void __stdcall __attribute__ ((regparm (3))) 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; DWORD nbytes;
if (has_ongoing_io ()) if (has_ongoing_io ())
@ -1847,7 +1847,7 @@ fhandler_base_overlapped::read_overlapped (void *ptr, size_t& len)
} }
ssize_t __stdcall __attribute__ ((regparm (3))) 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; size_t nbytes;
if (has_ongoing_io ()) if (has_ongoing_io ())

30
winsup/cygwin/fhandler.h
View File

@ -360,8 +360,8 @@ public:
virtual class fhandler_console *is_console () { return 0; } virtual class fhandler_console *is_console () { return 0; }
virtual int is_windows () {return 0; } virtual int is_windows () {return 0; }
virtual void __stdcall raw_read (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); virtual ssize_t __stdcall raw_write (const void *ptr, size_t ulen) __attribute__ ((regparm (3)));
/* Virtual accessor functions to hide the fact /* Virtual accessor functions to hide the fact
that some fd's have two handles. */ 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))); wait_return __stdcall wait_overlapped (bool, bool, DWORD *, bool, DWORD = 0) __attribute__ ((regparm (3)));
int __stdcall setup_overlapped () __attribute__ ((regparm (1))); int __stdcall setup_overlapped () __attribute__ ((regparm (1)));
void __stdcall destroy_overlapped () __attribute__ ((regparm (1))); void __stdcall destroy_overlapped () __attribute__ ((regparm (1)));
void __stdcall read_overlapped (void *ptr, size_t& len) __attribute__ ((regparm (3))); virtual void __stdcall raw_read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
ssize_t __stdcall write_overlapped (const void *ptr, size_t len) __attribute__ ((regparm (3))); virtual ssize_t __stdcall raw_write (const void *ptr, size_t len) __attribute__ ((regparm (3)));
__attribute__ ((regparm (3)));
OVERLAPPED *&get_overlapped () {return overlapped;} OVERLAPPED *&get_overlapped () {return overlapped;}
OVERLAPPED *get_overlapped_buffer () {return &io_status;} OVERLAPPED *get_overlapped_buffer () {return &io_status;}
void set_overlapped (OVERLAPPED *ov) {overlapped = ov;} void set_overlapped (OVERLAPPED *ov) {overlapped = ov;}
@ -603,8 +602,6 @@ public:
select_record *select_write (select_stuff *); select_record *select_write (select_stuff *);
select_record *select_except (select_stuff *); select_record *select_except (select_stuff *);
char *get_proc_fd_name (char *buf); 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 open (int flags, mode_t mode = 0);
int dup (fhandler_base *child); int dup (fhandler_base *child);
int ioctl (unsigned int cmd, void *); int ioctl (unsigned int cmd, void *);
@ -637,8 +634,8 @@ class fhandler_fifo: public fhandler_base_overlapped
char *fifo_name (char *) __attribute__ ((regparm (2))); char *fifo_name (char *) __attribute__ ((regparm (2)));
public: public:
fhandler_fifo (); fhandler_fifo ();
void __stdcall raw_read (void *, size_t&); void __stdcall raw_read (void *, size_t&) __attribute__ ((regparm (3)));
ssize_t __stdcall raw_write (const void *, size_t); ssize_t __stdcall raw_write (const void *, size_t) __attribute__ ((regparm (3)));
int open (int, mode_t); int open (int, mode_t);
int close (); int close ();
int dup (fhandler_base *child); int dup (fhandler_base *child);
@ -657,8 +654,7 @@ class fhandler_mailslot : public fhandler_base_overlapped
fhandler_mailslot (); fhandler_mailslot ();
int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2))); int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
int open (int flags, mode_t mode = 0); 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) __attribute__ ((regparm (3)));
ssize_t __stdcall raw_write (const void *, size_t);
int ioctl (unsigned int cmd, void *); int ioctl (unsigned int cmd, void *);
select_record *select_read (select_stuff *); 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 open (int flags, mode_t mode = 0);
int close (); int close ();
int dup (fhandler_base *child); int dup (fhandler_base *child);
void __stdcall raw_read (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); ssize_t __stdcall raw_write (const void *ptr, size_t ulen) __attribute__ ((regparm (3)));
_off64_t lseek (_off64_t offset, int whence); _off64_t lseek (_off64_t offset, int whence);
int ioctl (unsigned int cmd, void *buf); 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 open (int flags, mode_t mode = 0);
virtual int close (); virtual int close ();
void __stdcall raw_read (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); ssize_t __stdcall raw_write (const void *ptr, size_t ulen) __attribute__ ((regparm (3)));
virtual _off64_t lseek (_off64_t offset, int whence); 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); int init (HANDLE h, DWORD a, mode_t flags);
void overlapped_setup (); void overlapped_setup ();
int dup (fhandler_base *child); int dup (fhandler_base *child);
void __stdcall raw_read (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); ssize_t __stdcall raw_write (const void *ptr, size_t ulen) __attribute__ ((regparm (3)));
int tcsendbreak (int); int tcsendbreak (int);
int tcdrain (); int tcdrain ();
int tcflow (int); int tcflow (int);

4
winsup/cygwin/fhandler_fifo.cc
View File

@ -265,7 +265,7 @@ fhandler_fifo::raw_read (void *in_ptr, size_t& len)
else else
{ {
size_t prev_len = len; size_t prev_len = len;
read_overlapped (in_ptr, len); fhandler_base_overlapped::raw_read (in_ptr, len);
if (len) if (len)
break; break;
wait_state = fifo_wait_for_next_client; wait_state = fifo_wait_for_next_client;
@ -279,7 +279,7 @@ fhandler_fifo::raw_read (void *in_ptr, size_t& len)
ssize_t __stdcall ssize_t __stdcall
fhandler_fifo::raw_write (const void *ptr, size_t len) 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 int __stdcall

8
winsup/cygwin/fhandler_mailslot.cc
View File

@ -143,12 +143,6 @@ fhandler_mailslot::open (int flags, mode_t mode)
return res; return res;
} }
void __stdcall
fhandler_mailslot::raw_read (void *in_ptr, size_t& len)
{
read_overlapped (in_ptr, len);
}
ssize_t __stdcall ssize_t __stdcall
fhandler_mailslot::raw_write (const void *ptr, size_t len) 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); memcpy (buf, ptr, len);
return raw_write (buf, 427); return raw_write (buf, 427);
} }
return write_overlapped (ptr, len); return fhandler_base_overlapped::raw_write (ptr, len);
} }
int int

12
winsup/cygwin/pipe.cc
View File

@ -171,18 +171,6 @@ fhandler_pipe::get_proc_fd_name (char *buf)
return 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 int
fhandler_pipe::dup (fhandler_base *child) fhandler_pipe::dup (fhandler_base *child)
{ {