+2009-06-19 Thomas Quinot <quinot@adacore.com>
+
+ * i-vxwoio.ads: Add comments
+
+2009-06-19 Thomas Quinot <quinot@adacore.com>
+
+ * socket.c, g-socthi-vms.adb, g-socthi-vms.ads, g-socthi-vxworks.adb,
+ g-socthi-vxworks.ads, g-socthi-mingw.adb, g-socthi-mingw.ads,
+ g-socthi.adb, g-socthi.ads, g-socket.adb, g-sothco.ads
+ (GNAT.Sockets.Thin.C_Ioctl): Rename to Socket_Ioctl.
+ (GNAT.Sockets.Thin.Socket_Ioctl): Use new function
+ Thin_Common.Socket_Ioctl.
+ (GNAT.Sockets.Thin_Common.Socket_Ioctl): Binding to new C wrapper
+ __gnat_socket_ioctl.
+ (__gnat_socket_ioctl): Wrapper for ioctl(2) called with a single int*
+ argument after the file descriptor and request code.
+
+2009-06-19 Robert Dewar <dewar@adacore.com>
+
+ * checks.adb: Minor reformatting
+
2009-06-19 Jose Ruiz <ruiz@adacore.com>
* env.c (__gnat_environ): RTX does not support this functionality.
case Attribute_Name (N) is
-- For Pos/Val attributes, we can refine the range using the
- -- possible range of values of the attribute expression
+ -- possible range of values of the attribute expression.
when Name_Pos | Name_Val =>
Determine_Range
null;
end case;
- Res := C_Ioctl
- (C.int (Socket),
- Requests (Request.Name),
- Arg'Unchecked_Access);
+ Res := Socket_Ioctl
+ (C.int (Socket), Requests (Request.Name), Arg'Unchecked_Access);
if Res = Failure then
Raise_Socket_Error (Socket_Errno);
return Res;
end C_Connect;
+ ------------------
+ -- Socket_Ioctl --
+ ------------------
+
+ function Socket_Ioctl
+ (S : C.int;
+ Req : C.int;
+ Arg : access C.int) return C.int
+ is
+ begin
+ return C_Ioctl (S, Req, Arg);
+ end Socket_Ioctl;
+
---------------
-- C_Recvmsg --
---------------
Optval : System.Address;
Optlen : not null access C.int) return C.int;
- function C_Ioctl
- (S : C.int;
- Req : C.int;
- Arg : access C.int) return C.int;
+ function Socket_Ioctl
+ (S : C.int;
+ Req : C.int;
+ Arg : access C.int) return C.int;
function C_Listen
(S : C.int;
pragma Import (Stdcall, C_Getpeername, "getpeername");
pragma Import (Stdcall, C_Getsockname, "getsockname");
pragma Import (Stdcall, C_Getsockopt, "getsockopt");
- pragma Import (Stdcall, C_Ioctl, "ioctlsocket");
pragma Import (Stdcall, C_Listen, "listen");
pragma Import (Stdcall, C_Recv, "recv");
pragma Import (Stdcall, C_Recvfrom, "recvfrom");
Namelen : C.int) return C.int;
pragma Import (C, Syscall_Connect, "connect");
- function Syscall_Ioctl
- (S : C.int;
- Req : C.int;
- Arg : access C.int) return C.int;
- pragma Import (C, Syscall_Ioctl, "ioctl");
-
function Syscall_Recv
(S : C.int;
Msg : System.Address;
and then R /= Failure
then
-- A socket inherits the properties of its server, especially
- -- the FIONBIO flag. Do not use C_Ioctl as this subprogram
+ -- the FIONBIO flag. Do not use Socket_Ioctl as this subprogram
-- tracks sockets set in non-blocking mode by user.
Set_Non_Blocking_Socket (R, Non_Blocking_Socket (S));
- Discard := Syscall_Ioctl (R, SOSC.FIONBIO, Val'Access);
+ Discard := C_Ioctl (R, SOSC.FIONBIO, Val'Access);
end if;
return R;
end if;
end C_Connect;
- -------------
- -- C_Ioctl --
- -------------
+ ------------------
+ -- Socket_Ioctl --
+ ------------------
- function C_Ioctl
+ function Socket_Ioctl
(S : C.int;
Req : C.int;
Arg : access C.int) return C.int
is
begin
- if not SOSC.Thread_Blocking_IO
- and then Req = SOSC.FIONBIO
- then
+ if not SOSC.Thread_Blocking_IO and then Req = SOSC.FIONBIO then
if Arg.all /= 0 then
Set_Non_Blocking_Socket (S, True);
end if;
end if;
- return Syscall_Ioctl (S, Req, Arg);
- end C_Ioctl;
+ return C_Ioctl (S, Req, Arg);
+ end Socket_Ioctl;
------------
-- C_Recv --
if not SOSC.Thread_Blocking_IO
and then R /= Failure
then
- -- Do not use C_Ioctl as this subprogram tracks sockets set
+ -- Do not use Socket_Ioctl as this subprogram tracks sockets set
-- in non-blocking mode by user.
- Discard := Syscall_Ioctl (R, SOSC.FIONBIO, Val'Access);
+ Discard := C_Ioctl (R, SOSC.FIONBIO, Val'Access);
Set_Non_Blocking_Socket (R, False);
end if;
Optval : System.Address;
Optlen : not null access C.int) return C.int;
- function C_Ioctl
- (S : C.int;
- Req : C.int;
- Arg : access C.int) return C.int;
+ function Socket_Ioctl
+ (S : C.int;
+ Req : C.int;
+ Arg : access C.int) return C.int;
function C_Listen
(S : C.int;
Namelen : C.int) return C.int;
pragma Import (C, Syscall_Connect, "connect");
- function Syscall_Ioctl
- (S : C.int;
- Req : C.int;
- Arg : access C.int) return C.int;
- pragma Import (C, Syscall_Ioctl, "ioctl");
-
function Syscall_Recv
(S : C.int;
Msg : System.Address;
and then R /= Failure
then
-- A socket inherits the properties of its server especially
- -- the FIONBIO flag. Do not use C_Ioctl as this subprogram
+ -- the FIONBIO flag. Do not use Socket_Ioctl as this subprogram
-- tracks sockets set in non-blocking mode by user.
Set_Non_Blocking_Socket (R, Non_Blocking_Socket (S));
- Res := Syscall_Ioctl (R, SOSC.FIONBIO, Val'Access);
+ Res := C_Ioctl (R, SOSC.FIONBIO, Val'Access);
-- Is it OK to ignore result ???
end if;
end if;
end C_Connect;
- -------------
- -- C_Ioctl --
- -------------
+ ------------------
+ -- Socket_Ioctl --
+ ------------------
- function C_Ioctl
- (S : C.int;
- Req : C.int;
- Arg : access C.int) return C.int
+ function Socket_Ioctl
+ (S : C.int;
+ Req : C.int;
+ Arg : access C.int) return C.int
is
begin
- if not SOSC.Thread_Blocking_IO
- and then Req = SOSC.FIONBIO
- then
+ if not SOSC.Thread_Blocking_IO and then Req = SOSC.FIONBIO then
if Arg.all /= 0 then
Set_Non_Blocking_Socket (S, True);
end if;
end if;
- return Syscall_Ioctl (S, Req, Arg);
- end C_Ioctl;
+ return C_Ioctl (S, Req, Arg);
+ end Socket_Ioctl;
------------
-- C_Recv --
if not SOSC.Thread_Blocking_IO
and then R /= Failure
then
- -- Do not use C_Ioctl as this subprogram tracks sockets set
+ -- Do not use Socket_Ioctl as this subprogram tracks sockets set
-- in non-blocking mode by user.
- Res := Syscall_Ioctl (R, SOSC.FIONBIO, Val'Access);
+ Res := C_Ioctl (R, SOSC.FIONBIO, Val'Access);
-- Is it OK to ignore result ???
Set_Non_Blocking_Socket (R, False);
end if;
Optval : System.Address;
Optlen : not null access C.int) return C.int;
- function C_Ioctl
- (S : C.int;
- Req : C.int;
- Arg : access C.int) return C.int;
+ function Socket_Ioctl
+ (S : C.int;
+ Req : C.int;
+ Arg : access C.int) return C.int;
function C_Listen
(S : C.int;
Namelen : C.int) return C.int;
pragma Import (C, Syscall_Connect, "connect");
- function Syscall_Ioctl
- (S : C.int;
- Req : C.int;
- Arg : access C.int) return C.int;
- pragma Import (C, Syscall_Ioctl, "ioctl");
-
function Syscall_Recv
(S : C.int;
Msg : System.Address;
and then R /= Failure
then
-- A socket inherits the properties ot its server especially
- -- the FIONBIO flag. Do not use C_Ioctl as this subprogram
+ -- the FIONBIO flag. Do not use Socket_Ioctl as this subprogram
-- tracks sockets set in non-blocking mode by user.
Set_Non_Blocking_Socket (R, Non_Blocking_Socket (S));
- Discard := Syscall_Ioctl (R, SOSC.FIONBIO, Val'Access);
+ Discard := C_Ioctl (R, SOSC.FIONBIO, Val'Access);
end if;
Disable_SIGPIPE (R);
end if;
end C_Connect;
- -------------
- -- C_Ioctl --
- -------------
+ ------------------
+ -- Socket_Ioctl --
+ ------------------
- function C_Ioctl
+ function Socket_Ioctl
(S : C.int;
Req : C.int;
Arg : access C.int) return C.int
is
begin
- if not SOSC.Thread_Blocking_IO
- and then Req = SOSC.FIONBIO
- then
+ if not SOSC.Thread_Blocking_IO and then Req = SOSC.FIONBIO then
if Arg.all /= 0 then
Set_Non_Blocking_Socket (S, True);
end if;
end if;
- return Syscall_Ioctl (S, Req, Arg);
- end C_Ioctl;
+ return C_Ioctl (S, Req, Arg);
+ end Socket_Ioctl;
------------
-- C_Recv --
if not SOSC.Thread_Blocking_IO
and then R /= Failure
then
- -- Do not use C_Ioctl as this subprogram tracks sockets set
+ -- Do not use Socket_Ioctl as this subprogram tracks sockets set
-- in non-blocking mode by user.
- Discard := Syscall_Ioctl (R, SOSC.FIONBIO, Val'Access);
+ Discard := C_Ioctl (R, SOSC.FIONBIO, Val'Access);
Set_Non_Blocking_Socket (R, False);
end if;
Disable_SIGPIPE (R);
Optval : System.Address;
Optlen : not null access C.int) return C.int;
- function C_Ioctl
- (S : C.int;
- Req : C.int;
- Arg : access C.int) return C.int;
+ function Socket_Ioctl
+ (S : C.int;
+ Req : C.int;
+ Arg : access C.int) return C.int;
function C_Listen
(S : C.int;
-- --
-- S p e c --
-- --
--- Copyright (C) 2008, AdaCore --
+-- Copyright (C) 2008-2009, AdaCore --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
Cp : C.Strings.chars_ptr;
Inp : System.Address) return C.int;
+ function C_Ioctl
+ (Fd : C.int;
+ Req : C.int;
+ Arg : access C.int) return C.int;
+
private
pragma Import (C, Get_Socket_From_Set, "__gnat_get_socket_from_set");
pragma Import (C, Is_Socket_In_Set, "__gnat_is_socket_in_set");
pragma Import (C, Insert_Socket_In_Set, "__gnat_insert_socket_in_set");
pragma Import (C, Remove_Socket_From_Set, "__gnat_remove_socket_from_set");
pragma Import (C, Reset_Socket_Set, "__gnat_reset_socket_set");
+ pragma Import (C, C_Ioctl, "__gnat_socket_ioctl");
pragma Import (C, Inet_Pton, SOSC.Inet_Pton_Linkname);
end GNAT.Sockets.Thin_Common;
type IOOPT is mod 2 ** int'Size;
-- Type of the option codes in ioctl
- -- ioctl function codes
- -- For more information see ioLib.h
+ -- ioctl function codes (for more information see ioLib.h)
+ -- These values could be generated automatically in System.OS_Constants???
FIONREAD : constant FUNCODE := 1;
FIOFLUSH : constant FUNCODE := 2;
function ioctl (Fd : int; Function_Code : FUNCODE; Arg : IOOPT) return int;
pragma Import (C, ioctl, "ioctl");
-- Binding to the C routine ioctl
+ --
+ -- Note: we are taking advantage of the fact that on currently supported
+ -- VxWorks targets, it is fine to directly bind to a variadic C function.
------------------------------
-- Control of Get_Immediate --
extern void __gnat_remove_socket_from_set (fd_set *, int);
extern void __gnat_reset_socket_set (fd_set *);
extern int __gnat_get_h_errno (void);
+extern int __gnat_socket_ioctl (int, int, int *);
#if defined (__vxworks) || defined (_WIN32)
extern int __gnat_inet_pton (int, const char *, void *);
#endif
#endif
}
+/* Wrapper for ioctl(2), which is a variadic function */
+
+int
+__gnat_socket_ioctl (int fd, int req, int *arg) {
+#if defined (_WIN32)
+ return ioctlsocket (fd, req, arg);
+#else
+ return ioctl (fd, req, arg);
+#endif
+}
+
#ifndef HAVE_INET_PTON
#ifdef VMS
OSDN Git Service
