diff options
| -rw-r--r-- | source/tanya/async/event/epoll.d | 17 | ||||
| -rw-r--r-- | source/tanya/async/event/iocp.d | 17 | ||||
| -rw-r--r-- | source/tanya/async/event/kqueue.d | 18 | ||||
| -rw-r--r-- | source/tanya/async/event/selector.d | 17 | ||||
| -rw-r--r-- | source/tanya/async/loop.d | 39 | ||||
| -rw-r--r-- | source/tanya/async/protocol.d | 6 | ||||
| -rw-r--r-- | source/tanya/async/transport.d | 2 | ||||
| -rw-r--r-- | source/tanya/async/watcher.d | 33 | ||||
| -rw-r--r-- | source/tanya/container/queue.d | 23 | ||||
| -rw-r--r-- | source/tanya/network/socket.d | 82 |
10 files changed, 141 insertions, 113 deletions
diff --git a/source/tanya/async/event/epoll.d b/source/tanya/async/event/epoll.d index 751ab82..28af1c9 100644 --- a/source/tanya/async/event/epoll.d +++ b/source/tanya/async/event/epoll.d @@ -26,6 +26,13 @@ import core.sys.posix.unistd; import core.time;
import std.algorithm.comparison;
+extern (C) nothrow @nogc
+{
+ int epoll_create1(int flags);
+ int epoll_ctl (int epfd, int op, int fd, epoll_event *event);
+ int epoll_wait (int epfd, epoll_event *events, int maxevents, int timeout);
+}
+
class EpollLoop : SelectorLoop
{
protected int fd;
@@ -34,7 +41,7 @@ class EpollLoop : SelectorLoop /**
* Initializes the loop.
*/
- this()
+ this() @nogc
{
if ((fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
{
@@ -47,7 +54,7 @@ class EpollLoop : SelectorLoop /**
* Free loop internals.
*/
- ~this()
+ ~this() @nogc
{
MmapPool.instance.dispose(events);
close(fd);
@@ -63,7 +70,9 @@ class EpollLoop : SelectorLoop *
* Returns: $(D_KEYWORD true) if the operation was successful.
*/
- protected override bool reify(ConnectionWatcher watcher, EventMask oldEvents, EventMask events)
+ protected override bool reify(ConnectionWatcher watcher,
+ EventMask oldEvents,
+ EventMask events) @nogc
in
{
assert(watcher !is null);
@@ -97,7 +106,7 @@ class EpollLoop : SelectorLoop /**
* Does the actual polling.
*/
- protected override void poll()
+ protected override void poll() @nogc
{
// Don't block
immutable timeout = cast(immutable int) blockTime.total!"msecs";
diff --git a/source/tanya/async/event/iocp.d b/source/tanya/async/event/iocp.d index 91fe71c..4eb3bc4 100644 --- a/source/tanya/async/event/iocp.d +++ b/source/tanya/async/event/iocp.d @@ -37,7 +37,7 @@ class IOCPStreamTransport : StreamTransport * Params: * socket = Socket. */ - this(OverlappedConnectedSocket socket) + this(OverlappedConnectedSocket socket) @nogc in { assert(socket !is null); @@ -53,7 +53,8 @@ class IOCPStreamTransport : StreamTransport MmapPool.instance.dispose(input); } - @property inout(OverlappedConnectedSocket) socket() inout pure nothrow @safe @nogc + @property inout(OverlappedConnectedSocket) socket() + inout pure nothrow @safe @nogc { return socket_; } @@ -64,7 +65,7 @@ class IOCPStreamTransport : StreamTransport * Params: * data = Data to send. */ - void write(ubyte[] data) + void write(ubyte[] data) @nogc { immutable empty = input.length == 0; input ~= data; @@ -85,8 +86,8 @@ class IOCPStreamTransport : StreamTransport } } - class IOCPLoop : Loop - { +class IOCPLoop : Loop +{ protected HANDLE completionPort; protected OVERLAPPED overlap; @@ -94,7 +95,7 @@ class IOCPStreamTransport : StreamTransport /** * Initializes the loop. */ - this() + this() @nogc { super(); @@ -118,7 +119,7 @@ class IOCPStreamTransport : StreamTransport */ override protected bool reify(ConnectionWatcher watcher, EventMask oldEvents, - EventMask events) + EventMask events) @nogc { SocketState overlapped; if (!(oldEvents & Event.accept) && (events & Event.accept)) @@ -185,7 +186,7 @@ class IOCPStreamTransport : StreamTransport /** * Does the actual polling. */ - override protected void poll() + override protected void poll() @nogc { DWORD lpNumberOfBytes; ULONG_PTR key; diff --git a/source/tanya/async/event/kqueue.d b/source/tanya/async/event/kqueue.d index d7792ef..85c9a2a 100644 --- a/source/tanya/async/event/kqueue.d +++ b/source/tanya/async/event/kqueue.d @@ -151,12 +151,13 @@ class KqueueLoop : SelectorLoop * Returns: Maximal event count can be got at a time * (should be supported by the backend). */ - override protected @property inout(uint) maxEvents() inout const pure nothrow @safe @nogc + override protected @property inout(uint) maxEvents() + inout const pure nothrow @safe @nogc { return cast(uint) events.length; } - this() + this() @nogc { super(); @@ -171,14 +172,14 @@ class KqueueLoop : SelectorLoop /** * Free loop internals. */ - ~this() + ~this() @nogc { MmapPool.instance.dispose(events); MmapPool.instance.dispose(changes); close(fd); } - private void set(socket_t socket, short filter, ushort flags) + private void set(socket_t socket, short filter, ushort flags) @nogc { if (changes.length <= changeCount) { @@ -206,7 +207,7 @@ class KqueueLoop : SelectorLoop */ override protected bool reify(ConnectionWatcher watcher, EventMask oldEvents, - EventMask events) + EventMask events) @nogc { if (events != oldEvents) { @@ -233,7 +234,7 @@ class KqueueLoop : SelectorLoop /** * Does the actual polling. */ - protected override void poll() + protected override void poll() @nogc { timespec ts; blockTime.split!("seconds", "nsecs")(ts.tv_sec, ts.tv_nsec); @@ -316,7 +317,7 @@ class KqueueLoop : SelectorLoop * Returns: The blocking time. */ override protected @property inout(Duration) blockTime() - inout @safe pure nothrow + inout @nogc @safe pure nothrow { return min(super.blockTime, 1.dur!"seconds"); } @@ -333,7 +334,8 @@ class KqueueLoop : SelectorLoop * completed or scheduled, $(D_KEYWORD false) otherwise (the * transport is be destroyed then). */ - protected override bool feed(SelectorStreamTransport transport, SocketException exception = null) + protected override bool feed(SelectorStreamTransport transport, + SocketException exception = null) @nogc { if (!super.feed(transport, exception)) { diff --git a/source/tanya/async/event/selector.d b/source/tanya/async/event/selector.d index 003e1cd..b023f50 100644 --- a/source/tanya/async/event/selector.d +++ b/source/tanya/async/event/selector.d @@ -42,7 +42,7 @@ class SelectorStreamTransport : StreamTransport * loop = Event loop. * socket = Socket. */ - this(SelectorLoop loop, ConnectedSocket socket) + this(SelectorLoop loop, ConnectedSocket socket) @nogc { socket_ = socket; this.loop = loop; @@ -52,7 +52,7 @@ class SelectorStreamTransport : StreamTransport /** * Close the transport and deallocate the data buffers. */ - ~this() + ~this() @nogc { MmapPool.instance.dispose(input); } @@ -71,7 +71,7 @@ class SelectorStreamTransport : StreamTransport * Params: * data = Data to send. */ - void write(ubyte[] data) + void write(ubyte[] data) @nogc { if (!data.length) { @@ -113,13 +113,13 @@ abstract class SelectorLoop : Loop /// Pending connections. protected ConnectionWatcher[] connections; - this() + this() @nogc { super(); connections = MmapPool.instance.makeArray!ConnectionWatcher(maxEvents); } - ~this() + ~this() @nogc { foreach (ref connection; connections) { @@ -147,7 +147,8 @@ abstract class SelectorLoop : Loop * completed or scheduled, $(D_KEYWORD false) otherwise (the * transport will be destroyed then). */ - protected bool feed(SelectorStreamTransport transport, SocketException exception = null) + protected bool feed(SelectorStreamTransport transport, + SocketException exception = null) @nogc { while (transport.input.length && transport.writeReady) { @@ -186,7 +187,7 @@ abstract class SelectorLoop : Loop * Params: * watcher = Watcher. */ - override void start(ConnectionWatcher watcher) + override void start(ConnectionWatcher watcher) @nogc { if (watcher.active) { @@ -208,7 +209,7 @@ abstract class SelectorLoop : Loop * Params: * connection = Connection watcher ready to accept. */ - package void acceptConnections(ConnectionWatcher connection) + package void acceptConnections(ConnectionWatcher connection) @nogc in { assert(connection !is null); diff --git a/source/tanya/async/loop.d b/source/tanya/async/loop.d index e0f924b..a7859d4 100644 --- a/source/tanya/async/loop.d +++ b/source/tanya/async/loop.d @@ -131,15 +131,16 @@ alias EventMask = BitFlags!Event; abstract class Loop
{
/// Pending watchers.
- protected Queue!Watcher pendings;
+ protected Queue!Watcher* pendings;
- protected Queue!Watcher swapPendings;
+ protected Queue!Watcher* swapPendings;
/**
* Returns: Maximal event count can be got at a time
* (should be supported by the backend).
*/
- protected @property inout(uint) maxEvents() inout const pure nothrow @safe @nogc
+ protected @property inout(uint) maxEvents()
+ inout const pure nothrow @safe @nogc
{
return 128U;
}
@@ -147,7 +148,7 @@ abstract class Loop /**
* Initializes the loop.
*/
- this()
+ this() @nogc
{
pendings = MmapPool.instance.make!(Queue!Watcher);
swapPendings = MmapPool.instance.make!(Queue!Watcher);
@@ -156,15 +157,15 @@ abstract class Loop /**
* Frees loop internals.
*/
- ~this()
+ ~this() @nogc
{
- foreach (w; pendings)
+ foreach (w; *pendings)
{
MmapPool.instance.dispose(w);
}
MmapPool.instance.dispose(pendings);
- foreach (w; swapPendings)
+ foreach (w; *swapPendings)
{
MmapPool.instance.dispose(w);
}
@@ -174,7 +175,7 @@ abstract class Loop /**
* Starts the loop.
*/
- void run()
+ void run() @nogc
{
done_ = false;
do
@@ -182,7 +183,7 @@ abstract class Loop poll();
// Invoke pendings
- swapPendings.each!((ref p) => p.invoke());
+ swapPendings.each!((ref p) @nogc => p.invoke());
swap(pendings, swapPendings);
}
@@ -192,7 +193,7 @@ abstract class Loop /**
* Break out of the loop.
*/
- void unloop() @safe pure nothrow
+ void unloop() @safe pure nothrow @nogc
{
done_ = true;
}
@@ -203,7 +204,7 @@ abstract class Loop * Params:
* watcher = Watcher.
*/
- void start(ConnectionWatcher watcher)
+ void start(ConnectionWatcher watcher) @nogc
{
if (watcher.active)
{
@@ -219,7 +220,7 @@ abstract class Loop * Params:
* watcher = Watcher.
*/
- void stop(ConnectionWatcher watcher)
+ void stop(ConnectionWatcher watcher) @nogc
{
if (!watcher.active)
{
@@ -242,13 +243,13 @@ abstract class Loop */
abstract protected bool reify(ConnectionWatcher watcher,
EventMask oldEvents,
- EventMask events);
+ EventMask events) @nogc;
/**
* Returns: The blocking time.
*/
protected @property inout(Duration) blockTime()
- inout @safe pure nothrow
+ inout @safe pure nothrow @nogc
{
// Don't block if we have to do.
return swapPendings.empty ? blockTime_ : Duration.zero;
@@ -261,7 +262,7 @@ abstract class Loop * blockTime = The blocking time. Cannot be larger than
* $(D_PSYMBOL maxBlockTime).
*/
- protected @property void blockTime(in Duration blockTime) @safe pure nothrow
+ protected @property void blockTime(in Duration blockTime) @safe pure nothrow @nogc
in
{
assert(blockTime <= 1.dur!"hours", "Too long to wait.");
@@ -275,7 +276,7 @@ abstract class Loop /**
* Kills the watcher and closes the connection.
*/
- protected void kill(IOWatcher watcher, SocketException exception)
+ protected void kill(IOWatcher watcher, SocketException exception) @nogc
{
watcher.socket.shutdown();
defaultAllocator.dispose(watcher.socket);
@@ -287,7 +288,7 @@ abstract class Loop /**
* Does the actual polling.
*/
- abstract protected void poll();
+ abstract protected void poll() @nogc;
/// Whether the event loop should be stopped.
private bool done_;
@@ -321,7 +322,7 @@ class BadLoopException : Exception *
* Returns: The default event loop.
*/
-@property Loop defaultLoop()
+@property Loop defaultLoop() @nogc
{
if (defaultLoop_ !is null)
{
@@ -354,7 +355,7 @@ class BadLoopException : Exception * Params:
* loop = The event loop.
*/
-@property void defaultLoop(Loop loop)
+@property void defaultLoop(Loop loop) @nogc
in
{
assert(loop !is null);
diff --git a/source/tanya/async/protocol.d b/source/tanya/async/protocol.d index 959937f..4851716 100644 --- a/source/tanya/async/protocol.d +++ b/source/tanya/async/protocol.d @@ -22,7 +22,7 @@ interface Protocol * Params:
* data = Read data.
*/
- void received(ubyte[] data);
+ void received(ubyte[] data) @nogc;
/**
* Called when a connection is made.
@@ -30,7 +30,7 @@ interface Protocol * Params:
* transport = Protocol transport.
*/
- void connected(DuplexTransport transport);
+ void connected(DuplexTransport transport) @nogc;
/**
* Called when a connection is lost.
@@ -39,7 +39,7 @@ interface Protocol * exception = $(D_PSYMBOL Exception) if an error caused
* the disconnect, $(D_KEYWORD null) otherwise.
*/
- void disconnected(SocketException exception = null);
+ void disconnected(SocketException exception = null) @nogc;
}
/**
diff --git a/source/tanya/async/transport.d b/source/tanya/async/transport.d index 8191678..2bc7929 100644 --- a/source/tanya/async/transport.d +++ b/source/tanya/async/transport.d @@ -37,7 +37,7 @@ interface WriteTransport : Transport * Params:
* data = Data to send.
*/
- void write(ubyte[] data);
+ void write(ubyte[] data) @nogc;
}
/**
diff --git a/source/tanya/async/watcher.d b/source/tanya/async/watcher.d index d376ae8..f97d692 100644 --- a/source/tanya/async/watcher.d +++ b/source/tanya/async/watcher.d @@ -42,7 +42,7 @@ abstract class Watcher /** * Invoke some action on event. */ - void invoke(); + void invoke() @nogc; } class ConnectionWatcher : Watcher @@ -51,28 +51,28 @@ class ConnectionWatcher : Watcher private Socket socket_; /// Protocol factory. - protected Protocol delegate() protocolFactory; + protected Protocol delegate() @nogc protocolFactory; - package Queue!IOWatcher incoming; + package Queue!IOWatcher* incoming; /** * Params: * socket = Socket. */ - this(Socket socket) + this(Socket socket) @nogc { socket_ = socket; incoming = MmapPool.instance.make!(Queue!IOWatcher); } /// Ditto. - protected this() + protected this() pure nothrow @safe @nogc { } - ~this() + ~this() @nogc { - foreach (w; incoming) + foreach (w; *incoming) { MmapPool.instance.dispose(w); } @@ -83,9 +83,9 @@ class ConnectionWatcher : Watcher * Params: * P = Protocol should be used. */ - void setProtocol(P : Protocol)() + void setProtocol(P : Protocol)() @nogc { - this.protocolFactory = () => cast(Protocol) MmapPool.instance.make!P; + this.protocolFactory = () @nogc => cast(Protocol) MmapPool.instance.make!P; } /** @@ -99,7 +99,7 @@ class ConnectionWatcher : Watcher /** * Returns: New protocol instance. */ - @property Protocol protocol() + @property Protocol protocol() @nogc in { assert(protocolFactory !is null, "Protocol isn't set."); @@ -112,9 +112,9 @@ class ConnectionWatcher : Watcher /** * Invokes new connection callback. */ - override void invoke() + override void invoke() @nogc { - foreach (io; incoming) + foreach (io; *incoming) { io.protocol.connected(cast(DuplexTransport) io.transport); } @@ -146,7 +146,7 @@ class IOWatcher : ConnectionWatcher * transport = Transport. * protocol = New instance of the application protocol. */ - this(StreamTransport transport, Protocol protocol) + this(StreamTransport transport, Protocol protocol) @nogc in { assert(transport !is null); @@ -164,7 +164,7 @@ class IOWatcher : ConnectionWatcher /** * Destroys the watcher. */ - protected ~this() + protected ~this() @nogc { MmapPool.instance.dispose(output); MmapPool.instance.dispose(protocol_); @@ -179,7 +179,8 @@ class IOWatcher : ConnectionWatcher * * Returns: $(D_KEYWORD this). */ - IOWatcher opCall(StreamTransport transport, Protocol protocol) pure nothrow @nogc + IOWatcher opCall(StreamTransport transport, Protocol protocol) + pure nothrow @nogc in { assert(transport !is null); @@ -231,7 +232,7 @@ class IOWatcher : ConnectionWatcher /** * Invokes the watcher callback. */ - override void invoke() + override void invoke() @nogc { if (output.length) { diff --git a/source/tanya/container/queue.d b/source/tanya/container/queue.d index d525949..960254b 100644 --- a/source/tanya/container/queue.d +++ b/source/tanya/container/queue.d @@ -18,7 +18,7 @@ import tanya.memory; * Params: * T = Content type. */ -class Queue(T) +struct Queue(T) { /** * Creates a new $(D_PSYMBOL Queue). @@ -27,7 +27,7 @@ class Queue(T) * allocator = The allocator should be used for the element * allocations. */ - this(shared Allocator allocator = defaultAllocator) + this(shared Allocator allocator) { this.allocator = allocator; } @@ -86,6 +86,10 @@ class Queue(T) */ void insertBack(T x) { + if (allocator is null) + { + allocator = defaultAllocator; + } Entry* temp = make!Entry(allocator); temp.content = x; @@ -121,7 +125,7 @@ class Queue(T) /** * Returns: $(D_KEYWORD true) if the queue is empty. */ - @property bool empty() inout const pure nothrow @safe @nogc + @property bool empty() inout const pure nothrow @safe { return first.next is null; } @@ -146,6 +150,7 @@ class Queue(T) in { assert(!empty); + assert(allocator !is null); } body { @@ -176,7 +181,7 @@ class Queue(T) * Params: * dg = $(D_KEYWORD foreach) body. */ - int opApply(scope int delegate(ref size_t i, ref T) dg) + int opApply(scope int delegate(ref size_t i, ref T) @nogc dg) { int result; @@ -192,7 +197,7 @@ class Queue(T) } /// Ditto. - int opApply(scope int delegate(ref T) dg) + int opApply(scope int delegate(ref T) @nogc dg) { int result; @@ -210,7 +215,7 @@ class Queue(T) /// unittest { - auto q = defaultAllocator.make!(Queue!int); + auto q = Queue!int(defaultAllocator); size_t j; q.insertBack(5); @@ -239,8 +244,6 @@ class Queue(T) } assert(j == 3); assert(q.empty); - - dispose(defaultAllocator, q); } /** @@ -268,7 +271,7 @@ class Queue(T) /// unittest { - auto q = defaultAllocator.make!(Queue!int); + auto q = Queue!int(defaultAllocator); q.insertBack(5); assert(!q.empty); @@ -288,6 +291,4 @@ unittest assert(i != 1 || e == 9); } assert(q.empty); - - defaultAllocator.dispose(q); } diff --git a/source/tanya/network/socket.d b/source/tanya/network/socket.d index b64986d..a63b231 100644 --- a/source/tanya/network/socket.d +++ b/source/tanya/network/socket.d @@ -15,9 +15,8 @@ import core.stdc.errno; import core.time; import std.algorithm.comparison; import std.algorithm.searching; -public import std.socket : AddressException, socket_t, Linger, SocketOptionLevel, - SocketType, AddressFamily, AddressInfo, - SocketOption; +public import std.socket : socket_t, Linger, SocketOptionLevel, SocketOption, + SocketType, AddressFamily, AddressInfo; import std.traits; import std.typecons; @@ -213,7 +212,7 @@ else version (Windows) * handle = Socket handle. * af = Address family. */ - this(socket_t handle, AddressFamily af) + this(socket_t handle, AddressFamily af) @nogc { super(handle, af); } @@ -233,7 +232,7 @@ else version (Windows) */ bool beginReceive(ubyte[] buffer, SocketState overlapped, - Flags flags = Flags(Flag.none)) @trusted + Flags flags = Flags(Flag.none)) @nogc @trusted { auto receiveFlags = cast(DWORD) flags; @@ -267,7 +266,7 @@ else version (Windows) * * Throws: $(D_PSYMBOL SocketException) if unable to receive. */ - int endReceive(SocketState overlapped) @trusted + int endReceive(SocketState overlapped) @nogc @trusted out (count) { assert(count >= 0); @@ -306,7 +305,7 @@ else version (Windows) */ bool beginSend(ubyte[] buffer, SocketState overlapped, - Flags flags = Flags(Flag.none)) @trusted + Flags flags = Flags(Flag.none)) @nogc @trusted { overlapped.handle = cast(HANDLE) handle_; overlapped.event = OverlappedSocketEvent.write; @@ -339,7 +338,7 @@ else version (Windows) * * Throws: $(D_PSYMBOL SocketException) if unable to receive. */ - int endSend(SocketState overlapped) @trusted + int endSend(SocketState overlapped) @nogc @trusted out (count) { assert(count >= 0); @@ -373,7 +372,7 @@ else version (Windows) * * Throws: $(D_PSYMBOL SocketException) on errors. */ - this(AddressFamily af) @trusted + this(AddressFamily af) @nogc @trusted { super(af); scope (failure) @@ -412,7 +411,7 @@ else version (Windows) * * Throws: $(D_PSYMBOL SocketException) on accept errors. */ - bool beginAccept(SocketState overlapped) @trusted + bool beginAccept(SocketState overlapped) @nogc @trusted { auto socket = cast(socket_t) socket(addressFamily, SOCK_STREAM, 0); if (socket == socket_t.init) @@ -457,7 +456,7 @@ else version (Windows) * * Throws: $(D_PSYMBOL SocketException) if unable to accept. */ - OverlappedConnectedSocket endAccept(SocketState overlapped) @trusted + OverlappedConnectedSocket endAccept(SocketState overlapped) @nogc @trusted { scope (exit) { @@ -666,7 +665,7 @@ abstract class Socket /// Address family. protected AddressFamily family; - private @property void handle(socket_t handle) + private @property void handle(socket_t handle) @nogc in { assert(handle != socket_t.init); @@ -696,7 +695,7 @@ abstract class Socket * handle = Socket. * af = Address family. */ - this(socket_t handle, AddressFamily af) + this(socket_t handle, AddressFamily af) @nogc in { assert(handle != socket_t.init); @@ -731,7 +730,9 @@ abstract class Socket * * Throws: $(D_PSYMBOL SocketException) on error. */ - protected int getOption(SocketOptionLevel level, SocketOption option, void[] result) const @trusted + protected int getOption(SocketOptionLevel level, + SocketOption option, + void[] result) const @trusted @nogc { auto length = cast(socklen_t) result.length; if (getsockopt(handle_, @@ -746,19 +747,25 @@ abstract class Socket } /// Ditto. - int getOption(SocketOptionLevel level, SocketOption option, out size_t result) const @trusted + int getOption(SocketOptionLevel level, + SocketOption option, + out size_t result) const @trusted @nogc { return getOption(level, option, (&result)[0..1]); } /// Ditto. - int getOption(SocketOptionLevel level, SocketOption option, out Linger result) const @trusted + int getOption(SocketOptionLevel level, + SocketOption option, + out Linger result) const @trusted @nogc { return getOption(level, option, (&result.clinger)[0..1]); } /// Ditto. - int getOption(SocketOptionLevel level, SocketOption option, out Duration result) const @trusted + int getOption(SocketOptionLevel level, + SocketOption option, + out Duration result) const @trusted @nogc { // WinSock returns the timeout values as a milliseconds DWORD, // while Linux and BSD return a timeval struct. @@ -791,8 +798,9 @@ abstract class Socket * * Throws: $(D_PSYMBOL SocketException) on error. */ - protected void setOption(SocketOptionLevel level, SocketOption option, void[] value) - const @trusted + protected void setOption(SocketOptionLevel level, + SocketOption option, + void[] value) const @trusted @nogc { if (setsockopt(handle_, cast(int)level, @@ -805,19 +813,22 @@ abstract class Socket } /// Ditto. - void setOption(SocketOptionLevel level, SocketOption option, size_t value) const @trusted + void setOption(SocketOptionLevel level, SocketOption option, size_t value) + const @trusted @nogc { setOption(level, option, (&value)[0..1]); } /// Ditto. - void setOption(SocketOptionLevel level, SocketOption option, Linger value) const @trusted + void setOption(SocketOptionLevel level, SocketOption option, Linger value) + const @trusted @nogc { setOption(level, option, (&value.clinger)[0..1]); } /// Ditto. - void setOption(SocketOptionLevel level, SocketOption option, Duration value) const @trusted + void setOption(SocketOptionLevel level, SocketOption option, Duration value) + const @trusted @nogc { version (Posix) { @@ -855,7 +866,7 @@ abstract class Socket * Params: * yes = Socket's blocking flag. */ - @property void blocking(bool yes) + @property void blocking(bool yes) @nogc { version (Posix) { @@ -943,7 +954,7 @@ abstract class Socket * backlog = Request of how many pending incoming connections are * queued until $(D_PSYMBOL accept)ed. */ - void listen(int backlog) const @trusted + void listen(int backlog) const @trusted @nogc { if (.listen(handle_, backlog) == SOCKET_ERROR) { @@ -992,7 +1003,7 @@ class StreamSocket : Socket, ConnectionOrientedSocket * Params: * af = Address family. */ - this(AddressFamily af) @trusted + this(AddressFamily af) @trusted @nogc { auto handle = cast(socket_t) socket(af, SOCK_STREAM, 0); if (handle == socket_t.init) @@ -1010,7 +1021,7 @@ class StreamSocket : Socket, ConnectionOrientedSocket * * Throws: $(D_PSYMBOL SocketException) if unable to bind. */ - void bind(Address address) @trusted const + void bind(Address address) const @trusted @nogc { if (.bind(handle_, address.name, address.length) == SOCKET_ERROR) { @@ -1029,7 +1040,7 @@ class StreamSocket : Socket, ConnectionOrientedSocket * * Throws: $(D_PSYMBOL SocketException) if unable to accept. */ - ConnectedSocket accept() @trusted + ConnectedSocket accept() @trusted @nogc { socket_t sock; @@ -1112,7 +1123,7 @@ class ConnectedSocket : Socket, ConnectionOrientedSocket * handle = Socket. * af = Address family. */ - this(socket_t handle, AddressFamily af) + this(socket_t handle, AddressFamily af) @nogc { super(handle, af); } @@ -1148,7 +1159,7 @@ class ConnectedSocket : Socket, ConnectionOrientedSocket * * Throws: $(D_PSYMBOL SocketException) if unable to receive. */ - ptrdiff_t receive(ubyte[] buf, Flags flags = Flag.none) @trusted + ptrdiff_t receive(ubyte[] buf, Flags flags = Flag.none) @trusted @nogc { ptrdiff_t ret; if (!buf.length) @@ -1186,7 +1197,8 @@ class ConnectedSocket : Socket, ConnectionOrientedSocket * * Throws: $(D_PSYMBOL SocketException) if unable to send. */ - ptrdiff_t send(const(ubyte)[] buf, Flags flags = Flag.none) const @trusted + ptrdiff_t send(const(ubyte)[] buf, Flags flags = Flag.none) + const @trusted @nogc { int sendFlags = cast(int) flags; ptrdiff_t sent; @@ -1244,12 +1256,12 @@ class InternetAddress : Address anyPort = 0, } - this(in string host, ushort port = anyPort) + this(in string host, ushort port = anyPort) @nogc { if (getaddrinfoPointer is null || freeaddrinfoPointer is null) { - throw make!AddressException(defaultAllocator, - "Address info lookup is not available on this system"); + throw make!SocketException(defaultAllocator, + "Address info lookup is not available on this system"); } addrinfo* ai_res; port_ = port; @@ -1285,7 +1297,7 @@ class InternetAddress : Address auto ret = getaddrinfoPointer(node.ptr, servicePointer, null, &ai_res); if (ret) { - throw defaultAllocator.make!AddressException("Address info lookup failed"); + throw defaultAllocator.make!SocketException("Address info lookup failed"); } scope (exit) { @@ -1299,7 +1311,7 @@ class InternetAddress : Address } if (ai_res.ai_family != AddressFamily.INET && ai_res.ai_family != AddressFamily.INET6) { - throw defaultAllocator.make!AddressException("Wrong address family"); + throw defaultAllocator.make!SocketException("Wrong address family"); } } |