Thomas Quinot <quinot@act-europe.fr>
* g-socthi-vms.adb, g-socthi-mingw.adb, g-socthi-vxworks.ads:
(C_Writev): Change MSG_Forced_Flags to Constants.MSG_Forced_Flags as
there is no use of GNAT.Sockets.Constants.
Remove remaining pragma Import for C_Write
Remove C_Read and C_Write from internal implementation unit
GNAT.Sockets.Thin, as their usage for sockets is non-portable (using
the read and write functions from the system runtime library is fine
on UNIX but won't work under Windows).
* g-socket.adb: (Abort_Selector): Use C_Send instead of C_Write.
(Check_Selector): Use C_Recv instead of C_Read.
Selectors are the GNAT.Sockets abstraction to perform a select()
call on a set of descriptors. To allow abortion of an ongoing
select operation, some data is written to a dedicated socket that
is always monitored.
Under Windows, the write and read library functions cannot operate
on sockets, so we need to use send and recv instead, which is portable
across all supported platforms.
* g-socthi.ads: Remove C_Read and C_Write from internal implementation
unit GNAT.Sockets.Thin, as their usage for sockets is non-portable
(using the read and write functions from the system runtime library is
fine on UNIX but won't work under Windows).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89638
138bc75d-0d04-0410-961f-
82ee72b054a4
--------------------
procedure Abort_Selector (Selector : Selector_Type) is
- Buf : aliased Character := ASCII.NUL;
- Discard : C.int;
- pragma Unreferenced (Discard);
+ Buf : aliased Character := ASCII.NUL;
+ Res : C.int;
begin
-- Send an empty array to unblock C select system call
- Discard := C_Write (C.int (Selector.W_Sig_Socket), Buf'Address, 1);
+ Res := C_Send (C.int (Selector.W_Sig_Socket), Buf'Address, 1,
+ Constants.MSG_Forced_Flags);
+ if Res = Failure then
+ Raise_Socket_Error (Socket_Errno);
+ end if;
end Abort_Selector;
-------------------
declare
Buf : Character;
+
begin
- Res := C_Read (C.int (Selector.R_Sig_Socket), Buf'Address, 1);
+ Res := C_Recv (C.int (Selector.R_Sig_Socket), Buf'Address, 1, 0);
+
+ if Res = Failure then
+ Raise_Socket_Error (Socket_Errno);
+ end if;
end;
Status := Aborted;
-- POSIX compatitibility, copy write fd set into exception fd
-- set. Once select() returns, check any socket present in the
-- exception fd set and peek at incoming out-of-band data. If
- -- the test is not successfull and if the socket is present in
+ -- the test is not successful, and the socket is present in
-- the initial write fd set, then move the socket from the
-- exception fd set to the write fd set.
begin
for J in Iovec'Range loop
- Res := C_Read
+ Res := C_Recv
(Fd,
Iovec (J).Base.all'Address,
- Interfaces.C.int (Iovec (J).Length));
+ Interfaces.C.int (Iovec (J).Length),
+ 0);
if Res < 0 then
return Res;
begin
for J in Iovec'Range loop
- Res := C_Write
+ Res := C_Send
(Fd,
Iovec (J).Base.all'Address,
- Interfaces.C.int (Iovec (J).Length));
+ Interfaces.C.int (Iovec (J).Length),
+ Constants.MSG_Forced_Flags);
if Res < 0 then
return Res;
function C_Listen (S, Backlog : C.int) return C.int;
- function C_Read
- (Fd : C.int;
- Buf : System.Address;
- Count : C.int)
- return C.int;
-
function C_Readv
(Fd : C.int;
Iov : System.Address;
(Command : System.Address)
return C.int;
- function C_Write
- (Fd : C.int;
- Buf : System.Address;
- Count : C.int)
- return C.int;
-
function C_Writev
(Fd : C.int;
Iov : System.Address;
pragma Import (C, C_Getsockopt, "getsockopt");
pragma Import (C, C_Inet_Addr, "inet_addr");
pragma Import (C, C_Listen, "listen");
- pragma Import (C, C_Read, "read");
pragma Import (C, C_Readv, "readv");
pragma Import (C, C_Select, "select");
pragma Import (C, C_Setsockopt, "setsockopt");
pragma Import (C, C_Shutdown, "shutdown");
pragma Import (C, C_Strerror, "strerror");
pragma Import (C, C_System, "system");
- pragma Import (C, C_Write, "write");
pragma Import (C, C_Writev, "writev");
pragma Import (C, Free_Socket_Set, "__gnat_free_socket_set");
(S : C.int;
Backlog : C.int) return C.int;
- function C_Read
- (Fd : C.int;
- Buf : System.Address;
- Count : C.int) return C.int;
-
function C_Readv
(Fd : C.int;
Iov : System.Address;
function C_System
(Command : System.Address) return C.int;
- function C_Write
- (Fd : C.int;
- Buf : System.Address;
- Count : C.int) return C.int;
-
function C_Writev
(Fd : C.int;
Iov : System.Address;
pragma Import (C, C_Getsockopt, "getsockopt");
pragma Import (C, C_Inet_Addr, "inet_addr");
pragma Import (C, C_Listen, "listen");
- pragma Import (C, C_Read, "read");
pragma Import (C, C_Readv, "readv");
pragma Import (C, C_Select, "select");
pragma Import (C, C_Setsockopt, "setsockopt");
pragma Import (C, C_Shutdown, "shutdown");
pragma Import (C, C_Strerror, "strerror");
pragma Import (C, C_System, "system");
- pragma Import (C, C_Write, "write");
pragma Import (C, C_Writev, "writev");
pragma Import (C, Free_Socket_Set, "__gnat_free_socket_set");
OSDN Git Service
