mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-05 17:42:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.socket: replace version(BsdSockets) with version(Posix)

Browse source
This commit is contained in:
Vladimir Panteleev 2011-08-22 05:50:06 +03:00
parent 1963269deb
commit 9b5aa12891
1 changed files with 41 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

37
std/socket.d
View file

@ -50,11 +50,6 @@ version(unittest)
private import std.c.stdio : printf; private import std.c.stdio : printf;
} }
version(Posix)
{
version = BsdSockets;
}
version(Win32) version(Win32)
{ {
pragma (lib, "ws2_32.lib"); pragma (lib, "ws2_32.lib");
@ -72,9 +67,7 @@ version(Win32)
return WSAGetLastError(); return WSAGetLastError();
} }
} }
else version(BsdSockets) else version(Posix)
{
version(Posix)
{ {
version(linux) version(linux)
import std.c.linux.socket : AF_IPX, AF_APPLETALK, SOCK_RDM, import std.c.linux.socket : AF_IPX, AF_APPLETALK, SOCK_RDM,
@ -104,7 +97,7 @@ else version(BsdSockets)
//private import core.sys.posix.sys.select; //private import core.sys.posix.sys.select;
private import core.sys.posix.sys.socket; private import core.sys.posix.sys.socket;
private alias core.sys.posix.sys.time.timeval _ctimeval; private alias core.sys.posix.sys.time.timeval _ctimeval;
}
private import core.stdc.errno; private import core.stdc.errno;
typedef int32_t socket_t = -1; typedef int32_t socket_t = -1;
@ -225,7 +218,7 @@ bool wouldHaveBlocked()
{ {
version(Win32) version(Win32)
return _lasterr() == WSAEWOULDBLOCK; return _lasterr() == WSAEWOULDBLOCK;
else version(BsdSockets) else version(Posix)
return _lasterr() == EAGAIN; return _lasterr() == EAGAIN;
else else
static assert(0); static assert(0);
@ -1023,7 +1016,7 @@ private:
return set.fd_count; return set.fd_count;
} }
} }
else version(BsdSockets) else version(Posix)
{ {
int maxfd; int maxfd;
uint count; uint count;
@ -1050,7 +1043,7 @@ public:
{ {
FD_ZERO(&set); FD_ZERO(&set);
version(BsdSockets) version(Posix)
{ {
maxfd = -1; maxfd = -1;
count = 0; count = 0;
@ -1068,7 +1061,7 @@ public:
{ {
FD_SET(s, &set); FD_SET(s, &set);
version(BsdSockets) version(Posix)
{ {
++count; ++count;
if(s > maxfd) if(s > maxfd)
@ -1085,7 +1078,7 @@ public:
void remove(socket_t s) void remove(socket_t s)
{ {
FD_CLR(s, &set); FD_CLR(s, &set);
version(BsdSockets) version(Posix)
{ {
--count; --count;
// note: adjusting maxfd would require scanning the set, not worth it // note: adjusting maxfd would require scanning the set, not worth it
@ -1131,7 +1124,7 @@ public:
{ {
return count; return count;
} }
else version(BsdSockets) else version(Posix)
{ {
return maxfd + 1; return maxfd + 1;
} }
@ -1163,7 +1156,7 @@ extern(C) struct linger
uint16_t on; /// Nonzero for on. uint16_t on; /// Nonzero for on.
uint16_t time; /// Linger time. uint16_t time; /// Linger time.
} }
else version(BsdSockets) else version(Posix)
{ {
int32_t on; int32_t on;
int32_t time; int32_t time;
@ -1305,7 +1298,7 @@ public:
{ {
return _blocking; return _blocking;
} }
else version(BsdSockets) else version(Posix)
{ {
return !(fcntl(handle, F_GETFL, 0) & O_NONBLOCK); return !(fcntl(handle, F_GETFL, 0) & O_NONBLOCK);
} }
@ -1321,7 +1314,7 @@ public:
goto err; goto err;
_blocking = byes; _blocking = byes;
} }
else version(BsdSockets) else version(Posix)
{ {
int x = fcntl(sock, F_GETFL, 0); int x = fcntl(sock, F_GETFL, 0);
if(-1 == x) if(-1 == x)
@ -1463,7 +1456,7 @@ public:
{ {
.closesocket(sock); .closesocket(sock);
} }
else version(BsdSockets) else version(Posix)
{ {
.close(sock); .close(sock);
} }
@ -1745,7 +1738,7 @@ public:
msecs += WINSOCK_TIMEOUT_SKEW; msecs += WINSOCK_TIMEOUT_SKEW;
result = dur!"msecs"(msecs); result = dur!"msecs"(msecs);
} }
else version (BsdSockets) else version (Posix)
{ {
timeval tv; timeval tv;
getOption(level, option, (&tv)[0..1]); getOption(level, option, (&tv)[0..1]);
@ -1837,7 +1830,7 @@ public:
max(1, msecs - WINSOCK_TIMEOUT_SKEW)); max(1, msecs - WINSOCK_TIMEOUT_SKEW));
} }
} }
else version (BsdSockets) else version (Posix)
{ {
timeval tv = { seconds: cast(int)value.total!"seconds"(), timeval tv = { seconds: cast(int)value.total!"seconds"(),
microseconds: value.fracSec.usecs }; microseconds: value.fracSec.usecs };
@ -2046,7 +2039,7 @@ class UdpSocket: Socket
*/ */
Socket[2] socketPair() Socket[2] socketPair()
{ {
version(BsdSockets) version(Posix)
{ {
int[2] socks; int[2] socks;
if (socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1) if (socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1)