Integer storage optimization

opApply requires additional overloads for the const containers (with a
const delegate). If using a templated opApply foreach cannot infer the
types for the variables. foreach with one argument still works
(opIndex() is used), for more complex cases slicing should be used.

.gitignore

@@ -4,3 +4,8 @@
 # D
 .dub
 __test__*__
+__test__*__.core
+/tanya-test-library
+
+/docs/
+/docs.json

.travis.yml

@@ -0,0 +1,20 @@
+sudo: false
+
+os:
+ - linux
+ - osx
+
+language: d
+
+d:
+ - dmd-2.074.0
+ - dmd-2.073.2
+ - dmd-2.072.2
+ - dmd-2.071.2
+
+env: 
+ matrix:
+  - ARCH=x86_64
+
+script:
+ - dub test --arch=$ARCH

README.md

@@ -0,0 +1,71 @@
+# Tanya
+
+[![Build Status](https://travis-ci.org/caraus-ecms/tanya.svg?branch=master)](https://travis-ci.org/caraus-ecms/tanya)
+[![Dub version](https://img.shields.io/dub/v/tanya.svg)](https://code.dlang.org/packages/tanya)
+[![Dub downloads](https://img.shields.io/dub/dt/tanya.svg)](https://code.dlang.org/packages/tanya)
+[![License](https://img.shields.io/badge/license-MPL_2.0-blue.svg)](https://raw.githubusercontent.com/caraus-ecms/tanya/master/LICENSE)
+
+Tanya is a general purpose library for D programming language.
+
+Its aim is to simplify the manual memory management in D and to provide a
+guarantee with @nogc attribute that there are no hidden allocations on the
+Garbage Collector heap. Everything in the library is usable in @nogc code.
+Tanya extends Phobos functionality and provides alternative implementations for
+data structures and utilities that depend on the Garbage Collector in Phobos.
+
+* [Bug tracker](https://issues.caraus.io/projects/tanya)
+* [Documentation](https://docs.caraus.io/tanya)
+
+## Overview
+
+Tanya consists of the following packages:
+
+* `async`: Event loop (epoll, kqueue and IOCP).
+* `container`: Queue, Vector, Singly linked list, buffers.
+* `math`: Arbitrary precision integer and a set of functions.
+* `memory`: Tools for manual memory management (allocator, reference counting,
+helper functions).
+* `network`: URL-Parsing, sockets.
+
+### Supported compilers
+
+| dmd     |
+|:-------:|
+| 2.074.0 |
+| 2.073.2 |
+| 2.072.2 |
+| 2.071.2 |
+
+### Current status
+
+The library is currently under development, but the API is becoming gradually
+stable.
+
+Following modules are coming soon:
+
+| Feature      | Build status                                                                                                            |
+|--------------|:-----------------------------------------------------------------------------------------------------------------------:|
+| UTF-8 string | [![utf8string](https://travis-ci.org/caraus-ecms/tanya.svg?branch=utf8string)](https://travis-ci.org/caraus-ecms/tanya) |
+| BitVector    | [![bitvector](https://travis-ci.org/caraus-ecms/tanya.svg?branch=bitvector)](https://travis-ci.org/caraus-ecms/tanya)   |
+| Hash table   | N/A                                                                                                                     |
+
+`math` package contains an arbitrary precision integer implementation that
+needs more test cases, better performance and some additional features
+(constructing from a string and an ubyte array, and converting it back).
+
+### Further characteristics
+
+* Tanya is a native D library.
+
+* Tanya is cross-platform. The development happens on a 64-bit Linux, but it
+is being tested on Windows and FreeBSD as well.
+
+* The library isn't thread-safe. Thread-safity should be added later.
+
+## Contributing
+
+Since I'm mostly busy writing new code and implementing new features I would
+appreciate, if anyone uses the library. It would help me to improve the
+codebase and fix issues.
+
+Feel free to contact me if you have any questions.

dub.json

@@ -1,6 +1,6 @@
 {
 	"name": "tanya",
-	"description": "D library with event loop",
+	"description": "General purpose, @nogc library",
 	"license": "MPL-2.0",
 	"copyright": "(c) Eugene Wissner <info@caraus.de>",
 	"authors": [

source/tanya/async/event/epoll.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.event.epoll;
 
@@ -18,6 +18,7 @@ import tanya.async.event.selector;
 import tanya.async.loop;
 import tanya.async.transport;
 import tanya.async.watcher;
+import tanya.container.vector;
 import tanya.memory;
 import tanya.memory.mmappool;
 import tanya.network.socket;
@@ -26,30 +27,36 @@ import core.sys.posix.unistd;
 import core.time;
 import std.algorithm.comparison;
 
-class EpollLoop : SelectorLoop
+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);
+}
+
+final class EpollLoop : SelectorLoop
 {
 	protected int fd;
-    private epoll_event[] events;
+	private Vector!epoll_event events;
 
 	/**
 	 * Initializes the loop.
 	 */
-    this()
+	this() @nogc
 	{
 		if ((fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
 		{
-            throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
+			throw defaultAllocator.make!BadLoopException("epoll initialization failed");
 		}
 		super();
-        events = MmapPool.instance.makeArray!epoll_event(maxEvents);
+		events = Vector!epoll_event(maxEvents, MmapPool.instance);
 	}
 
 	/**
-     * Free loop internals.
+	 * Frees loop internals.
 	 */
-    ~this()
+	~this() @nogc
 	{
-        MmapPool.instance.dispose(events);
 		close(fd);
 	}
 
@@ -63,12 +70,9 @@ class EpollLoop : SelectorLoop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation was successful.
 	 */
-    protected override bool reify(ConnectionWatcher watcher, EventMask oldEvents, EventMask events)
-    in
-    {
-        assert(watcher !is null);
-    }
-    body
+	protected override bool reify(SocketWatcher watcher,
+	                              EventMask oldEvents,
+	                              EventMask events) @nogc
 	{
 		int op = EPOLL_CTL_DEL;
 		epoll_event ev;
@@ -97,11 +101,11 @@ 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";
-        auto eventCount = epoll_wait(fd, events.ptr, maxEvents, timeout);
+		auto eventCount = epoll_wait(fd, events.get().ptr, maxEvents, timeout);
 
 		if (eventCount < 0)
 		{
@@ -114,29 +118,30 @@ class EpollLoop : SelectorLoop
 
 		for (auto i = 0; i < eventCount; ++i)
 		{
-            auto io = cast(IOWatcher) connections[events[i].data.fd];
+			auto transport = cast(StreamTransport) connections[events[i].data.fd];
 
-            if (io is null)
+			if (transport is null)
 			{
-                acceptConnections(connections[events[i].data.fd]);
+				auto connection = cast(ConnectionWatcher) connections[events[i].data.fd];
+				assert(connection !is null);
+
+				acceptConnections(connection);
 			}
 			else if (events[i].events & EPOLLERR)
 			{
-                kill(io, null);
+				kill(transport);
+				continue;
 			}
 			else if (events[i].events & (EPOLLIN | EPOLLPRI | EPOLLHUP))
 			{
-                auto transport = cast(SelectorStreamTransport) io.transport;
-                assert(transport !is null);
-
 				SocketException exception;
 				try
 				{
 					ptrdiff_t received;
 					do
 					{
-                        received = transport.socket.receive(io.output[]);
-                        io.output += received;
+						received = transport.socket.receive(transport.output[]);
+						transport.output += received;
 					}
 					while (received);
 				}
@@ -146,18 +151,16 @@ class EpollLoop : SelectorLoop
 				}
 				if (transport.socket.disconnected)
 				{
-                    kill(io, exception);
+					kill(transport, exception);
+					continue;
 				}
-                else if (io.output.length)
+				else if (transport.output.length)
 				{
-                    swapPendings.insertBack(io);
+					pendings.enqueue(transport);
 				}
 			}
-            else if (events[i].events & EPOLLOUT)
+			if (events[i].events & EPOLLOUT)
 			{
-                auto transport = cast(SelectorStreamTransport) io.transport;
-                assert(transport !is null);
-
 				transport.writeReady = true;
 				if (transport.input.length)
 				{

source/tanya/async/event/iocp.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.event.iocp;
 
@@ -26,36 +26,68 @@ import core.sys.windows.winbase;
 import core.sys.windows.windef;
 import core.sys.windows.winsock2;
 
-class IOCPStreamTransport : StreamTransport
+/**
+ * Transport for stream sockets.
+ */
+final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
 {
-    private OverlappedConnectedSocket socket_;
+	private SocketException exception;
 
-    private WriteBuffer input;
+	private ReadBuffer!ubyte output;
+
+	private WriteBuffer!ubyte input;
+
+	private Protocol protocol_;
+
+	private bool closing;
 
 	/**
 	 * Creates new completion port transport.
+	 *
 	 * Params:
 	 * 	socket = Socket.
+	 *
+	 * Precondition: $(D_INLINECODE socket !is null)
 	 */
-    this(OverlappedConnectedSocket socket)
-    in
+	this(OverlappedConnectedSocket socket) @nogc
+	{
+		super(socket);
+		output = ReadBuffer!ubyte(8192, 1024, MmapPool.instance);
+		input = WriteBuffer!ubyte(8192, MmapPool.instance);
+		active = true;
+	}
+
+	/**
+	 * Returns: Socket.
+	 *
+	 * Postcondition: $(D_INLINECODE socket !is null)
+	 */
+	override @property OverlappedConnectedSocket socket() pure nothrow @safe @nogc
+	out (socket)
 	{
 		assert(socket !is null);
 	}
 	body
 	{
-        socket_ = socket;
-        input = MmapPool.instance.make!WriteBuffer();
+		return cast(OverlappedConnectedSocket) socket_;
 	}
 
-    ~this()
+	/**
+	 * Returns $(D_PARAM true) if the transport is closing or closed.
+	 */
+	bool isClosing() const pure nothrow @safe @nogc
 	{
-        MmapPool.instance.dispose(input);
+		return closing;
 	}
 
-    @property inout(OverlappedConnectedSocket) socket() inout pure nothrow @safe @nogc
+	/**
+	 * Close the transport.
+	 *
+	 * Buffered data will be flushed.  No more data will be received.
+	 */
+	void close() pure nothrow @safe @nogc
 	{
-        return socket_;
+		closing = true;
 	}
 
 	/**
@@ -64,10 +96,50 @@ class IOCPStreamTransport : StreamTransport
 	 * Params:
 	 * 	data = Data to send.
 	 */
-    void write(ubyte[] data)
+	void write(ubyte[] data) @nogc
+	{
+		input ~= data;
+	}
+
+	/**
+	 * Returns: Application protocol.
+	 */
+	@property Protocol protocol() pure nothrow @safe @nogc
+	{
+		return protocol_;
+	}
+
+	/**
+	 * Switches the protocol.
+	 *
+	 * The protocol is deallocated by the event loop, it should currently be
+	 * allocated with $(D_PSYMBOL MmapPool).
+	 *
+	 * Params:
+	 * 	protocol = Application protocol.
+	 *
+	 * Precondition: $(D_INLINECODE protocol !is null)
+	 */
+	@property void protocol(Protocol protocol) pure nothrow @safe @nogc
+	in
+	{
+		assert(protocol !is null);
+	}
+	body
+	{
+		protocol_ = protocol;
+	}
+
+	/**
+	 * Invokes the watcher callback.
+	 */
+	override void invoke() @nogc
+	{
+		if (output.length)
 		{
 			immutable empty = input.length == 0;
-        input ~= data;
+			protocol.received(output[0 .. $]);
+			output.clear();
 			if (empty)
 			{
 				SocketState overlapped;
@@ -83,9 +155,17 @@ class IOCPStreamTransport : StreamTransport
 				}
 			}
 		}
+		else
+		{
+			protocol.disconnected(exception);
+			MmapPool.instance.dispose(protocol_);
+			defaultAllocator.dispose(exception);
+			active = false;
+		}
+	}
 }
 
-class IOCPLoop : Loop
+final class IOCPLoop : Loop
 {
 	protected HANDLE completionPort;
 
@@ -94,14 +174,15 @@ class IOCPLoop : Loop
 	/**
 	 * Initializes the loop.
 	 */
-    this()
+	this() @nogc
 	{
 		super();
 
 		completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
 		if (!completionPort)
 		{
-            throw defaultAllocator.make!BadLoopException("Creating completion port failed");
+			throw make!BadLoopException(defaultAllocator,
+			                            "Creating completion port failed");
 		}
 	}
 
@@ -115,9 +196,9 @@ class IOCPLoop : Loop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation was successful.
 	 */
-    override protected bool reify(ConnectionWatcher watcher,
+	override protected bool reify(SocketWatcher watcher,
 								  EventMask oldEvents,
-                                  EventMask events)
+								  EventMask events) @nogc
 	{
 		SocketState overlapped;
 		if (!(oldEvents & Event.accept) && (events & Event.accept))
@@ -148,10 +229,7 @@ class IOCPLoop : Loop
 		if (!(oldEvents & Event.read) && (events & Event.read)
 			|| !(oldEvents & Event.write) && (events & Event.write))
 		{
-            auto io = cast(IOWatcher) watcher;
-            assert(io !is null);
-
-            auto transport = cast(IOCPStreamTransport) io.transport;
+			auto transport = cast(StreamTransport) watcher;
 			assert(transport !is null);
 
 			if (CreateIoCompletionPort(cast(HANDLE) transport.socket.handle,
@@ -168,7 +246,7 @@ class IOCPLoop : Loop
 				try
 				{
 					overlapped = MmapPool.instance.make!SocketState;
-                    transport.socket.beginReceive(io.output[], overlapped);
+					transport.socket.beginReceive(transport.output[], overlapped);
 				}
 				catch (SocketException e)
 				{
@@ -181,10 +259,24 @@ class IOCPLoop : Loop
 		return true;
 	}
 
+	private void kill(StreamTransport transport,
+	                  SocketException exception = null) @nogc
+	in
+	{
+		assert(transport !is null);
+	}
+	body
+	{
+		transport.socket.shutdown();
+		defaultAllocator.dispose(transport.socket);
+		transport.exception = exception;
+		pendings.enqueue(transport);
+	}
+
 	/**
 	 * Does the actual polling.
 	 */
-    override protected void poll()
+	override protected void poll() @nogc
 	{
 		DWORD lpNumberOfBytes;
 		ULONG_PTR key;
@@ -218,29 +310,26 @@ class IOCPLoop : Loop
 				assert(listener !is null);
 
 				auto socket = listener.endAccept(overlapped);
-                auto transport = MmapPool.instance.make!IOCPStreamTransport(socket);
-                auto io = MmapPool.instance.make!IOWatcher(transport, connection.protocol);
+				auto transport = MmapPool.instance.make!StreamTransport(socket);
 
-                connection.incoming.insertBack(io);
+				connection.incoming.enqueue(transport);
 
-                reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
+				reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
 
-                swapPendings.insertBack(connection);
+				pendings.enqueue(connection);
 				listener.beginAccept(overlapped);
 				break;
 			case OverlappedSocketEvent.read:
-                auto io = cast(IOWatcher) (cast(void*) key);
-                assert(io !is null);
-                if (!io.active)
+				auto transport = cast(StreamTransport) (cast(void*) key);
+				assert(transport !is null);
+
+				if (!transport.active)
 				{
-                    MmapPool.instance.dispose(io);
+					MmapPool.instance.dispose(transport);
 					MmapPool.instance.dispose(overlapped);
 					return;
 				}
 
-                auto transport = cast(IOCPStreamTransport) io.transport;
-                assert(transport !is null);
-
 				int received;
 				SocketException exception;
 				try
@@ -253,38 +342,39 @@ class IOCPLoop : Loop
 				}
 				if (transport.socket.disconnected)
 				{
-                    // We want to get one last notification to destroy the watcher
-                    transport.socket.beginReceive(io.output[], overlapped);
-                    kill(io, exception);
+					// We want to get one last notification to destroy the watcher.
+					transport.socket.beginReceive(transport.output[], overlapped);
+					kill(transport, exception);
 				}
 				else if (received > 0)
 				{
-                    immutable full = io.output.free == received;
+					immutable full = transport.output.free == received;
 
-                    io.output += received;
-                    // Receive was interrupted because the buffer is full. We have to continue
+					transport.output += received;
+					// Receive was interrupted because the buffer is full. We have to continue.
 					if (full)
 					{
-                        transport.socket.beginReceive(io.output[], overlapped);
+						transport.socket.beginReceive(transport.output[], overlapped);
 					}
-                    swapPendings.insertBack(io);
+					pendings.enqueue(transport);
 				}
 				break;
 			case OverlappedSocketEvent.write:
-                auto io = cast(IOWatcher) (cast(void*) key);
-                assert(io !is null);
-
-                auto transport = cast(IOCPStreamTransport) io.transport;
+				auto transport = cast(StreamTransport) (cast(void*) key);
 				assert(transport !is null);
 
 				transport.input += transport.socket.endSend(overlapped);
-                if (transport.input.length)
+				if (transport.input.length > 0)
 				{
 					transport.socket.beginSend(transport.input[], overlapped);
 				}
 				else
 				{
-                    transport.socket.beginReceive(io.output[], overlapped);
+					transport.socket.beginReceive(transport.output[], overlapped);
+					if (transport.isClosing())
+					{
+						kill(transport);
+					}
 				}
 				break;
 			default:

source/tanya/async/event/kqueue.d

@@ -3,49 +3,65 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.event.kqueue;
 
 version (OSX)
 {
-    version = MissingKevent;
+	version = MacBSD;
 }
 else version (iOS)
 {
-    version = MissingKevent;
+	version = MacBSD;
 }
 else version (TVOS)
 {
-    version = MissingKevent;
+	version = MacBSD;
 }
 else version (WatchOS)
 {
-    version = MissingKevent;
+	version = MacBSD;
+}
+else version (FreeBSD)
+{
+	version = MacBSD;
 }
 else version (OpenBSD)
 {
-    version = MissingKevent;
+	version = MacBSD;
 }
 else version (DragonFlyBSD)
 {
-    version = MissingKevent;
+	version = MacBSD;
 }
 
-version (MissingKevent)
+version (MacBSD):
+
+import core.stdc.errno;
+import core.sys.posix.time; // timespec
+import core.sys.posix.unistd;
+import core.time;
+import std.algorithm.comparison;
+import tanya.async.event.selector;
+import tanya.async.loop;
+import tanya.async.transport;
+import tanya.async.watcher;
+import tanya.container.vector;
+import tanya.memory;
+import tanya.memory.mmappool;
+import tanya.network.socket;
+
+void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args) pure nothrow @nogc
 {
-    extern (C):
-    nothrow:
-    @nogc:
+	*kevp = kevent_t(args);
+}
 
-    import core.stdc.stdint;    // intptr_t, uintptr_t
-    import core.sys.posix.time; // timespec
-
-    enum : short
-    {
+enum : short
+{
 	EVFILT_READ     =  -1,
 	EVFILT_WRITE    =  -2,
 	EVFILT_AIO      =  -3, /* attached to aio requests */
@@ -58,25 +74,20 @@ version (MissingKevent)
 	EVFILT_USER     = -10, /* User events */
 	EVFILT_VM       = -12, /* virtual memory events */
 	EVFILT_SYSCOUNT =  11
-    }
+}
 
-    extern(D) void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args)
-    {
-        *kevp = kevent_t(args);
-    }
-
-    struct kevent_t
-    {
+struct kevent_t
+{
 	uintptr_t    ident; /* identifier for this event */
 	short       filter; /* filter for event */
 	ushort       flags;
 	uint        fflags;
 	intptr_t      data;
 	void        *udata; /* opaque user data identifier */
-    }
+}
 
-    enum
-    {
+enum
+{
 	/* actions */
 	EV_ADD      = 0x0001, /* add event to kq (implies enable) */
 	EV_DELETE   = 0x0002, /* delete event from kq */
@@ -95,94 +106,56 @@ version (MissingKevent)
 	/* returned values */
 	EV_EOF      = 0x8000, /* EOF detected */
 	EV_ERROR    = 0x4000, /* error, data contains errno */
-    }
-
-    int kqueue();
-    int kevent(int kq, const kevent_t *changelist, int nchanges,
-               kevent_t *eventlist, int nevents,
-               const timespec *timeout);
 }
 
-version (OSX)
-{
-    version = MacBSD;
-}
-else version (iOS)
-{
-    version = MacBSD;
-}
-else version (FreeBSD)
-{
-    version = MacBSD;
-    public import core.sys.freebsd.sys.event;
-}
-else version (OpenBSD)
-{
-    version = MacBSD;
-}
-else version (DragonFlyBSD)
-{
-    version = MacBSD;
-}
+extern(C) int kqueue() nothrow @nogc;
+extern(C) int kevent(int kq, const kevent_t *changelist, int nchanges,
+                     kevent_t *eventlist, int nevents, const timespec *timeout)
+                     nothrow @nogc;
 
-version (MacBSD):
-
-import dlib.async.event.selector;
-import dlib.async.loop;
-import dlib.async.transport;
-import dlib.async.watcher;
-import dlib.memory;
-import dlib.memory.mmappool;
-import dlib.network.socket;
-import core.stdc.errno;
-import core.sys.posix.unistd;
-import core.sys.posix.sys.time;
-import core.time;
-import std.algorithm.comparison;
-
-class KqueueLoop : SelectorLoop
+final class KqueueLoop : SelectorLoop
 {
 	protected int fd;
-    private kevent_t[] events;
-    private kevent_t[] changes;
+	private Vector!kevent_t events;
+	private Vector!kevent_t changes;
 	private size_t changeCount;
 
 	/**
 	 * 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 uint maxEvents()
+	const pure nothrow @safe @nogc
 	{
 		return cast(uint) events.length;
 	}
 
-    this()
+	this() @nogc
 	{
 		super();
 
 		if ((fd = kqueue()) == -1)
 		{
-            throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
+			throw make!BadLoopException(defaultAllocator,
+			                            "kqueue initialization failed");
 		}
-        events = MmapPool.instance.makeArray!kevent_t(64);
-        changes = MmapPool.instance.makeArray!kevent_t(64);
+		events = Vector!kevent_t(64, MmapPool.instance);
+		changes = Vector!kevent_t(64, MmapPool.instance);
 	}
 
 	/**
-     * Free loop internals.
+	 * Frees 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)
 		{
-            MmapPool.instance.resizeArray(changes, changeCount + maxEvents);
+			changes.length = changeCount + maxEvents;
 		}
 		EV_SET(&changes[changeCount],
 		       cast(ulong) socket,
@@ -204,9 +177,9 @@ class KqueueLoop : SelectorLoop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation was successful.
 	 */
-    override protected bool reify(ConnectionWatcher watcher,
+	override protected bool reify(SocketWatcher watcher,
 	                              EventMask oldEvents,
-                                  EventMask events)
+	                              EventMask events) @nogc
 	{
 		if (events != oldEvents)
 		{
@@ -233,17 +206,22 @@ 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);
 
 		if (changeCount > maxEvents) 
 		{
-            MmapPool.instance.resizeArray(events, changes.length);
+			events.length = changes.length;
 		}
 
-        auto eventCount = kevent(fd, changes.ptr, cast(int) changeCount, events.ptr, maxEvents, &ts);
+		auto eventCount = kevent(fd,
+		                         changes.get().ptr,
+		                         cast(int) changeCount,
+		                         events.get().ptr,
+		                         maxEvents,
+		                         &ts);
 		changeCount = 0;
 
 		if (eventCount < 0)
@@ -259,29 +237,29 @@ class KqueueLoop : SelectorLoop
 		{
 			assert(connections.length > events[i].ident);
 
-            IOWatcher io = cast(IOWatcher) connections[events[i].ident];
+			auto transport = cast(StreamTransport) connections[events[i].ident];
 			// If it is a ConnectionWatcher. Accept connections.
-            if (io is null)
+			if (transport is null)
 			{
-                acceptConnections(connections[events[i].ident]);
+				auto connection = cast(ConnectionWatcher) connections[events[i].ident];
+				assert(connection !is null);
+
+				acceptConnections(connection);
 			}
 			else if (events[i].flags & EV_ERROR)
 			{
-                kill(io, null);
+				kill(transport);
 			}
 			else if (events[i].filter == EVFILT_READ)
 			{
-                auto transport = cast(SelectorStreamTransport) io.transport;
-                assert(transport !is null);
-
 				SocketException exception;
 				try
 				{
 					ptrdiff_t received;
 					do
 					{
-                        received = transport.socket.receive(io.output[]);
-                        io.output += received;
+						received = transport.socket.receive(transport.output[]);
+						transport.output += received;
 					}
 					while (received);
 				}
@@ -291,18 +269,15 @@ class KqueueLoop : SelectorLoop
 				}
 				if (transport.socket.disconnected)
 				{
-                    kill(io, exception);
+					kill(transport, exception);
 				}
-                else if (io.output.length)
+				else if (transport.output.length)
 				{
-                    swapPendings.insertBack(io);
+					pendings.enqueue(transport);
 				}
 			}
 			else if (events[i].filter == EVFILT_WRITE)
 			{
-                auto transport = cast(SelectorStreamTransport) io.transport;
-                assert(transport !is null);
-
 				transport.writeReady = true;
 				if (transport.input.length)
 				{
@@ -316,7 +291,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");
 	}
@@ -331,9 +306,10 @@ class KqueueLoop : SelectorLoop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation could be successfully
 	 *          completed or scheduled, $(D_KEYWORD false) otherwise (the
-     *          transport is be destroyed then).
+	 *          transport will be destroyed then).
 	 */
-    protected override bool feed(SelectorStreamTransport transport, SocketException exception = null)
+	protected override bool feed(StreamTransport transport,
+	                             SocketException exception = null) @nogc
 	{
 		if (!super.feed(transport, exception))
 		{

source/tanya/async/event/selector.d

@@ -3,37 +3,42 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.event.selector;
 
 version (Posix):
 
 import tanya.async.loop;
+import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.async.watcher;
 import tanya.container.buffer;
+import tanya.container.vector;
 import tanya.memory;
 import tanya.memory.mmappool;
 import tanya.network.socket;
-import core.sys.posix.netinet.in_;
-import core.stdc.errno;
 
 /**
  * Transport for stream sockets.
  */
-class SelectorStreamTransport : StreamTransport
+package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
 {
-    private ConnectedSocket socket_;
-
-    /// Input buffer.
-    package WriteBuffer input;
-
 	private SelectorLoop loop;
 
+	private SocketException exception;
+
+	package ReadBuffer!ubyte output;
+
+	package WriteBuffer!ubyte input;
+
+	private Protocol protocol_;
+
+	private bool closing;
+
 	/// Received notification that the underlying socket is write-ready.
 	package bool writeReady;
 
@@ -41,28 +46,117 @@ class SelectorStreamTransport : StreamTransport
 	 * Params:
 	 * 	loop   = Event loop.
 	 * 	socket = Socket.
+	 *
+	 * Precondition: $(D_INLINECODE loop !is null && socket !is null)
 	 */
-    this(SelectorLoop loop, ConnectedSocket socket)
+	this(SelectorLoop loop, ConnectedSocket socket) @nogc
+	in 
+	{
+		assert(loop !is null);
+	}
+	body
+	{
+		super(socket);
+		this.loop = loop;
+		output = ReadBuffer!ubyte(8192, 1024, MmapPool.instance);
+		input = WriteBuffer!ubyte(8192, MmapPool.instance);
+		active = true;
+	}
+
+	/**
+	 * Returns: Socket.
+	 *
+	 * Postcondition: $(D_INLINECODE socket !is null)
+	 */
+	override @property ConnectedSocket socket() pure nothrow @safe @nogc
+	out (socket)
+	{
+		assert(socket !is null);
+	}
+	body
+	{
+		return cast(ConnectedSocket) socket_;
+	}
+
+	private @property void socket(ConnectedSocket socket) pure nothrow @safe @nogc
+	in
+	{
+		assert(socket !is null);
+	}
+	body
 	{
 		socket_ = socket;
-        this.loop = loop;
-        input = MmapPool.instance.make!WriteBuffer();
 	}
 
 	/**
-     * Close the transport and deallocate the data buffers.
+	 * Returns: Application protocol.
 	 */
-    ~this()
+	@property Protocol protocol() pure nothrow @safe @nogc
 	{
-        MmapPool.instance.dispose(input);
+		return protocol_;
 	}
 
 	/**
-     * Returns: Transport socket.
+	 * Switches the protocol.
+	 *
+	 * The protocol is deallocated by the event loop, it should currently be
+	 * allocated with $(D_PSYMBOL MmapPool).
+	 *
+	 * Params:
+	 * 	protocol = Application protocol.
+	 *
+	 * Precondition: $(D_INLINECODE protocol !is null)
 	 */
-    inout(ConnectedSocket) socket() inout pure nothrow @safe @nogc
+	@property void protocol(Protocol protocol) pure nothrow @safe @nogc
+	in
 	{
-        return socket_;
+		assert(protocol !is null);
+	}
+	body
+	{
+		protocol_ = protocol;
+	}
+
+	/**
+	 * Returns $(D_PARAM true) if the transport is closing or closed.
+	 */
+	bool isClosing() const pure nothrow @safe @nogc
+	{
+		return closing;
+	}
+
+	/**
+	 * Close the transport.
+	 *
+	 * Buffered data will be flushed.  No more data will be received.
+	 */
+	void close() @nogc
+	{
+		closing = true;
+		loop.reify(this, EventMask(Event.read, Event.write), EventMask(Event.write));
+	}
+
+	/**
+	 * Invokes the watcher callback.
+	 */
+	override void invoke() @nogc
+	{
+		if (output.length)
+		{
+			protocol.received(output[0 .. $]);
+			output.clear();
+			if (isClosing() && input.length == 0)
+			{
+				loop.kill(this);
+			}
+		}
+		else
+		{
+			protocol.disconnected(exception);
+			MmapPool.instance.dispose(protocol_);
+			defaultAllocator.dispose(exception);
+			active = false;
+		}
 	}
 
 	/**
@@ -71,7 +165,7 @@ class SelectorStreamTransport : StreamTransport
 	 * Params:
 	 * 	data = Data to send.
 	 */
-    void write(ubyte[] data)
+	void write(ubyte[] data) @nogc
 	{
 		if (!data.length)
 		{
@@ -111,28 +205,60 @@ class SelectorStreamTransport : StreamTransport
 abstract class SelectorLoop : Loop
 {
 	/// Pending connections.
-    protected ConnectionWatcher[] connections;
+	protected Vector!SocketWatcher connections;
 
-    this()
+	this() @nogc
 	{
 		super();
-        connections = MmapPool.instance.makeArray!ConnectionWatcher(maxEvents);
+		connections = Vector!SocketWatcher(maxEvents, MmapPool.instance);
 	}
 
-    ~this()
+	~this() @nogc
 	{
 		foreach (ref connection; connections)
 		{
-            // We want to free only IOWatchers. ConnectionWatcher are created by the
+			// We want to free only the transports. ConnectionWatcher are created by the
 			// user and should be freed by himself.
-            auto io = cast(IOWatcher) connection;
-            if (io !is null)
+			if (cast(StreamTransport) connection !is null)
 			{
-                MmapPool.instance.dispose(io);
-                connection = null;
+				MmapPool.instance.dispose(connection);
 			}
 		}
-        MmapPool.instance.dispose(connections);
+	}
+
+	/**
+	 * Should be called if the backend configuration changes.
+	 *
+	 * Params:
+	 * 	watcher   = Watcher.
+	 * 	oldEvents = The events were already set.
+	 * 	events    = The events should be set.
+	 *
+	 * Returns: $(D_KEYWORD true) if the operation was successful.
+	 */
+	override abstract protected bool reify(SocketWatcher watcher,
+	                                       EventMask oldEvents,
+	                                       EventMask events) @nogc;
+
+	/**
+	 * Kills the watcher and closes the connection.
+	 *
+	 * Params:
+	 * 	transport = Transport.
+	 * 	exception = Occurred exception.
+	 */
+	protected void kill(StreamTransport transport,
+	                    SocketException exception = null) @nogc
+	in
+	{
+		assert(transport !is null);
+	}
+	body
+	{
+		transport.socket.shutdown();
+		defaultAllocator.dispose(transport.socket);
+		transport.exception = exception;
+		pendings.enqueue(transport);
 	}
 
 	/**
@@ -147,7 +273,13 @@ 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(StreamTransport transport,
+	                    SocketException exception = null) @nogc
+	in
+	{
+		assert(transport !is null);
+	}
+	body
 	{
 		while (transport.input.length && transport.writeReady)
 		{
@@ -171,12 +303,13 @@ abstract class SelectorLoop : Loop
 		}
 		if (exception !is null)
 		{
-            auto watcher = cast(IOWatcher) connections[transport.socket.handle];
-            assert(watcher !is null);
-
-            kill(watcher, exception);
+			kill(transport, exception);
 			return false;
 		}
+		if (transport.input.length == 0 && transport.isClosing())
+		{
+			kill(transport);
+		}
 		return true;
 	}
 
@@ -186,7 +319,7 @@ abstract class SelectorLoop : Loop
 	 * Params:
 	 * 	watcher = Watcher.
 	 */
-    override void start(ConnectionWatcher watcher)
+	override void start(ConnectionWatcher watcher) @nogc
 	{
 		if (watcher.active)
 		{
@@ -195,7 +328,7 @@ abstract class SelectorLoop : Loop
 
 		if (connections.length <= watcher.socket)
 		{
-            MmapPool.instance.resizeArray(connections, watcher.socket.handle + maxEvents / 2);
+			connections.length = watcher.socket.handle + maxEvents / 2;
 		}
 		connections[watcher.socket.handle] = watcher;
 
@@ -208,7 +341,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);
@@ -232,35 +365,33 @@ abstract class SelectorLoop : Loop
 				break;
 			}
 
-            IOWatcher io;
-            auto transport = MmapPool.instance.make!SelectorStreamTransport(this, client);
+			StreamTransport transport;
 
-            if (connections.length >= client.handle)
+			if (connections.length > client.handle)
 			{
-                io = cast(IOWatcher) connections[client.handle];
+				transport = cast(StreamTransport) connections[client.handle];
 			}
 			else
 			{
-                MmapPool.instance.resizeArray(connections, client.handle + maxEvents / 2);
+				connections.length = client.handle + maxEvents / 2;
 			}
-            if (io is null)
+			if (transport is null)
 			{
-                io = MmapPool.instance.make!IOWatcher(transport,
-                                                      connection.protocol);
-                connections[client.handle] = io;
+				transport = MmapPool.instance.make!StreamTransport(this, client);
+				connections[client.handle] = transport;
 			}
 			else
 			{
-                io(transport, connection.protocol);
+				transport.socket = client;
 			}
 
-            reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
-            connection.incoming.insertBack(io);
+			reify(transport, EventMask(Event.none), EventMask(Event.read, Event.write));
+			connection.incoming.enqueue(transport);
 		}
 
 		if (!connection.incoming.empty)
 		{
-            swapPendings.insertBack(connection);
+			pendings.enqueue(connection);
 		}
 	}
 }

source/tanya/async/iocp.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.iocp;
 

source/tanya/async/loop.d

@@ -3,73 +3,78 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  *
  * ---
  * import tanya.async;
+ * import tanya.memory;
  * import tanya.network.socket;
  *
  * class EchoProtocol : TransmissionControlProtocol
  * {
  * 	private DuplexTransport transport;
  *
- *     void received(ubyte[] data)
+ * 	void received(in ubyte[] data) @nogc
  * 	{
  * 		transport.write(data);
  * 	}
  *
- *     void connected(DuplexTransport transport)
+ * 	void connected(DuplexTransport transport) @nogc
  * 	{
  * 		this.transport = transport;
  * 	}
  *
- *     void disconnected(SocketException exception = null)
+ * 	void disconnected(SocketException e) @nogc
  * 	{
  * 	}
  * }
  *
  * void main()
  * {
- *     auto address = new InternetAddress("127.0.0.1", cast(ushort) 8192);
+ * 	auto address = defaultAllocator.make!InternetAddress("127.0.0.1", cast(ushort) 8192);
+ *
  * 	version (Windows)
  * 	{
- *         auto sock = new OverlappedStreamSocket(AddressFamily.INET);
+ * 		auto sock = defaultAllocator.make!OverlappedStreamSocket(AddressFamily.INET);
  * 	}
  * 	else
  * 	{
- *         auto sock = new StreamSocket(AddressFamily.INET);
+ * 		auto sock = defaultAllocator.make!StreamSocket(AddressFamily.INET);
  * 		sock.blocking = false;
  * 	}
  *
  * 	sock.bind(address);
  * 	sock.listen(5);
  *
- *     auto io = new ConnectionWatcher(sock);
+ * 	auto io = defaultAllocator.make!ConnectionWatcher(sock);
  * 	io.setProtocol!EchoProtocol;
  *
  * 	defaultLoop.start(io);
  * 	defaultLoop.run();
  *
  * 	sock.shutdown();
+ * 	defaultAllocator.dispose(io);
+ * 	defaultAllocator.dispose(sock);
+ * 	defaultAllocator.dispose(address);
  * }
  * ---
  */
 module tanya.async.loop;
 
-import tanya.async.protocol;
-import tanya.async.transport;
-import tanya.async.watcher;
-import tanya.container.buffer;
-import tanya.memory;
-import tanya.memory.mmappool;
-import tanya.network.socket;
 import core.time;
 import std.algorithm.iteration;
 import std.algorithm.mutation;
 import std.typecons;
+import tanya.async.transport;
+import tanya.async.watcher;
+import tanya.container.buffer;
+import tanya.container.queue;
+import tanya.memory;
+import tanya.memory.mmappool;
+import tanya.network.socket;
 
 version (DisableBackends)
 {
@@ -119,32 +124,22 @@ enum Event : uint
 
 alias EventMask = BitFlags!Event;
 
-/**
- * Tries to set $(D_PSYMBOL MmapPool) to the default allocator.
- */
-shared static this()
-{
-    if (allocator is null)
-    {
-        allocator = MmapPool.instance;
-    }
-}
-
 /**
  * Event loop.
  */
 abstract class Loop
 {
-    /// Pending watchers.
-    protected PendingQueue!Watcher pendings;
+	private bool done;
 
-    protected PendingQueue!Watcher swapPendings;
+	/// Pending watchers.
+	protected Queue!Watcher pendings;
 
 	/**
 	 * 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 uint maxEvents()
+	const pure nothrow @safe @nogc
 	{
 		return 128U;
 	}
@@ -152,45 +147,47 @@ abstract class Loop
 	/**
 	 * Initializes the loop.
 	 */
-    this()
+	this() @nogc
 	{
-        pendings = MmapPool.instance.make!(PendingQueue!Watcher);
-        swapPendings = MmapPool.instance.make!(PendingQueue!Watcher);
+		pendings = Queue!Watcher(MmapPool.instance);
 	}
 
 	/**
 	 * Frees loop internals.
 	 */
-    ~this()
+	~this() @nogc
 	{
-        MmapPool.instance.dispose(pendings);
-        MmapPool.instance.dispose(swapPendings);
+		foreach (w; pendings)
+		{
+			MmapPool.instance.dispose(w);
+		}
 	}
 
 	/**
 	 * Starts the loop.
 	 */
-    void run()
+	void run() @nogc
 	{
-        done_ = false;
+		done = false;
 		do
 		{
 			poll();
 
 			// Invoke pendings
-            swapPendings.each!((ref p) => p.invoke());
-
-            swap(pendings, swapPendings);
+			foreach (ref w; pendings)
+			{
+				w.invoke();
 			}
-        while (!done_);
+		}
+		while (!done);
 	}
 
 	/**
 	 * Break out of the loop.
 	 */
-    void unloop() @safe pure nothrow
+	void unloop() @safe pure nothrow @nogc
 	{
-        done_ = true;
+		done = true;
 	}
 
 	/**
@@ -199,13 +196,14 @@ abstract class Loop
 	 * Params:
 	 * 	watcher = Watcher.
 	 */
-    void start(ConnectionWatcher watcher)
+	void start(ConnectionWatcher watcher) @nogc
 	{
 		if (watcher.active)
 		{
 			return;
 		}
 		watcher.active = true;
+
 		reify(watcher, EventMask(Event.none), EventMask(Event.accept));
 	}
 
@@ -215,7 +213,7 @@ abstract class Loop
 	 * Params:
 	 * 	watcher = Watcher.
 	 */
-    void stop(ConnectionWatcher watcher)
+	void stop(ConnectionWatcher watcher) @nogc
 	{
 		if (!watcher.active)
 		{
@@ -236,18 +234,18 @@ abstract class Loop
 	 *
 	 * Returns: $(D_KEYWORD true) if the operation was successful.
 	 */
-    abstract protected bool reify(ConnectionWatcher watcher,
+	abstract protected bool reify(SocketWatcher 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;
+		return pendings.empty ? blockTime_ : Duration.zero;
 	}
 
 	/**
@@ -257,7 +255,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.");
@@ -268,25 +266,10 @@ abstract class Loop
 		blockTime_ = blockTime;
 	}
 
-    /**
-     * Kills the watcher and closes the connection.
-     */
-    protected void kill(IOWatcher watcher, SocketException exception)
-    {
-        watcher.socket.shutdown();
-        defaultAllocator.dispose(watcher.socket);
-        MmapPool.instance.dispose(watcher.transport);
-        watcher.exception = exception;
-        swapPendings.insertBack(watcher);
-    }
-
 	/**
 	 * Does the actual polling.
 	 */
-    abstract protected void poll();
-
-    /// Whether the event loop should be stopped.
-    private bool done_;
+	abstract protected void poll() @nogc;
 
 	/// Maximal block time.
 	protected Duration blockTime_ = 1.dur!"minutes";
@@ -297,7 +280,6 @@ abstract class Loop
  */
 class BadLoopException : Exception
 {
-@nogc:
 	/**
 	 * Params:
 	 * 	file = The file where the exception occurred.
@@ -305,7 +287,7 @@ class BadLoopException : Exception
 	 * 	next = The previous exception in the chain of exceptions, if any.
 	 */
 	this(string file = __FILE__, size_t line = __LINE__, Throwable next = null)
-    pure @safe nothrow const
+	pure nothrow const @safe @nogc
 	{
 		super("Event loop cannot be initialized.", file, line, next);
 	}
@@ -318,7 +300,7 @@ class BadLoopException : Exception
  *
  * Returns: The default event loop.
  */
-@property Loop defaultLoop()
+@property Loop defaultLoop() @nogc
 {
 	if (defaultLoop_ !is null)
 	{
@@ -351,7 +333,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);
@@ -362,132 +344,3 @@ body
 }
 
 private Loop defaultLoop_;
-
-/**
- * Queue.
- *
- * Params:
- *     T = Content type.
- */
-class PendingQueue(T)
-{
-    /**
-     * Creates a new $(D_PSYMBOL Queue).
-     */
-    this()
-    {
-    }
-
-    /**
-     * Removes all elements from the queue.
-     */
-    ~this()
-    {
-        foreach (e; this)
-        {
-            MmapPool.instance.dispose(e);
-        }
-    }
-
-    /**
-     * Returns: First element.
-     */
-    @property ref T front()
-    in
-    {
-        assert(!empty);
-    }
-    body
-    {
-        return first.next.content;
-    }
-
-    /**
-     * Inserts a new element.
-     *
-     * Params:
-     *     x = New element.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    typeof(this) insertBack(T x)
-    {
-        Entry* temp = MmapPool.instance.make!Entry;
-        
-        temp.content = x;
-
-        if (empty)
-        {
-            first.next = rear = temp;
-        }
-        else
-        {
-            rear.next = temp;
-            rear = rear.next;
-        }
-
-        return this;
-    }
-
-    alias insert = insertBack;
-
-    /**
-     * Inserts a new element.
-     *
-     * Params:
-     *     x = New element.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    typeof(this) opOpAssign(string Op)(ref T x)
-        if (Op == "~")
-    {
-        return insertBack(x);
-    }
-
-    /**
-     * Returns: $(D_KEYWORD true) if the queue is empty.
-     */
-    @property bool empty() const @safe pure nothrow
-    {
-        return first.next is null;
-    }
-
-    /**
-     * Move position to the next element.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    typeof(this) popFront()
-    in
-    {
-        assert(!empty);
-    }
-    body
-    {
-        auto n = first.next.next;
-
-        MmapPool.instance.dispose(first.next);
-        first.next = n;
-
-        return this;
-    }
-
-    /**
-     * Queue entry.
-     */
-    protected struct Entry
-    {
-        /// Queue item content.
-        T content;
-
-        /// Next list item.
-        Entry* next;
-    }
-
-    /// The first element of the list.
-    protected Entry first;
-
-    /// The last element of the list.
-    protected Entry* rear;
-}

source/tanya/async/package.d

@@ -3,17 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async;
 
-public
-{
-    import tanya.async.loop;
-    import tanya.async.protocol;
-    import tanya.async.transport;
-    import tanya.async.watcher;
-}
+public import tanya.async.loop;
+public import tanya.async.protocol;
+public import tanya.async.transport;
+public import tanya.async.watcher;

source/tanya/async/protocol.d

@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.protocol;
 
@@ -22,7 +22,7 @@ interface Protocol
 	 * Params:
 	 * 	data = Read data.
 	 */
-    void received(ubyte[] data);
+	void received(in 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) @nogc;
 }
 
 /**

source/tanya/async/transport.d

@@ -3,13 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.transport;
 
+import tanya.async.protocol;
 import tanya.network.socket;
 
 /**
@@ -37,7 +38,7 @@ interface WriteTransport : Transport
 	 * Params:
 	 * 	data = Data to send.
 	 */
-    void write(ubyte[] data);
+	void write(ubyte[] data) @nogc;
 }
 
 /**
@@ -45,6 +46,46 @@ interface WriteTransport : Transport
  */
 interface DuplexTransport : ReadTransport, WriteTransport
 {
+	/**
+	 * Returns: Application protocol.
+	 *
+	 * Postcondition: $(D_INLINECODE protocol !is null)
+	 */
+	@property Protocol protocol() pure nothrow @safe @nogc
+	out (protocol)
+	{
+		assert(protocol !is null);
+	}
+
+	/**
+	 * Switches the protocol.
+	 *
+	 * The protocol is deallocated by the event loop, it should currently be
+	 * allocated with $(D_PSYMBOL MmapPool).
+	 *
+	 * Params:
+	 * 	protocol = Application protocol.
+	 *
+	 * Precondition: $(D_INLINECODE protocol !is null)
+	 */
+	@property void protocol(Protocol protocol) pure nothrow @safe @nogc
+	in
+	{
+		assert(protocol !is null);
+	}
+
+
+	/**
+	 * Returns $(D_PARAM true) if the transport is closing or closed.
+	 */
+	bool isClosing() const pure nothrow @safe @nogc;
+
+	/**
+	 * Close the transport.
+	 *
+	 * Buffered data will be flushed.  No more data will be received.
+	 */
+	void close() @nogc;
 }
 
 /**
@@ -52,12 +93,8 @@ interface DuplexTransport : ReadTransport, WriteTransport
  */
 interface SocketTransport : Transport
 {
-    @property inout(Socket) socket() inout pure nothrow @safe @nogc;
-}
-
-/**
- * Represents a connection-oriented socket transport.
+	/**
+	 * Returns: Socket.
 	 */
-package interface StreamTransport : DuplexTransport, SocketTransport
-{
+	@property Socket socket() pure nothrow @safe @nogc;
 }

source/tanya/async/watcher.d

@@ -3,31 +3,23 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.async.watcher;
 
+import std.functional;
+import std.exception;
 import tanya.async.loop;
 import tanya.async.protocol;
 import tanya.async.transport;
 import tanya.container.buffer;
+import tanya.container.queue;
 import tanya.memory;
 import tanya.memory.mmappool;
 import tanya.network.socket;
-import std.functional;
-import std.exception;
-
-version (Windows)
-{
-    import core.sys.windows.basetyps;
-    import core.sys.windows.mswsock;
-    import core.sys.windows.winbase;
-    import core.sys.windows.windef;
-    import core.sys.windows.winsock2;
-}
 
 /**
  * A watcher is an opaque structure that you allocate and register to record
@@ -41,202 +33,85 @@ abstract class Watcher
 	/**
 	 * Invoke some action on event.
 	 */
-    void invoke();
+	void invoke() @nogc;
 }
 
-class ConnectionWatcher : Watcher
+/**
+ * Socket watcher.
+ */
+abstract class SocketWatcher : Watcher
 {
 	/// Watched socket.
-    private Socket socket_;
-
-    /// Protocol factory.
-    protected Protocol delegate() protocolFactory;
-
-    package PendingQueue!IOWatcher incoming;
+	protected Socket socket_;
 
 	/**
 	 * Params:
 	 * 	socket = Socket.
+	 *
+	 * Precondition: $(D_INLINECODE socket !is null)
 	 */
-    this(Socket socket)
+	this(Socket socket) pure nothrow @safe @nogc
+	in
+	{
+		assert(socket !is null);
+	}
+	body
 	{
 		socket_ = socket;
-        incoming = MmapPool.instance.make!(PendingQueue!IOWatcher);
-    }
-
-    /// Ditto.
-    protected this()
-    {
-    }
-
-    ~this()
-    {
-        MmapPool.instance.dispose(incoming);
-    }
-
-    /*
-     * Params:
-     *     P = Protocol should be used.
-     */
-    void setProtocol(P : Protocol)()
-    {
-        this.protocolFactory = () => cast(Protocol) MmapPool.instance.make!P;
 	}
 
 	/**
 	 * Returns: Socket.
 	 */
-    @property inout(Socket) socket() inout pure nothrow @nogc
+	@property Socket socket() pure nothrow @safe @nogc
 	{
 		return socket_;
 	}
+}
+
+/**
+ * Connection watcher.
+ */
+class ConnectionWatcher : SocketWatcher
+{
+	/// Incoming connection queue.
+	Queue!DuplexTransport incoming;
+
+	private Protocol delegate() @nogc protocolFactory;
 
 	/**
-     * Returns: New protocol instance.
+	 * Params:
+	 * 	socket = Socket.
 	 */
-    @property Protocol protocol()
+	this(Socket socket) @nogc
+	{
+		super(socket);
+		incoming = Queue!DuplexTransport(MmapPool.instance);
+	}
+
+	/**
+	 * Params:
+	 * 	P = Protocol should be used.
+	 */
+	void setProtocol(P : Protocol)() @nogc
+	{
+		this.protocolFactory = () @nogc => cast(Protocol) MmapPool.instance.make!P;
+	}
+
+	/**
+	 * Invokes new connection callback.
+	 */
+	override void invoke() @nogc
 	in
 	{
 		assert(protocolFactory !is null, "Protocol isn't set.");
 	}
 	body
 	{
-        return protocolFactory();
-    }
-
-    /**
-     * Invokes new connection callback.
-     */
-    override void invoke()
+		foreach (transport; incoming)
 		{
-        foreach (io; incoming)
-        {
-            io.protocol.connected(cast(DuplexTransport) io.transport);
-        }
-    }
-}
-
-/**
- * Contains a pending watcher with the invoked events or a transport can be
- * read from.
- */
-class IOWatcher : ConnectionWatcher
-{
-    /// If an exception was thrown the transport should be already invalid.
-    private union
-    {
-        StreamTransport transport_;
-        SocketException exception_;
-    }
-
-    private Protocol protocol_;
-
-    /**
-     * Returns: Underlying output buffer.
-     */
-    package ReadBuffer output;
-
-    /**
-     * Params:
-     *     transport = Transport.
-     *     protocol  = New instance of the application protocol.
-     */
-    this(StreamTransport transport, Protocol protocol)
-    in
-    {
-        assert(transport !is null);
-        assert(protocol !is null);
-    }
-    body
-    {
-        super();
-        transport_ = transport;
-        protocol_ = protocol;
-        output = MmapPool.instance.make!ReadBuffer();
-        active = true;
-    }
-
-    /**
-     * Destroys the watcher.
-     */
-    protected ~this()
-    {
-        MmapPool.instance.dispose(output);
-        MmapPool.instance.dispose(protocol_);
-    }
-
-    /**
-     * Assigns a transport.
-     *
-     * Params:
-     *     transport = Transport.
-     *     protocol  = Application protocol.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    IOWatcher opCall(StreamTransport transport, Protocol protocol) pure nothrow @safe @nogc
-    in
-    {
-        assert(transport !is null);
-        assert(protocol !is null);
-    }
-    body
-    {
-        transport_ = transport;
-        protocol_ = protocol;
-        active = true;
-        return this;
-    }
-
-    /**
-     * Returns: Transport used by this watcher.
-     */
-    @property inout(StreamTransport) transport() inout pure nothrow @nogc
-    {
-        return transport_;
-    }
-
-    /**
-     * Sets an exception occurred during a read/write operation.
-     *
-     * Params:
-     *     exception = Thrown exception.
-     */
-    @property void exception(SocketException exception) pure nothrow @nogc
-    {
-        exception_ = exception;
-    }
-
-    /**
-     * Returns: Application protocol.
-     */
-    override @property Protocol protocol() pure nothrow @safe @nogc
-    {
-        return protocol_;
-    }
-
-    /**
-     * Returns: Socket.
-     */
-    override @property inout(Socket) socket() inout pure nothrow @nogc
-    {
-        return transport.socket;
-    }
-
-    /**
-     * Invokes the watcher callback.
-     */
-    override void invoke()
-    {
-        if (output.length)
-        {
-            protocol.received(output[0..$]);
-            output.clear();
-        }
-        else
-        {
-            protocol.disconnected(exception_);
-            active = false;
+			transport.protocol = protocolFactory();
+			transport.protocol.connected(transport);
 		}
 	}
 }

source/tanya/container/bit.d

@@ -1,510 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.container.bit;
-
-/**
- * Wrapper that allows bit manipulation on $(D_KEYWORD ubyte[]) array.
- */
-struct BitVector
-{
-    protected ubyte[] vector;
-
-    /**
-     * Params:
-     *     array = Array should be manipulated on.
-     */
-    this(inout(ubyte[]) array) inout pure nothrow @safe @nogc
-    in
-    {
-        assert(array.length <= size_t.max / 8);
-        assert(array !is null);
-    }
-    body
-    {
-        vector = array;
-    }
-
-    ///
-    unittest
-    {
-        ubyte[5] array1 = [234, 3, 252, 10, 18];
-        ubyte[3] array2 = [65, 13, 173];
-        auto bits = BitVector(array1);
-
-        assert(bits[] is array1);
-        assert(bits[] !is array2);
-
-        bits = BitVector(array2);
-        assert(bits[] is array2);
-
-    }
-
-    /**
-     * Returns: Number of bits in the vector.
-     */
-    @property inout(size_t) length() inout const pure nothrow @safe @nogc
-    {
-        return vector.length * 8;
-    }
-
-    /// Ditto.
-    inout(size_t) opDollar() inout const pure nothrow @safe @nogc
-    {
-        return vector.length * 8;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        assert(bits.length == 24);
-    }
-
-    /**
-     * Params:
-     *     bit = Bit position.
-     *
-     * Returns: $(D_KEYWORD true) if the bit on position $(D_PARAM bit) is set,
-     *          $(D_KEYWORD false) if not set.
-     */
-    inout(bool) opIndex(size_t bit) inout const pure nothrow @safe @nogc
-    in
-    {
-        assert(bit / 8 <= vector.length);
-    }
-    body
-    {
-        return (vector[bit / 8] & (0x80 >> (bit % 8))) != 0;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        assert(!bits[0]);
-        assert(bits[1]);
-        assert(bits[7]);
-        assert(!bits[8]);
-        assert(!bits[11]);
-        assert(bits[12]);
-        assert(bits[20]);
-        assert(bits[23]);
-    }
-
-    /**
-     * Returns: Underlying array.
-     */
-    inout(ubyte[]) opIndex() inout pure nothrow @safe @nogc
-    {
-        return vector;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        assert(bits[] is arr);
-    }
-
-    /**
-     * Params:
-     *     value = $(D_KEYWORD true) if the bit should be set,
-     *             $(D_KEYWORD false) if cleared.
-     *     bit   = Bit position.
-     *
-     * Returns: $(D_PSYMBOL this).
-     */
-    bool opIndexAssign(bool value, size_t bit) pure nothrow @safe @nogc
-    in
-    {
-        assert(bit / 8 <= vector.length);
-    }
-    body
-    {
-        if (value)
-        {
-            vector[bit / 8] |= (0x80 >> (bit % 8));
-        }
-        else
-        {
-            vector[bit / 8] &= ~(0x80 >> (bit % 8));
-        }
-        return value;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        bits[5] = bits[6] = true;
-        assert(bits[][0] == 71);
-
-        bits[14] = true;
-        bits[15] = false;
-        assert(bits[][1] == 14);
-
-        bits[16] = bits[23] = false;
-        assert(bits[][2] == 44);
-    }
-
-    /**
-     * Copies bits from $(D_PARAM vector) into this $(D_PSYMBOL BitVector).
-     *
-     * The array that should be assigned, can be smaller (but not larger) than
-     * the underlying array of this $(D_PSYMBOL BitVector), leading zeros will
-     * be added in this case to the left.
-     *
-     * Params:
-     *     vector = $(D_KEYWORD ubyte[]) array not larger than
-     *              `$(D_PSYMBOL length) / 8`.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    BitVector opAssign(ubyte[] vector) pure nothrow @safe @nogc
-    in
-    {
-        assert(vector.length <= this.vector.length);
-    }
-    body
-    {
-        immutable delta = this.vector.length - vector.length;
-        if (delta > 0)
-        {
-            this.vector[0..delta] = 0;
-        }
-        this.vector[delta..$] = vector[0..$];
-        return this;
-    }
-
-    ///
-    unittest
-    {
-        ubyte[5] array1 = [234, 3, 252, 10, 18];
-        ubyte[3] array2 = [65, 13, 173];
-        auto bits = BitVector(array1);
-
-        bits = array2;
-        assert(bits[][0] == 0);
-        assert(bits[][1] == 0);
-        assert(bits[][2] == 65);
-        assert(bits[][3] == 13);
-        assert(bits[][4] == 173);
-
-        bits = array2[0..2];
-        assert(bits[][0] == 0);
-        assert(bits[][1] == 0);
-        assert(bits[][2] == 0);
-        assert(bits[][3] == 65);
-        assert(bits[][4] == 13);
-    }
-
-    /**
-     * Support for bitwise operations.
-     *
-     * Params:
-     *     that = Another bit vector.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    BitVector opOpAssign(string op)(BitVector that) pure nothrow @safe @nogc
-        if ((op == "^") || (op == "|") || (op == "&"))
-    {
-        return opOpAssign(op)(that.vector);
-    }
-
-    /// Ditto.
-    BitVector opOpAssign(string op)(ubyte[] that) pure nothrow @safe @nogc
-        if ((op == "^") || (op == "|") || (op == "&"))
-    in
-    {
-        assert(that.length <= vector.length);
-    }
-    body
-    {
-        for (int i = cast(int) vector.length - 1; i >= 0; --i)
-        {
-            mixin("vector[i] " ~  op ~ "= " ~ "that[i];");
-        }
-        immutable delta = vector.length - that.length;
-        if (delta)
-        {
-            static if (op == "&")
-            {
-                vector[0..delta] = 0;
-            }
-        }
-        return this;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] array1 = [65, 13, 173];
-        ubyte[3] array2 = [0b01010010, 0b10111110, 0b10111110];
-        auto bits = BitVector(array1);
-
-        bits |= array2;
-        assert(bits[][0] == 0b01010011);
-        assert(bits[][1] == 0b10111111);
-        assert(bits[][2] == 0b10111111);
-
-        bits &= array2;
-        assert(bits[][0] == array2[0]);
-        assert(bits[][1] == array2[1]);
-        assert(bits[][2] == array2[2]);
-
-        bits ^= array2;
-        assert(bits[][0] == 0);
-        assert(bits[][1] == 0);
-        assert(bits[][2] == 0);
-    }
-
-    /**
-     * Support for shift operations.
-     *
-     * Params:
-     *     n = Number of bits.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    BitVector opOpAssign(string op)(in size_t n) pure nothrow @safe @nogc
-        if ((op == "<<") || (op == ">>"))
-
-    {
-        if (n >= length)
-        {
-            vector[0..$] = 0;
-        }
-        else if (n != 0)
-        {
-            immutable bit = n % 8, step = n / 8;
-            immutable delta = 8 - bit;
-            size_t i, j;
-
-            static if (op == "<<")
-            {
-                for (j = step; j < vector.length - 1; ++i)
-                {
-                    vector[i] = cast(ubyte)((vector[j] << bit)
-                              | vector[++j] >> delta);
-                }
-                vector[i] = cast(ubyte)(vector[j] << bit);
-                vector[$ - step ..$] = 0;
-            }
-            else static if (op == ">>")
-            {
-                for (i = vector.length - 1, j = i - step; j > 0; --i)
-                {
-                    vector[i] = cast(ubyte)((vector[j] >> bit)
-                              | vector[--j] << delta);
-                }
-                vector[i] = cast(ubyte)(vector[j] >> bit);
-                vector[0..step] = 0;
-            }
-        }
-        return this;
-    }
-
-    ///
-    nothrow @safe @nogc unittest
-    {
-        ubyte[4] arr = [0b10111110, 0b11110010, 0b01010010, 0b01010011];
-        auto bits = BitVector(arr);
-
-        bits <<= 0;
-        assert(bits[][0] == 0b10111110 && bits[][1] == 0b11110010
-            && bits[][2] == 0b01010010 && bits[][3] == 0b01010011);
-
-        bits <<= 2;
-        assert(bits[][0] == 0b11111011 && bits[][1] == 0b11001001
-            && bits[][2] == 0b01001001 && bits[][3] == 0b01001100);
-
-        bits <<= 4;
-        assert(bits[][0] == 0b10111100 && bits[][1] == 0b10010100
-            && bits[][2] == 0b10010100 && bits[][3] == 0b11000000);
-
-        bits <<= 8;
-        assert(bits[][0] == 0b10010100 && bits[][1] == 0b10010100
-            && bits[][2] == 0b11000000 && bits[][3] == 0b00000000);
-
-        bits <<= 7;
-        assert(bits[][0] == 0b01001010 && bits[][1] == 0b01100000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        bits <<= 25;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        arr = [0b00110011, 0b11001100, 0b11111111, 0b01010101];
-        bits <<= 24;
-        assert(bits[][0] == 0b01010101 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        arr[1] = 0b11001100;
-        arr[2] = 0b11111111;
-        arr[3] = 0b01010101;
-        bits <<= 12;
-        assert(bits[][0] == 0b11001111 && bits[][1] == 0b11110101
-            && bits[][2] == 0b01010000 && bits[][3] == 0b00000000);
-
-        bits <<= 100;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        arr = [0b10111110, 0b11110010, 0b01010010, 0b01010011];
-        bits >>= 0;
-        assert(bits[][0] == 0b10111110 && bits[][1] == 0b11110010
-            && bits[][2] == 0b01010010 && bits[][3] == 0b01010011);
-
-        bits >>= 2;
-        assert(bits[][0] == 0b00101111 && bits[][1] == 0b10111100
-            && bits[][2] == 0b10010100 && bits[][3] == 0b10010100);
-
-        bits >>= 4;
-        assert(bits[][0] == 0b00000010 && bits[][1] == 0b11111011
-            && bits[][2] == 0b11001001 && bits[][3] == 0b01001001);
-
-        bits >>= 8;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000010
-            && bits[][2] == 0b11111011 && bits[][3] == 0b11001001);
-
-        bits >>= 7;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000101 && bits[][3] == 0b11110111);
-
-        bits >>= 25;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-
-        arr = [0b00110011, 0b11001100, 0b11111111, 0b01010101];
-        bits >>= 24;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00110011);
-
-        arr[1] = 0b11001100;
-        arr[2] = 0b11111111;
-        arr[3] = 0b01010101;
-        bits >>= 12;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00001100 && bits[][3] == 0b11001111);
-
-        bits >>= 100;
-        assert(bits[][0] == 0b00000000 && bits[][1] == 0b00000000
-            && bits[][2] == 0b00000000 && bits[][3] == 0b00000000);
-    }
-
-    /**
-     * Negates all bits.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    BitVector opUnary(string op)() pure nothrow @safe @nogc
-        if (op == "~")
-    {
-        foreach (ref b; vector)
-        {
-            b = ~b;
-        }
-        return this;
-    }
-
-    ///
-    unittest
-    {
-        // [01000001, 00001101, 10101101]
-        ubyte[3] arr = [65, 13, 173];
-        auto bits = BitVector(arr);
-
-        ~bits;
-        assert(bits[][0] == 0b10111110);
-        assert(bits[][1] == 0b11110010);
-        assert(bits[][2] == 0b01010010);
-    }
-
-    /**
-     * Iterates through all bits.
-     *
-     * Params:
-     *     dg = $(D_KEYWORD foreach) delegate.
-     *
-     * Returns: By $(D_PARAM dg) returned value.
-     */
-    int opApply(int delegate(size_t, bool) dg)
-    {
-        int result;
-        foreach (i, ref v; vector)
-        {
-            foreach (c; 0..8)
-            {
-                result = dg(i * 8 + c, (v & (0x80 >> c)) != 0);
-                if (result)
-                {
-                    return result;
-                }
-            }
-        }
-        return result;
-    }
-
-    /// Ditto.
-    int opApply(int delegate(bool) dg)
-    {
-        int result;
-        foreach (ref v; vector)
-        {
-            foreach (c; 0..8)
-            {
-                result = dg((v & (0x80 >> c)) != 0);
-                if (result)
-                {
-                    return result;
-                }
-            }
-        }
-        return result;
-    }
-
-    ///
-    unittest
-    {
-        ubyte[2] arr = [0b01000001, 0b00001101];
-        auto bits = BitVector(arr);
-        size_t c;
-
-        foreach (i, v; bits)
-        {
-            assert(i == c);
-            if (i == 1 || i == 7 || i == 15 || i == 13 || i == 12)
-            {
-                assert(v);
-            }
-            else
-            {
-                assert(!v);
-            }
-            ++c;
-        }
-        assert(c == 16);
-    }
-}

source/tanya/container/buffer.d

@@ -3,13 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.container.buffer;
 
+import std.traits;
 import tanya.memory;
 
 version (unittest)
@@ -33,51 +34,6 @@ version (unittest)
     }
 }
 
-/**
- * Interface for implemeting input/output buffers.
- */
-interface Buffer
-{
-    /**
-     * Returns: The size of the internal buffer.
-     */
-    @property size_t capacity() const @nogc @safe pure nothrow;
-
-    /**
-     * Returns: Data size.
-     */
-    @property size_t length() const @nogc @safe pure nothrow;
-
-    /**
-     * Returns: Available space.
-     */
-    @property size_t free() const @nogc @safe pure nothrow;
-
-    /**
-     * Params:
-     *     start = Start position.
-     *     end   = End position.
-     *
-     * Returns: Array between $(D_PARAM start) and $(D_PARAM end).
-     */
-    @property ubyte[] opSlice(size_t start, size_t end)
-    in
-    {
-        assert(start <= end);
-        assert(end <= length);
-    }
-
-    /**
-    * Returns: Length of available data.
-    */
-    @property size_t opDollar() const pure nothrow @safe @nogc;
-
-    /**
-     * Returns: Data chunk.
-     */
-    @property ubyte[] opIndex();
-}
-
 /**
  * Self-expanding buffer, that can be used with functions returning the number
  * of the read bytes.
@@ -87,26 +43,30 @@ interface Buffer
  * available data. But only one asynchronous call at a time is supported. Be
  * sure to call $(D_PSYMBOL ReadBuffer.clear()) before you append the result
  * of the pended asynchronous call.
+ *
+ * Params:
+ *  T = Buffer type.
  */
-class ReadBuffer : Buffer
+struct ReadBuffer(T = ubyte)
+    if (isScalarType!T)
 {
     /// Internal buffer.
-    protected ubyte[] buffer_;
+    private T[] buffer_;
 
     /// Filled buffer length.
-    protected size_t length_;
+    private size_t length_;
 
     /// Start of available data.
-    protected size_t start;
+    private size_t start;
 
     /// Last position returned with $(D_KEYWORD []).
-    protected size_t ring;
+    private size_t ring;
 
     /// Available space.
-    protected immutable size_t minAvailable;
+    private immutable size_t minAvailable = 1024;
 
     /// Size by which the buffer will grow.
-    protected immutable size_t blockSize;
+    private immutable size_t blockSize = 8192;
 
     invariant
     {
@@ -123,39 +83,50 @@ class ReadBuffer : Buffer
      *                 will grow.
      *  minAvailable = minimal size should be always  available to fill.
      *                 So it will reallocate if $(D_INLINECODE
-     *                    $(D_PSYMBOL free) < $(D_PARAM minAvailable)
-     *                    ).
+     *                 $(D_PSYMBOL free) < $(D_PARAM minAvailable)).
+     *  allocator    = Allocator.
      */
-    this(size_t size = 8192,
-         size_t minAvailable = 1024)
+    this(in size_t size,
+         in size_t minAvailable = 1024,
+         shared Allocator allocator = defaultAllocator) @trusted
     {
+        this(allocator);
         this.minAvailable = minAvailable;
         this.blockSize = size;
-        defaultAllocator.resizeArray!ubyte(buffer_, size);
+        buffer_ = cast(T[]) allocator_.allocate(size * T.sizeof);
+    }
+
+    /// Ditto.
+    this(shared Allocator allocator)
+    in
+    {
+        assert(allocator_ is null);
+    }
+    body
+    {
+        allocator_ = allocator;
     }
 
     /**
      * Deallocates the internal buffer.
      */
-    ~this()
+    ~this() @trusted
     {
-        defaultAllocator.dispose(buffer_);
+        allocator.deallocate(buffer_);
     }
 
     ///
     unittest
     {
-        auto b = defaultAllocator.make!ReadBuffer;
-        assert(b.capacity == 8192);
+        ReadBuffer!ubyte b;
+        assert(b.capacity == 0);
         assert(b.length == 0);
-
-        defaultAllocator.dispose(b);
     }
 
     /**
      * Returns: The size of the internal buffer.
      */
-    @property size_t capacity() const @nogc @safe pure nothrow
+    @property size_t capacity() const
     {
         return buffer_.length;
     }
@@ -163,26 +134,28 @@ class ReadBuffer : Buffer
     /**
      * Returns: Data size.
      */
-    @property size_t length() const @nogc @safe pure nothrow
+    @property size_t length() const
     {
         return length_ - start;
     }
 
+    /// Ditto.
+    alias opDollar = length;
+
     /**
      * Clears the buffer.
      *
      * Returns: $(D_KEYWORD this).
      */
-    ReadBuffer clear() pure nothrow @safe @nogc
+    void clear()
     {
         start = length_ = ring;
-        return this;
     }
 
     /**
      * Returns: Available space.
      */
-    @property size_t free() const pure nothrow @safe @nogc
+    @property size_t free() const
     {
         return length > ring ? capacity - length : capacity - ring;
     }
@@ -190,19 +163,17 @@ class ReadBuffer : Buffer
     ///
     unittest
     {
-        auto b = defaultAllocator.make!ReadBuffer;
+        ReadBuffer!ubyte b;
         size_t numberRead;
 
-        // Fills the buffer with values 0..10
-        assert(b.free == b.blockSize);
+        assert(b.free == 0);
 
+        // Fills the buffer with values 0..10
         numberRead = fillBuffer(b[], b.free, 0, 10);
         b += numberRead;
         assert(b.free == b.blockSize - numberRead);
         b.clear();
         assert(b.free == b.blockSize);
-
-        defaultAllocator.dispose(b);
     }
 
     /**
@@ -213,7 +184,7 @@ class ReadBuffer : Buffer
      *
      * Returns: $(D_KEYWORD this).
      */
-    ReadBuffer opOpAssign(string op)(size_t length)
+    ref ReadBuffer opOpAssign(string op)(in size_t length)
         if (op == "+")
     {
         length_ += length;
@@ -224,7 +195,7 @@ class ReadBuffer : Buffer
     ///
     unittest
     {
-        auto b = defaultAllocator.make!ReadBuffer;
+        ReadBuffer!ubyte b;
         size_t numberRead;
         ubyte[] result;
 
@@ -232,7 +203,7 @@ class ReadBuffer : Buffer
         numberRead = fillBuffer(b[], b.free, 0, 10);
         b += numberRead;
 
-        result = b[0..$];
+        result = b[0 .. $];
         assert(result[0] == 0);
         assert(result[1] == 1);
         assert(result[9] == 9);
@@ -251,16 +222,6 @@ class ReadBuffer : Buffer
         assert(result[9] == 9);
         assert(result[10] == 20);
         assert(result[14] == 24);
-
-        defaultAllocator.dispose(b);
-    }
-
-    /**
-     * Returns: Length of available data.
-     */
-    @property size_t opDollar() const pure nothrow @safe @nogc
-    {
-        return length;
     }
 
     /**
@@ -270,7 +231,7 @@ class ReadBuffer : Buffer
      *
      * Returns: Array between $(D_PARAM start) and $(D_PARAM end).
      */
-    @property ubyte[] opSlice(size_t start, size_t end) pure nothrow @safe @nogc
+    T[] opSlice(in size_t start, in size_t end)
     {
         return buffer_[this.start + start .. this.start + end];
     }
@@ -282,11 +243,11 @@ class ReadBuffer : Buffer
      *
      * Returns: A free chunk of the buffer.
      */
-    ubyte[] opIndex()
+    T[] opIndex()
     {
         if (start > 0)
         {
-            auto ret = buffer_[0..start];
+            auto ret = buffer_[0 .. start];
             ring = 0;
             return ret;
         }
@@ -294,17 +255,22 @@ class ReadBuffer : Buffer
         {
             if (capacity - length < minAvailable)
             {
-                defaultAllocator.resizeArray!ubyte(buffer_, capacity + blockSize);
+                void[] buf = buffer_;
+                immutable cap = capacity;
+                () @trusted {
+                    allocator.reallocate(buf, (cap + blockSize) * T.sizeof);
+                    buffer_ = cast(T[]) buf;
+                }();
             }
             ring = length_;
-            return buffer_[length_..$];
+            return buffer_[length_ .. $];
         }
     }
 
     ///
     unittest
     {
-        auto b = defaultAllocator.make!ReadBuffer;
+        ReadBuffer!ubyte b;
         size_t numberRead;
         ubyte[] result;
 
@@ -313,86 +279,107 @@ class ReadBuffer : Buffer
         b += numberRead;
 
         assert(b.length == 10);
-        result = b[0..$];
+        result = b[0 .. $];
         assert(result[0] == 0);
         assert(result[9] == 9);
         b.clear();
         assert(b.length == 0);
-
-        defaultAllocator.dispose(b);
     }
+
+    mixin DefaultAllocator;
+}
+
+private unittest
+{
+    static assert(is(ReadBuffer!int));
 }
 
 /**
  * Circular, self-expanding buffer with overflow support. Can be used with
- * functions returning returning the number of the transferred bytes.
+ * functions returning the number of the transferred bytes.
  *
  * The buffer is optimized for situations where you read all the data from it
  * at once (without writing to it occasionally). It can become ineffective if
  * you permanently keep some data in the buffer and alternate writing and
  * reading, because it may allocate and move elements.
+ *
+ * Params:
+ *  T = Buffer type.
  */
-class WriteBuffer : Buffer
+struct WriteBuffer(T = ubyte)
+    if (isScalarType!T)
 {
     /// Internal buffer.
-    protected ubyte[] buffer_;
+    private T[] buffer_;
 
     /// Buffer start position.
-    protected size_t start;
+    private size_t start;
 
     /// Buffer ring area size. After this position begins buffer overflow area.
-    protected size_t ring;
+    private size_t ring;
 
     /// Size by which the buffer will grow.
-    protected immutable size_t blockSize;
+    private immutable size_t blockSize;
 
     /// The position of the free area in the buffer.
-    protected size_t position;
+    private size_t position;
 
     invariant
     {
         assert(blockSize > 0);
-        // position can refer to an element outside the buffer if the buffer is full.
+        // Position can refer to an element outside the buffer if the buffer is full.
         assert(position <= buffer_.length);
     }
 
     /**
      * Params:
-     *  size = Initial buffer size and the size by which the buffer
-     *            will grow.
+     * 	size      = Initial buffer size and the size by which the buffer will
+     * 	            grow.
+     * 	allocator = Allocator.
+     *
+     * Precondition: $(D_INLINECODE size > 0 && allocator !is null)
      */
-    this(size_t size = 8192)
+    this(in size_t size, shared Allocator allocator = defaultAllocator) @trusted
+    in
+    {
+        assert(size > 0);
+        assert(allocator !is null);
+    }
+    body
     {
         blockSize = size;
         ring = size - 1;
-        defaultAllocator.resizeArray!ubyte(buffer_, size);
+        allocator_ = allocator;
+        buffer_ = cast(T[]) allocator_.allocate(size * T.sizeof);
     }
 
+    @disable this();
+
     /**
      * Deallocates the internal buffer.
      */
     ~this()
     {
-        defaultAllocator.dispose(buffer_);
+        allocator.deallocate(buffer_);
     }
 
     /**
      * Returns: The size of the internal buffer.
      */
-    @property size_t capacity() const @nogc @safe pure nothrow
+    @property size_t capacity() const
     {
         return buffer_.length;
     }
 
     /**
      * Note that $(D_PSYMBOL length) doesn't return the real length of the data,
-     * but only the array length that will be returned with $(D_PSYMBOL buffer)
-     * next time. Be sure to call $(D_PSYMBOL buffer) and set $(D_KEYWORD +=)
+     * but only the array length that will be returned with $(D_PSYMBOL opIndex)
+     * next time. Be sure to call $(D_PSYMBOL opIndex) and set $(D_KEYWORD +=)
      * until $(D_PSYMBOL length) returns 0.
      *
      * Returns: Data size.
      */
-    @property size_t length() const @nogc @safe pure nothrow
+    @property size_t length() const
     {
         if (position > ring || position < start) // Buffer overflowed
         {
@@ -404,18 +391,13 @@ class WriteBuffer : Buffer
         }
     }
 
-    /**
-    * Returns: Length of available data.
-    */
-    @property size_t opDollar() const pure nothrow @safe @nogc
-    {
-        return length;
-    }
+    /// Ditto.
+    alias opDollar = length;
 
     ///
     unittest
     {
-        auto b = defaultAllocator.make!WriteBuffer(4);
+        auto b = WriteBuffer!ubyte(4);
         ubyte[3] buf = [48, 23, 255];
 
         b ~= buf;
@@ -432,14 +414,12 @@ class WriteBuffer : Buffer
         assert(b.length == 5);
         b += b.length;
         assert(b.length == 0);
-
-        defaultAllocator.dispose(b);
     }
 
     /**
      * Returns: Available space.
      */
-    @property size_t free() const @nogc @safe pure nothrow
+    @property size_t free() const
     {
         return capacity - length;
     }
@@ -448,9 +428,9 @@ class WriteBuffer : Buffer
      * Appends data to the buffer.
      *
      * Params:
-     *     buffer = Buffer chunk got with $(D_PSYMBOL buffer).
+     * 	buffer = Buffer chunk got with $(D_PSYMBOL opIndex).
      */
-    WriteBuffer opOpAssign(string op)(ubyte[] buffer)
+    ref WriteBuffer opOpAssign(string op)(in T[] buffer)
         if (op == "~")
     {
         size_t end, start;
@@ -465,7 +445,7 @@ class WriteBuffer : Buffer
                 end = afterRing;
             }
             start = end - position;
-            buffer_[position..end] = buffer[0..start];
+            buffer_[position .. end] = buffer[0 .. start];
             if (end == afterRing)
             {
                 position = this.start == 0 ? afterRing : 0;
@@ -485,7 +465,7 @@ class WriteBuffer : Buffer
                 end = this.start;
             }
             auto areaEnd = end - position + start;
-            buffer_[position..end] = buffer[start..areaEnd];
+            buffer_[position .. end] = buffer[start .. areaEnd];
             position = end == this.start ? ring + 1 : end - position;
             start = areaEnd;
         }
@@ -496,11 +476,14 @@ class WriteBuffer : Buffer
             end = position + buffer.length - start;
             if (end > capacity)
             {
-                auto newSize = end / blockSize * blockSize + blockSize;
-
-                defaultAllocator.resizeArray!ubyte(buffer_, newSize);
+                auto newSize = (end / blockSize * blockSize + blockSize) * T.sizeof;
+                () @trusted {
+                    void[] buf = buffer_;
+                    allocator.reallocate(buf, newSize);
+                    buffer_ = cast(T[]) buf;
+                }();
             }
-            buffer_[position..end] = buffer[start..$];
+            buffer_[position .. end] = buffer[start .. $];
             position = end;
             if (this.start == 0)
             {
@@ -514,7 +497,7 @@ class WriteBuffer : Buffer
     ///
     unittest
     {
-        auto b = defaultAllocator.make!WriteBuffer(4);
+        auto b = WriteBuffer!ubyte(4);
         ubyte[3] buf = [48, 23, 255];
 
         b ~= buf;
@@ -532,31 +515,31 @@ class WriteBuffer : Buffer
         assert(b.capacity == 8);
         assert(b.buffer_[0] == 23 && b.buffer_[1] == 255
             && b.buffer_[2] == 48 && b.buffer_[3] == 23 && b.buffer_[4] == 255);
+    }
 
-        defaultAllocator.dispose(b);
-
-        b = make!WriteBuffer(defaultAllocator, 2);
+    ///
+    unittest
+    {
+        auto b = WriteBuffer!ubyte(2);
+        ubyte[3] buf = [48, 23, 255];
 
         b ~= buf;
         assert(b.start == 0);
         assert(b.capacity == 4);
         assert(b.ring == 3);
         assert(b.position == 3);
-
-        defaultAllocator.dispose(b);
     }
 
     /**
      * Sets how many bytes were written. It will shrink the buffer
-     * appropriately. Always set this property after calling
-     * $(D_PSYMBOL buffer).
+     * appropriately. Always call it after $(D_PSYMBOL opIndex).
      *
      * Params:
      * 	length = Length of the written data.
      *
      * Returns: $(D_KEYWORD this).
      */
-    @property WriteBuffer opOpAssign(string op)(size_t length) pure nothrow @safe @nogc
+    ref WriteBuffer opOpAssign(string op)(in size_t length)
         if (op == "+")
     in
     {
@@ -583,19 +566,21 @@ class WriteBuffer : Buffer
         {
             auto overflow = position - afterRing;
 
-            if (overflow > length) {
-                buffer_[start.. start + length] = buffer_[afterRing.. afterRing + length];
-                buffer_[afterRing.. afterRing + length] = buffer_[afterRing + length ..position];
+            if (overflow > length)
+            {
+                immutable afterLength = afterRing + length;
+                buffer_[start .. start + length] = buffer_[afterRing .. afterLength];
+                buffer_[afterRing .. afterLength] = buffer_[afterLength .. position];
                 position -= length;
             }
             else if (overflow == length)
             {
-                buffer_[start.. start + overflow] = buffer_[afterRing..position];
+                buffer_[start .. start + overflow] = buffer_[afterRing .. position];
                 position -= overflow;
             }
             else
             {
-                buffer_[start.. start + overflow] = buffer_[afterRing..position];
+                buffer_[start .. start + overflow] = buffer_[afterRing .. position];
                 position = overflow;
             }
             start += length;
@@ -620,7 +605,7 @@ class WriteBuffer : Buffer
     ///
     unittest
     {
-        auto b = defaultAllocator.make!WriteBuffer;
+        auto b = WriteBuffer!ubyte(6);
         ubyte[6] buf = [23, 23, 255, 128, 127, 9];
 
         b ~= buf;
@@ -629,8 +614,6 @@ class WriteBuffer : Buffer
         assert(b.length == 4);
         b += 4;
         assert(b.length == 0);
-
-        defaultAllocator.dispose(b);
     }
 
     /**
@@ -639,62 +622,67 @@ class WriteBuffer : Buffer
      * After calling it, set $(D_KEYWORD +=) to the length could be
      * written.
      *
-     * $(D_PSYMBOL buffer) may return only part of the data. You may need
-     * to call it (and set $(D_KEYWORD +=) several times until
+     * $(D_PSYMBOL opIndex) may return only part of the data. You may need
+     * to call it and set $(D_KEYWORD +=) several times until
      * $(D_PSYMBOL length) is 0. If all the data can be written,
      * maximally 3 calls are required.
      *
      * Returns: A chunk of data buffer.
      */
-    @property ubyte[] opSlice(size_t start, size_t end) pure nothrow @safe @nogc
+    T[] opSlice(in size_t start, in size_t end)
     {
         immutable internStart = this.start + start;
 
         if (position > ring || position < start) // Buffer overflowed
         {
-            return buffer_[this.start.. ring + 1 - length + end];
+            return buffer_[this.start .. ring + 1 - length + end];
         }
         else
         {
-            return buffer_[this.start.. this.start + end];
+            return buffer_[this.start .. this.start + end];
         }
     }
 
     ///
     unittest
     {
-        auto b = defaultAllocator.make!WriteBuffer(6);
+        auto b = WriteBuffer!ubyte(6);
         ubyte[6] buf = [23, 23, 255, 128, 127, 9];
 
         b ~= buf;
-        assert(b[0..$] == buf[0..6]);
+        assert(b[0 .. $] == buf[0 .. 6]);
         b += 2;
 
-        assert(b[0..$] == buf[2..6]);
+        assert(b[0 .. $] == buf[2 .. 6]);
 
         b ~= buf;
-        assert(b[0..$] == buf[2..6]);
+        assert(b[0 .. $] == buf[2 .. 6]);
         b += b.length;
 
-        assert(b[0..$] == buf[0..6]);
+        assert(b[0 .. $] == buf[0 .. 6]);
         b += b.length;
-
-        defaultAllocator.dispose(b);
     }
 
     /**
      * After calling it, set $(D_KEYWORD +=) to the length could be
      * written.
      *
-     * $(D_PSYMBOL buffer) may return only part of the data. You may need
-     * to call it (and set $(D_KEYWORD +=) several times until
+     * $(D_PSYMBOL opIndex) may return only part of the data. You may need
+     * to call it and set $(D_KEYWORD +=) several times until
      * $(D_PSYMBOL length) is 0. If all the data can be written,
      * maximally 3 calls are required.
      *
      * Returns: A chunk of data buffer.
      */
-    @property ubyte[] opIndex() pure nothrow @safe @nogc
+    T[] opIndex()
     {
         return opSlice(0, length);
     }
+
+    mixin DefaultAllocator;
+}
+
+private unittest
+{
+    static assert(is(typeof(WriteBuffer!int(5))));
 }

source/tanya/container/entry.d

@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * Internal package used by containers that rely on entries/nodes.
+ *
+ * Copyright: Eugene Wissner 2016-2017.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ */
+module tanya.container.entry;
+
+package struct SEntry(T)
+{
+    /// Item content.
+    T content;
+
+    /// Next item.
+    SEntry* next;
+}

source/tanya/container/package.d

@@ -3,7 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Abstract data types whose instances are collections of other objects.
+ *
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)

source/tanya/container/queue.d

@@ -3,103 +3,98 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * FIFO queue.
+ *
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.container.queue;
 
+import core.exception;
+import std.traits;
+import std.algorithm.mutation;
+import tanya.container.entry;
 import tanya.memory;
 
 /**
- * Queue.
+ * FIFO queue.
  *
  * Params:
  *  T = Content type.
  */
-class Queue(T)
+struct Queue(T)
 {
-	/**
-	 * Creates a new $(D_PSYMBOL Queue).
-	 *
-	 * Params:
-	 * 	allocator = The allocator should be used for the element
-	 * 	            allocations.
-	 */
-	this(shared Allocator allocator = defaultAllocator)
-	{
-		this.allocator = allocator;
-	}
-
     /**
      * Removes all elements from the queue.
      */
     ~this()
     {
-		foreach (e; this)
+        while (!empty)
         {
-            static if (isFinalizable!T)
-            {
-                dispose(allocator, e);
-            }
+            dequeue();
         }
     }
 
     /**
-	 * Returns: First element.
+     * Returns how many elements are in the queue. It iterates through the queue
+     * to count the elements.
+     *
+     * Returns: How many elements are in the queue.
      */
-	@property ref T front()
-	in
+    size_t length() const
     {
-		assert(!empty);
+        size_t len;
+        for (const(SEntry!T)* i = first; i !is null; i = i.next)
+        {
+            ++len;
         }
-	body
-	{
-		return first.next.content;
+        return len;
     }
 
-	/**
-	 * Inserts a new element.
-	 *
-	 * Params:
-	 * 	x = New element.
-	 *
-	 * Returns: $(D_KEYWORD this).
-	 */
-	typeof(this) insertBack(T x)
+    ///
+    unittest
     {
-		Entry* temp = make!Entry(allocator);
+        Queue!int q;
 
-		temp.content = x;
+        assert(q.length == 0);
+        q.enqueue(5);
+        assert(q.length == 1);
+        q.enqueue(4);
+        assert(q.length == 2);
+        q.enqueue(9);
+        assert(q.length == 3);
 
+        q.dequeue();
+        assert(q.length == 2);
+        q.dequeue();
+        assert(q.length == 1);
+        q.dequeue();
+        assert(q.length == 0);
+    }
+
+    private void enqueueEntry(ref SEntry!T* entry)
+    {
         if (empty)
         {
-			first.next = rear = temp;
+            first = rear = entry;
         }
         else
         {
-			rear.next = temp;
+            rear.next = entry;
             rear = rear.next;
         }
-
-		return this;
     }
 
-	alias insert = insertBack;
-
-	///
-	unittest
+    private SEntry!T* allocateEntry()
     {
-		auto q = make!(Queue!int)(defaultAllocator);
-		int[2] values = [8, 9];
-
-		q.insertBack(values[0]);
-		assert(q.front is values[0]);
-		q.insertBack(values[1]);
-		assert(q.front is values[0]);
-
-		dispose(defaultAllocator, q);
+        auto temp = cast(SEntry!T*) allocator.allocate(SEntry!T.sizeof);
+        if (temp is null)
+        {
+            onOutOfMemoryError();
+        }
+        return temp;
     }
 
     /**
@@ -107,112 +102,187 @@ class Queue(T)
      *
      * Params:
      *  x = New element.
-	 *
-	 * Returns: $(D_KEYWORD this).
      */
-	typeof(this) opOpAssign(string Op)(ref T x)
-		if (Op == "~")
+    void enqueue(ref T x)
     {
-		return insertBack(x);
+        auto temp = allocateEntry();
+
+        *temp = SEntry!T.init;
+        temp.content = x;
+
+        enqueueEntry(temp);
+    }
+
+    /// Ditto.
+    void enqueue(T x)
+    {
+        auto temp = allocateEntry();
+
+        moveEmplace(x, (*temp).content);
+        (*temp).next = null;
+
+        enqueueEntry(temp);
     }
 
     ///
     unittest
     {
-		auto q = make!(Queue!int)(defaultAllocator);
-		int value = 5;
+        Queue!int q;
 
         assert(q.empty);
-
-		q ~= value;
-
-		assert(q.front == value);
-		assert(!q.empty);
-
-		dispose(defaultAllocator, q);
+        q.enqueue(8);
+        q.enqueue(9);
+        assert(q.dequeue() == 8);
+        assert(q.dequeue() == 9);
     }
 
     /**
      * Returns: $(D_KEYWORD true) if the queue is empty.
      */
-	@property bool empty() const @safe pure nothrow
+    @property bool empty() const
     {
-		return first.next is null;
+        return first is null;
     }
 
     ///
     unittest
     {
-		auto q = make!(Queue!int)(defaultAllocator);
+        Queue!int q;
         int value = 7;
 
         assert(q.empty);
-		q.insertBack(value);
+        q.enqueue(value);
         assert(!q.empty);
-
-		dispose(defaultAllocator, q);
     }
 
     /**
-	 * Move position to the next element.
+     * Move the position to the next element.
      *
-	 * Returns: $(D_KEYWORD this).
+     * Returns: Dequeued element.
      */
-	typeof(this) popFront()
+    T dequeue()
     in
     {
         assert(!empty);
     }
     body
     {
-		auto n = first.next.next;
+        auto n = first.next;
+        T ret = move(first.content);
 
-		dispose(allocator, first.next);
-		first.next = n;
-
-        return this;
+        allocator.dispose(first);
+        first = n;
+        return ret;
     }
 
     ///
     unittest
     {
-		auto q = make!(Queue!int)(defaultAllocator);
-		int[2] values = [8, 9];
+        Queue!int q;
 
-		q.insertBack(values[0]);
-		q.insertBack(values[1]);
-		assert(q.front is values[0]);
-		q.popFront();
-		assert(q.front is values[1]);
-
-		dispose(defaultAllocator, q);
+        q.enqueue(8);
+        q.enqueue(9);
+        assert(q.dequeue() == 8);
+        assert(q.dequeue() == 9);
     }
 
     /**
-	 * Queue entry.
+     * $(D_KEYWORD foreach) iteration. The elements will be automatically
+     * dequeued.
+     *
+     * Params:
+     *  dg = $(D_KEYWORD foreach) body.
+     *
+     * Returns: The value returned from $(D_PARAM dg).
      */
-	protected struct Entry
+    int opApply(scope int delegate(ref size_t i, ref T) @nogc dg)
     {
-		/// Queue item content.
-		T content;
+        int result;
 
-		/// Next list item.
-		Entry* next;
+        for (size_t i = 0; !empty; ++i)
+        {
+            auto e = dequeue();
+            if ((result = dg(i, e)) != 0)
+            {
+                return result;
+            }
+        }
+        return result;
     }
 
-	/// The first element of the list.
-	protected Entry first;
+    /// Ditto.
+    int opApply(scope int delegate(ref T) @nogc dg)
+    {
+        int result;
 
-	/// The last element of the list.
-	protected Entry* rear;
+        while (!empty)
+        {
+            auto e = dequeue();
+            if ((result = dg(e)) != 0)
+            {
+                return result;
+            }
+        }
+        return result;
+    }
 
-	private shared Allocator allocator;
+    ///
+    unittest
+    {
+        Queue!int q;
+
+        size_t j;
+        q.enqueue(5);
+        q.enqueue(4);
+        q.enqueue(9);
+        foreach (i, e; q)
+        {
+            assert(i != 2 || e == 9);
+            assert(i != 1 || e == 4);
+            assert(i != 0 || e == 5);
+            ++j;
+        }
+        assert(j == 3);
+        assert(q.empty);
+
+        j = 0;
+        q.enqueue(5);
+        q.enqueue(4);
+        q.enqueue(9);
+        foreach (e; q)
+        {
+            assert(j != 2 || e == 9);
+            assert(j != 1 || e == 4);
+            assert(j != 0 || e == 5);
+            ++j;
+        }
+        assert(j == 3);
+        assert(q.empty);
+    }
+
+    private SEntry!T* first;
+    private SEntry!T* rear;
+
+    mixin DefaultAllocator;
 }
 
 ///
 unittest
 {
-	auto q = make!(Queue!int)(defaultAllocator);
+    Queue!int q;
 
-	dispose(defaultAllocator, q);
+    q.enqueue(5);
+    assert(!q.empty);
+
+    q.enqueue(4);
+    q.enqueue(9);
+
+    assert(q.dequeue() == 5);
+
+    foreach (i, ref e; q)
+    {
+        assert(i != 0 || e == 4);
+        assert(i != 1 || e == 9);
+    }
+    assert(q.empty);
 }

source/tanya/crypto/des.d

@@ -1,607 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.crypto.des;
-
-import tanya.container.bit;
-import tanya.crypto.symmetric;
-
-/// Initial permutation table.
-private immutable ubyte[64] ipTable = [58, 50, 42, 34, 26, 18, 10, 2,
-                                       60, 52, 44, 36, 28, 20, 12, 4,
-                                       62, 54, 46, 38, 30, 22, 14, 6,
-                                       64, 56, 48, 40, 32, 24, 16, 8,
-                                       57, 49, 41, 33, 25, 17, 9,  1,
-                                       59, 51, 43, 35, 27, 19, 11, 3,
-                                       61, 53, 45, 37, 29, 21, 13, 5,
-                                       63, 55, 47, 39, 31, 23, 15, 7];
-
-/// Final permutation table.
-private immutable ubyte[64] fpTable = [40, 8, 48, 16, 56, 24, 64, 32,
-                                       39, 7, 47, 15, 55, 23, 63, 31,
-                                       38, 6, 46, 14, 54, 22, 62, 30,
-                                       37, 5, 45, 13, 53, 21, 61, 29,
-                                       36, 4, 44, 12, 52, 20, 60, 28,
-                                       35, 3, 43, 11, 51, 19, 59, 27,
-                                       34, 2, 42, 10, 50, 18, 58, 26,
-                                       33, 1, 41, 9,  49, 17, 57, 25];
-
-/// Key permutation table 1.
-private immutable ubyte[64] pc1Table = [57, 49, 41, 33, 25, 17, 9, 1,
-                                        58, 50, 42, 34, 26, 18, 10, 2,
-                                        59, 51, 43, 35, 27, 19, 11, 3,
-                                        60, 52, 44, 36, 63, 55, 47, 39,
-                                        31, 23, 15, 7,  62, 54, 46, 38,
-                                        30, 22, 14, 6,  61, 53, 45, 37,
-                                        29, 21, 13, 5,  28, 20, 12, 4];
-
-/// Key permutation table 2.
-private immutable ubyte[48] pc2Table = [14, 17, 11, 24, 1,  5,  3,  28,
-                                        15, 6,  21, 10, 23, 19, 12, 4,
-                                        26, 8,  16, 7,  27, 20, 13, 2,
-                                        41, 52, 31, 37, 47, 55, 30, 40,
-                                        51, 45, 33, 48, 44, 49, 39, 56,
-                                        34, 53, 46, 42, 50, 36, 29, 32];
-
-/// Expansion table.
-private immutable ubyte[48] expansionTable = [32, 1,  2,  3,  4,  5,  4,  5,
-                                              6,  7,  8,  9,  8,  9,  10, 11,
-                                              12, 13, 12, 13, 14, 15, 16, 17,
-                                              16, 17, 18, 19, 20, 21, 20, 21,
-                                              22, 23, 24, 25, 24, 25, 26, 27,
-                                              28, 29, 28, 29, 30, 31, 32, 1];
-
-/// Final input block permutation.
-private immutable ubyte[32] pTable = [16, 7,  20, 21, 29, 12, 28, 17,
-                                      1,  15, 23, 26, 5,  18, 31, 10,
-                                      2,  8,  24, 14, 32, 27, 3,  9,
-                                      19, 13, 30, 6,  22, 11, 4, 25];
-
-/// The (in)famous S-boxes.
-private immutable ubyte[64][8] sBox = [[
-                                         14, 0,  4,  15, 13, 7,  1,  4,  2, 14,  15, 2, 11, 13, 8,  1,
-                                         3,  10, 10, 6,  6,  12, 12, 11, 5,  9,  9,  5, 0,  3,  7,  8,
-                                         4,  15, 1,  12, 14, 8,  8,  2,  13, 4,  6,  9, 2,  1,  11, 7,
-                                         15, 5,  12, 11, 9,  3,  7,  14, 3,  10, 10, 0, 5,  6,  0,  13,
-                                      ],[
-                                         15, 3,  1,  13, 8,  4,  14, 7,  6,  15, 11, 2,  3,  8,  4,  14,
-                                         9,  12, 7,  0,  2,  1,  13, 10, 12, 6,  0,  9,  5,  11, 10, 5,
-                                         0,  13, 14, 8,  7,  10, 11, 1,  10, 3,  4,  15, 13, 4,  1,  2,
-                                         5,  11, 8,  6,  12, 7,  6,  12, 9,  0,  3,  5,  2,  14, 15, 9,
-                                      ],[
-                                         10, 13, 0,  7,  9,  0,  14, 9,  6,  3,  3,  4,  15, 6,  5,  10,
-                                         1,  2,  13, 8,  12, 5,  7,  14, 11, 12, 4,  11, 2,  15, 8,  1,
-                                         13, 1,  6,  10, 4,  13, 9,  0,  8,  6,  15, 9,  3,  8,  0,  7,
-                                         11, 4,  1,  15, 2,  14, 12, 3,  5,  11, 10, 5,  14, 2,  7,  12,
-                                      ],[
-                                         7,  13, 13, 8,  14, 11, 3,  5,  0,  6,  6,  15, 9,  0,  10, 3,
-                                         1,  4,  2,  7,  8,  2,  5,  12, 11, 1,  12, 10, 4,  14, 15, 9,
-                                         10, 3,  6,  15, 9,  0,  0,  6,  12, 10, 11, 1,  7,  13, 13, 8,
-                                         15, 9,  1,  4,  3,  5,  14, 11, 5,  12, 2,  7,  8,  2,  4,  14,
-                                      ],[
-                                         2,  14, 12, 11, 4,  2,  1,  12, 7,  4,  10, 7,  11, 13, 6,  1,
-                                         8,  5,  5,  0,  3,  15, 15, 10, 13, 3,  0,  9,  14, 8,  9,  6,
-                                         4,  11, 2,  8,  1,  12, 11, 7,  10, 1,  13, 14, 7,  2,  8,  13,
-                                         15, 6,  9,  15, 12, 0,  5,  9,  6,  10, 3,  4,  0,  5,  14, 3,
-                                      ],[
-                                         12, 10, 1,  15, 10, 4,  15, 2,  9,  7,  2,  12, 6,  9,  8,  5,
-                                         0,  6,  13, 1,  3,  13, 4,  14, 14, 0,  7,  11, 5,  3,  11, 8,
-                                         9,  4,  14, 3,  15, 2,  5,  12, 2,  9,  8,  5,  12, 15, 3,  10,
-                                         7,  11, 0,  14, 4,  1,  10, 7,  1,  6,  13, 0,  11, 8,  6,  13,
-                                      ],[
-                                         4,  13, 11, 0,  2,  11, 14, 7,  15, 4,  0,  9,  8,  1,  13, 10,
-                                         3,  14, 12, 3,  9,  5,  7,  12, 5,  2,  10, 15, 6,  8,  1,  6,
-                                         1,  6,  4,  11, 11, 13, 13, 8,  12, 1,  3,  4,  7,  10, 14, 7,
-                                         10, 9,  15, 5,  6,  0,  8,  15, 0,  14, 5,  2,  9,  3,  2,  12,
-                                      ],[
-                                         13, 1,  2,  15, 8,  13, 4,  8,  6,  10, 15, 3,  11, 7,  1,  4,
-                                         10, 12, 9,  5,  3,  6,  14, 11, 5,  0,  0,  14, 12, 9,  7,  2,
-                                         7,  2,  11, 1,  4,  14, 1,  7,  9,  4,  12, 10, 14, 8,  2,  13,
-                                         0,  15, 6,  12, 10, 9,  13, 0,  15, 3,  3,  5,  5,  6,  8,  11,
-                                      ]];
-
-/**
- * Data Encryption Standard.
- *
- * Params:
- *     L = Number of keys.
- */
-class DES(ushort L = 1) : BlockCipher
-    if (L == 1)
-{
-    mixin FixedBlockSize!8;
-    mixin KeyLength!8;
-
-    private enum expansionBlockSize = 6;
-    private enum pc1KeyLength = 7;
-    private enum subkeyLength = 6;
-    private ubyte[] key_;
-
-    /**
-     * Params:
-     *     key = Key.
-     */
-    @property void key(ubyte[] key) pure nothrow @safe @nogc
-    in
-    {
-        assert(key.length >= minKeyLength);
-        assert(key.length <= maxKeyLength);
-    }
-    body
-    {
-        key_ = key;
-    }
-
-    /**
-     * Encrypts a block.
-     *
-     * Params:
-     *    plain  = Plain text, input.
-     *    cipher = Cipher text, output.
-     */
-    void encrypt(in ubyte[] plain, ubyte[] cipher)
-    nothrow
-    in
-    {
-        assert(plain.length == blockSize);
-        assert(cipher.length == blockSize);
-    }
-    body
-    {
-        operateBlock!(Direction.encryption)(plain, cipher);
-    }
-
-    /**
-     * Decrypts a block.
-     *
-     * Params:
-     *    cipher = Cipher text, input.
-     *    plain  = Plain text, output.
-     */
-    void decrypt(in ubyte[] cipher, ubyte[] plain)
-    nothrow
-    in
-    {
-        assert(plain.length == blockSize);
-        assert(cipher.length == blockSize);
-    }
-    body
-    {
-        operateBlock!(Direction.decryption)(cipher, plain);
-    }
-
-    private void operateBlock(Direction D)(in ubyte[] source, ref ubyte[] target)
-    {
-        ubyte[blockSize_] ipBlock;
-        ubyte[expansionBlockSize] expansionBlock;
-        ubyte[4] substitutionBlock;
-        ubyte[4] pBoxTarget;
-        ubyte[pc1KeyLength] pc1Key;
-        ubyte[subkeyLength] subkey;
-
-        // Initial permutation
-        permute(source, ipBlock, ipTable, blockSize);
-
-        // Key schedule computation
-        permute(key_, pc1Key, pc1Table, pc1KeyLength);
-
-        // Feistel function
-        for (ubyte round; round < 16; ++round)
-        {
-            auto bitVector = BitVector(expansionBlock);
-            /* Expansion. This permutation only looks at the first 4 bytes (32
-               bits of ipBlock); 16 of these are repeated in expansion table.*/
-            permute(BitVector(ipBlock[4..$]), bitVector, expansionTable, 6);
-
-            // Key mixing
-            static if (D == Direction.encryption)
-            {
-                rotateLeft(pc1Key);
-                if (!(round <= 1 || round == 8 || round == 15))
-                {
-                    // Rotate twice.
-                    rotateLeft(pc1Key);
-                }
-            }
-            permute(pc1Key, subkey, pc2Table, subkeyLength);
-            static if (D == Direction.decryption)
-            {
-                rotateRight(pc1Key);
-                if (!(round >= 14 || round == 7 || round == 0))
-                {
-                    // Rotate twice.
-                    rotateRight(pc1Key);
-                }
-            }
-
-            bitVector ^= subkey;
-
-            // Substitution; copy from updated expansion block to ciphertext block
-            substitutionBlock[0] = cast(ubyte) (sBox[0][(expansionBlock[0] & 0xfc ) >> 2] << 4);
-            substitutionBlock[0] |= sBox[1][(expansionBlock[0] & 0x03) << 4 | (expansionBlock[1] & 0xf0) >> 4];
-            substitutionBlock[1] = cast(ubyte) (sBox[2][(expansionBlock[1] & 0x0f) << 2 | (expansionBlock[2] & 0xc0) >> 6] << 4);
-            substitutionBlock[1] |= sBox[3][(expansionBlock[2] & 0x3f)];
-            substitutionBlock[2] = cast(ubyte) (sBox[4][(expansionBlock[3] & 0xfc) >> 2 ] << 4);
-            substitutionBlock[2] |= sBox[5][(expansionBlock[3] & 0x03) << 4 | (expansionBlock[4] & 0xf0) >> 4];
-            substitutionBlock[3] = cast(ubyte) (sBox[6][(expansionBlock[4] & 0x0F) << 2 | (expansionBlock[5] & 0xc0) >> 6] << 4);
-            substitutionBlock[3] |= sBox[7][(expansionBlock[5] & 0x3f)];
-
-            // Permutation
-            bitVector = BitVector(substitutionBlock);
-            permute(bitVector, pBoxTarget, pTable, blockSize / 2);
-
-            // Swap the halves.
-            substitutionBlock = ipBlock[0..4];
-            ipBlock[0..4] = ipBlock[4..$];
-
-            bitVector ^= pBoxTarget;
-            ipBlock[4..$] = substitutionBlock;
-        }
-
-        substitutionBlock = ipBlock[0..4];
-        ipBlock[0..4] = ipBlock[4..$];
-        ipBlock[4..$] = substitutionBlock;
-
-        // Final permutaion (undo initial permuation).
-        permute(ipBlock, target, fpTable, blockSize);
-    }
-
-    /**
-     * Performs the left rotation operation on the key.
-     *
-     * Params:
-     *     key = The key to rotate.
-     */
-    private void rotateLeft(ref ubyte[7] key) const pure nothrow @safe @nogc
-    {
-        immutable carryLeft = (key[0] & 0x80) >> 3;
-
-        key[0] = cast(ubyte) ((key[0] << 1) | ((key[1] & 0x80) >> 7));
-        key[1] = cast(ubyte) ((key[1] << 1) | ((key[2] & 0x80) >> 7));
-        key[2] = cast(ubyte) ((key[2] << 1) | ((key[3] & 0x80) >> 7));
-
-        immutable carryRight = (key[3] & 0x08) >> 3;
-        key[3] = cast(ubyte) ((((key[3] << 1) | ((key[4] & 0x80) >> 7)) & ~0x10) | carryLeft);
-
-        key[4] = cast(ubyte) ((key[4] << 1) | ((key[5] & 0x80) >> 7));
-        key[5] = cast(ubyte) ((key[5] << 1) | ((key[6] & 0x80) >> 7));
-        key[6] = cast(ubyte) ((key[6] << 1) | carryRight);
-    }
-
-    /**
-     * Performs the right rotation operation on the key.
-     *
-     * Params:
-     *     key = The key to rotate.
-     */
-    private void rotateRight(ref ubyte[7] key) const pure nothrow @safe @nogc
-    {
-        immutable carryRight = (key[6] & 0x01) << 3;
-
-        key[6] = cast(ubyte) ((key[6] >> 1) | ((key[5] & 0x01) << 7));
-        key[5] = cast(ubyte) ((key[5] >> 1) | ((key[4] & 0x01) << 7));
-        key[4] = cast(ubyte) ((key[4] >> 1) | ((key[3] & 0x01) << 7));
-
-        immutable carryLeft = (key[3] & 0x10) << 3;
-        key[3] = cast(ubyte) ((((key[3] >> 1) | ((key[2] & 0x01) << 7)) & ~0x08) | carryRight);
-
-        key[2] = cast(ubyte) ((key[2] >> 1) | ((key[1] & 0x01) << 7));
-        key[1] = cast(ubyte) ((key[1] >> 1) | ((key[0] & 0x01) << 7));
-        key[0] = cast(ubyte) ((key[0] >> 1) | carryLeft);
-    }
-
-    private void permute(in ubyte[] source, ubyte[] target, immutable(ubyte[]) permuteTable, size_t length)
-    const pure nothrow @safe @nogc
-    {
-        const sourceVector = const BitVector(source);
-        auto targetVector = BitVector(target);
-
-        permute(sourceVector, targetVector, permuteTable, length);
-    }
-
-    private void permute(in BitVector source, ubyte[] target, immutable(ubyte[]) permuteTable, size_t length)
-    const pure nothrow @safe @nogc
-    {
-        auto targetVector = BitVector(target);
-
-        permute(source, targetVector, permuteTable, length);
-    }
-
-    private void permute(in BitVector source, ref BitVector target, immutable(ubyte[]) permuteTable, size_t length)
-    const pure nothrow @safe @nogc
-    {
-        for (uint i; i < length * 8; ++i)
-        {
-            target[i] = source[permuteTable[i] - 1];
-        }
-    }
-}
-
-version (unittest)
-{
-    import std.typecons;
-
-    /* Test vectors for DES. Source:
-       "Validating the Correctness of Hardware 
-       Implementations of the NBS Data Encryption Standard"
-       NBS Special Publication 500-20, 1980. Appendix B */
-
-    // Initial and reverse Permutation and Expansion tests. Encrypt.
-    ubyte[8][64] desTestVectors1 = [
-        [0x95, 0xf8, 0xa5, 0xe5, 0xdd, 0x31, 0xd9, 0x00],
-        [0xdd, 0x7f, 0x12, 0x1c, 0xa5, 0x01, 0x56, 0x19],
-        [0x2e, 0x86, 0x53, 0x10, 0x4f, 0x38, 0x34, 0xea],
-        [0x4b, 0xd3, 0x88, 0xff, 0x6c, 0xd8, 0x1d, 0x4f],
-        [0x20, 0xb9, 0xe7, 0x67, 0xb2, 0xfb, 0x14, 0x56],
-        [0x55, 0x57, 0x93, 0x80, 0xd7, 0x71, 0x38, 0xef],
-        [0x6c, 0xc5, 0xde, 0xfa, 0xaf, 0x04, 0x51, 0x2f],
-        [0x0d, 0x9f, 0x27, 0x9b, 0xa5, 0xd8, 0x72, 0x60],
-        [0xd9, 0x03, 0x1b, 0x02, 0x71, 0xbd, 0x5a, 0x0a],
-        [0x42, 0x42, 0x50, 0xb3, 0x7c, 0x3d, 0xd9, 0x51],
-        [0xb8, 0x06, 0x1b, 0x7e, 0xcd, 0x9a, 0x21, 0xe5],
-        [0xf1, 0x5d, 0x0f, 0x28, 0x6b, 0x65, 0xbd, 0x28],
-        [0xad, 0xd0, 0xcc, 0x8d, 0x6e, 0x5d, 0xeb, 0xa1],
-        [0xe6, 0xd5, 0xf8, 0x27, 0x52, 0xad, 0x63, 0xd1],
-        [0xec, 0xbf, 0xe3, 0xbd, 0x3f, 0x59, 0x1a, 0x5e],
-        [0xf3, 0x56, 0x83, 0x43, 0x79, 0xd1, 0x65, 0xcd],
-        [0x2b, 0x9f, 0x98, 0x2f, 0x20, 0x03, 0x7f, 0xa9],
-        [0x88, 0x9d, 0xe0, 0x68, 0xa1, 0x6f, 0x0b, 0xe6],
-        [0xe1, 0x9e, 0x27, 0x5d, 0x84, 0x6a, 0x12, 0x98],
-        [0x32, 0x9a, 0x8e, 0xd5, 0x23, 0xd7, 0x1a, 0xec],
-        [0xe7, 0xfc, 0xe2, 0x25, 0x57, 0xd2, 0x3c, 0x97],
-        [0x12, 0xa9, 0xf5, 0x81, 0x7f, 0xf2, 0xd6, 0x5d],
-        [0xa4, 0x84, 0xc3, 0xad, 0x38, 0xdc, 0x9c, 0x19],
-        [0xfb, 0xe0, 0x0a, 0x8a, 0x1e, 0xf8, 0xad, 0x72],
-        [0x75, 0x0d, 0x07, 0x94, 0x07, 0x52, 0x13, 0x63],
-        [0x64, 0xfe, 0xed, 0x9c, 0x72, 0x4c, 0x2f, 0xaf],
-        [0xf0, 0x2b, 0x26, 0x3b, 0x32, 0x8e, 0x2b, 0x60],
-        [0x9d, 0x64, 0x55, 0x5a, 0x9a, 0x10, 0xb8, 0x52],
-        [0xd1, 0x06, 0xff, 0x0b, 0xed, 0x52, 0x55, 0xd7],
-        [0xe1, 0x65, 0x2c, 0x6b, 0x13, 0x8c, 0x64, 0xa5],
-        [0xe4, 0x28, 0x58, 0x11, 0x86, 0xec, 0x8f, 0x46],
-        [0xae, 0xb5, 0xf5, 0xed, 0xe2, 0x2d, 0x1a, 0x36],
-        [0xe9, 0x43, 0xd7, 0x56, 0x8a, 0xec, 0x0c, 0x5c],
-        [0xdf, 0x98, 0xc8, 0x27, 0x6f, 0x54, 0xb0, 0x4b],
-        [0xb1, 0x60, 0xe4, 0x68, 0x0f, 0x6c, 0x69, 0x6f],
-        [0xfa, 0x07, 0x52, 0xb0, 0x7d, 0x9c, 0x4a, 0xb8],
-        [0xca, 0x3a, 0x2b, 0x03, 0x6d, 0xbc, 0x85, 0x02],
-        [0x5e, 0x09, 0x05, 0x51, 0x7b, 0xb5, 0x9b, 0xcf],
-        [0x81, 0x4e, 0xeb, 0x3b, 0x91, 0xd9, 0x07, 0x26],
-        [0x4d, 0x49, 0xdb, 0x15, 0x32, 0x91, 0x9c, 0x9f],
-        [0x25, 0xeb, 0x5f, 0xc3, 0xf8, 0xcf, 0x06, 0x21],
-        [0xab, 0x6a, 0x20, 0xc0, 0x62, 0x0d, 0x1c, 0x6f],
-        [0x79, 0xe9, 0x0d, 0xbc, 0x98, 0xf9, 0x2c, 0xca],
-        [0x86, 0x6e, 0xce, 0xdd, 0x80, 0x72, 0xbb, 0x0e],
-        [0x8b, 0x54, 0x53, 0x6f, 0x2f, 0x3e, 0x64, 0xa8],
-        [0xea, 0x51, 0xd3, 0x97, 0x55, 0x95, 0xb8, 0x6b],
-        [0xca, 0xff, 0xc6, 0xac, 0x45, 0x42, 0xde, 0x31],
-        [0x8d, 0xd4, 0x5a, 0x2d, 0xdf, 0x90, 0x79, 0x6c],
-        [0x10, 0x29, 0xd5, 0x5e, 0x88, 0x0e, 0xc2, 0xd0],
-        [0x5d, 0x86, 0xcb, 0x23, 0x63, 0x9d, 0xbe, 0xa9],
-        [0x1d, 0x1c, 0xa8, 0x53, 0xae, 0x7c, 0x0c, 0x5f],
-        [0xce, 0x33, 0x23, 0x29, 0x24, 0x8f, 0x32, 0x28],
-        [0x84, 0x05, 0xd1, 0xab, 0xe2, 0x4f, 0xb9, 0x42],
-        [0xe6, 0x43, 0xd7, 0x80, 0x90, 0xca, 0x42, 0x07],
-        [0x48, 0x22, 0x1b, 0x99, 0x37, 0x74, 0x8a, 0x23],
-        [0xdd, 0x7c, 0x0b, 0xbd, 0x61, 0xfa, 0xfd, 0x54],
-        [0x2f, 0xbc, 0x29, 0x1a, 0x57, 0x0d, 0xb5, 0xc4],
-        [0xe0, 0x7c, 0x30, 0xd7, 0xe4, 0xe2, 0x6e, 0x12],
-        [0x09, 0x53, 0xe2, 0x25, 0x8e, 0x8e, 0x90, 0xa1],
-        [0x5b, 0x71, 0x1b, 0xc4, 0xce, 0xeb, 0xf2, 0xee],
-        [0xcc, 0x08, 0x3f, 0x1e, 0x6d, 0x9e, 0x85, 0xf6],
-        [0xd2, 0xfd, 0x88, 0x67, 0xd5, 0x0d, 0x2d, 0xfe],
-        [0x06, 0xe7, 0xea, 0x22, 0xce, 0x92, 0x70, 0x8f],
-        [0x16, 0x6b, 0x40, 0xb4, 0x4a, 0xba, 0x4b, 0xd6],
-    ];
-
-    // Key Permutation test. Encrypt.
-    // Test of right-shifts. Decrypt.
-    ubyte[8][56] desTestVectors2 = [
-        [0x95, 0xa8, 0xd7, 0x28, 0x13, 0xda, 0xa9, 0x4d],
-        [0x0e, 0xec, 0x14, 0x87, 0xdd, 0x8c, 0x26, 0xd5],
-        [0x7a, 0xd1, 0x6f, 0xfb, 0x79, 0xc4, 0x59, 0x26],
-        [0xd3, 0x74, 0x62, 0x94, 0xca, 0x6a, 0x6c, 0xf3],
-        [0x80, 0x9f, 0x5f, 0x87, 0x3c, 0x1f, 0xd7, 0x61],
-        [0xc0, 0x2f, 0xaf, 0xfe, 0xc9, 0x89, 0xd1, 0xfc],
-        [0x46, 0x15, 0xaa, 0x1d, 0x33, 0xe7, 0x2f, 0x10],
-        [0x20, 0x55, 0x12, 0x33, 0x50, 0xc0, 0x08, 0x58],
-        [0xdf, 0x3b, 0x99, 0xd6, 0x57, 0x73, 0x97, 0xc8],
-        [0x31, 0xfe, 0x17, 0x36, 0x9b, 0x52, 0x88, 0xc9],
-        [0xdf, 0xdd, 0x3c, 0xc6, 0x4d, 0xae, 0x16, 0x42],
-        [0x17, 0x8c, 0x83, 0xce, 0x2b, 0x39, 0x9d, 0x94],
-        [0x50, 0xf6, 0x36, 0x32, 0x4a, 0x9b, 0x7f, 0x80],
-        [0xa8, 0x46, 0x8e, 0xe3, 0xbc, 0x18, 0xf0, 0x6d],
-        [0xa2, 0xdc, 0x9e, 0x92, 0xfd, 0x3c, 0xde, 0x92],
-        [0xca, 0xc0, 0x9f, 0x79, 0x7d, 0x03, 0x12, 0x87],
-        [0x90, 0xba, 0x68, 0x0b, 0x22, 0xae, 0xb5, 0x25],
-        [0xce, 0x7a, 0x24, 0xf3, 0x50, 0xe2, 0x80, 0xb6],
-        [0x88, 0x2b, 0xff, 0x0a, 0xa0, 0x1a, 0x0b, 0x87],
-        [0x25, 0x61, 0x02, 0x88, 0x92, 0x45, 0x11, 0xc2],
-        [0xc7, 0x15, 0x16, 0xc2, 0x9c, 0x75, 0xd1, 0x70],
-        [0x51, 0x99, 0xc2, 0x9a, 0x52, 0xc9, 0xf0, 0x59],
-        [0xc2, 0x2f, 0x0a, 0x29, 0x4a, 0x71, 0xf2, 0x9f],
-        [0xee, 0x37, 0x14, 0x83, 0x71, 0x4c, 0x02, 0xea],
-        [0xa8, 0x1f, 0xbd, 0x44, 0x8f, 0x9e, 0x52, 0x2f],
-        [0x4f, 0x64, 0x4c, 0x92, 0xe1, 0x92, 0xdf, 0xed],
-        [0x1a, 0xfa, 0x9a, 0x66, 0xa6, 0xdf, 0x92, 0xae],
-        [0xb3, 0xc1, 0xcc, 0x71, 0x5c, 0xb8, 0x79, 0xd8],
-        [0x19, 0xd0, 0x32, 0xe6, 0x4a, 0xb0, 0xbd, 0x8b],
-        [0x3c, 0xfa, 0xa7, 0xa7, 0xdc, 0x87, 0x20, 0xdc],
-        [0xb7, 0x26, 0x5f, 0x7f, 0x44, 0x7a, 0xc6, 0xf3],
-        [0x9d, 0xb7, 0x3b, 0x3c, 0x0d, 0x16, 0x3f, 0x54],
-        [0x81, 0x81, 0xb6, 0x5b, 0xab, 0xf4, 0xa9, 0x75],
-        [0x93, 0xc9, 0xb6, 0x40, 0x42, 0xea, 0xa2, 0x40],
-        [0x55, 0x70, 0x53, 0x08, 0x29, 0x70, 0x55, 0x92],
-        [0x86, 0x38, 0x80, 0x9e, 0x87, 0x87, 0x87, 0xa0],
-        [0x41, 0xb9, 0xa7, 0x9a, 0xf7, 0x9a, 0xc2, 0x08],
-        [0x7a, 0x9b, 0xe4, 0x2f, 0x20, 0x09, 0xa8, 0x92],
-        [0x29, 0x03, 0x8d, 0x56, 0xba, 0x6d, 0x27, 0x45],
-        [0x54, 0x95, 0xc6, 0xab, 0xf1, 0xe5, 0xdf, 0x51],
-        [0xae, 0x13, 0xdb, 0xd5, 0x61, 0x48, 0x89, 0x33],
-        [0x02, 0x4d, 0x1f, 0xfa, 0x89, 0x04, 0xe3, 0x89],
-        [0xd1, 0x39, 0x97, 0x12, 0xf9, 0x9b, 0xf0, 0x2e],
-        [0x14, 0xc1, 0xd7, 0xc1, 0xcf, 0xfe, 0xc7, 0x9e],
-        [0x1d, 0xe5, 0x27, 0x9d, 0xae, 0x3b, 0xed, 0x6f],
-        [0xe9, 0x41, 0xa3, 0x3f, 0x85, 0x50, 0x13, 0x03],
-        [0xda, 0x99, 0xdb, 0xbc, 0x9a, 0x03, 0xf3, 0x79],
-        [0xb7, 0xfc, 0x92, 0xf9, 0x1d, 0x8e, 0x92, 0xe9],
-        [0xae, 0x8e, 0x5c, 0xaa, 0x3c, 0xa0, 0x4e, 0x85],
-        [0x9c, 0xc6, 0x2d, 0xf4, 0x3b, 0x6e, 0xed, 0x74],
-        [0xd8, 0x63, 0xdb, 0xb5, 0xc5, 0x9a, 0x91, 0xa0],
-        [0xa1, 0xab, 0x21, 0x90, 0x54, 0x5b, 0x91, 0xd7],
-        [0x08, 0x75, 0x04, 0x1e, 0x64, 0xc5, 0x70, 0xf7],
-        [0x5a, 0x59, 0x45, 0x28, 0xbe, 0xbe, 0xf1, 0xcc],
-        [0xfc, 0xdb, 0x32, 0x91, 0xde, 0x21, 0xf0, 0xc0],
-        [0x86, 0x9e, 0xfd, 0x7f, 0x9f, 0x26, 0x5a, 0x09],
-    ];
-
-    // Data permutation test. Encrypt.
-    ubyte[8][2][32] desTestVectors3 = [
-        [[0x10, 0x46, 0x91, 0x34, 0x89, 0x98, 0x01, 0x31], [0x88, 0xd5, 0x5e, 0x54, 0xf5, 0x4c, 0x97, 0xb4]],
-        [[0x10, 0x07, 0x10, 0x34, 0x89, 0x98, 0x80, 0x20], [0x0c, 0x0c, 0xc0, 0x0c, 0x83, 0xea, 0x48, 0xfd]],
-        [[0x10, 0x07, 0x10, 0x34, 0xc8, 0x98, 0x01, 0x20], [0x83, 0xbc, 0x8e, 0xf3, 0xa6, 0x57, 0x01, 0x83]],
-        [[0x10, 0x46, 0x10, 0x34, 0x89, 0x98, 0x80, 0x20], [0xdf, 0x72, 0x5d, 0xca, 0xd9, 0x4e, 0xa2, 0xe9]],
-        [[0x10, 0x86, 0x91, 0x15, 0x19, 0x19, 0x01, 0x01], [0xe6, 0x52, 0xb5, 0x3b, 0x55, 0x0b, 0xe8, 0xb0]],
-        [[0x10, 0x86, 0x91, 0x15, 0x19, 0x58, 0x01, 0x01], [0xaf, 0x52, 0x71, 0x20, 0xc4, 0x85, 0xcb, 0xb0]],
-        [[0x51, 0x07, 0xb0, 0x15, 0x19, 0x58, 0x01, 0x01], [0x0f, 0x04, 0xce, 0x39, 0x3d, 0xb9, 0x26, 0xd5]],
-        [[0x10, 0x07, 0xb0, 0x15, 0x19, 0x19, 0x01, 0x01], [0xc9, 0xf0, 0x0f, 0xfc, 0x74, 0x07, 0x90, 0x67]],
-        [[0x31, 0x07, 0x91, 0x54, 0x98, 0x08, 0x01, 0x01], [0x7c, 0xfd, 0x82, 0xa5, 0x93, 0x25, 0x2b, 0x4e]],
-        [[0x31, 0x07, 0x91, 0x94, 0x98, 0x08, 0x01, 0x01], [0xcb, 0x49, 0xa2, 0xf9, 0xe9, 0x13, 0x63, 0xe3]],
-        [[0x10, 0x07, 0x91, 0x15, 0xb9, 0x08, 0x01, 0x40], [0x00, 0xb5, 0x88, 0xbe, 0x70, 0xd2, 0x3f, 0x56]],
-        [[0x31, 0x07, 0x91, 0x15, 0x98, 0x08, 0x01, 0x40], [0x40, 0x6a, 0x9a, 0x6a, 0xb4, 0x33, 0x99, 0xae]],
-        [[0x10, 0x07, 0xd0, 0x15, 0x89, 0x98, 0x01, 0x01], [0x6c, 0xb7, 0x73, 0x61, 0x1d, 0xca, 0x9a, 0xda]],
-        [[0x91, 0x07, 0x91, 0x15, 0x89, 0x98, 0x01, 0x01], [0x67, 0xfd, 0x21, 0xc1, 0x7d, 0xbb, 0x5d, 0x70]],
-        [[0x91, 0x07, 0xd0, 0x15, 0x89, 0x19, 0x01, 0x01], [0x95, 0x92, 0xcb, 0x41, 0x10, 0x43, 0x07, 0x87]],
-        [[0x10, 0x07, 0xd0, 0x15, 0x98, 0x98, 0x01, 0x20], [0xa6, 0xb7, 0xff, 0x68, 0xa3, 0x18, 0xdd, 0xd3]],
-        [[0x10, 0x07, 0x94, 0x04, 0x98, 0x19, 0x01, 0x01], [0x4d, 0x10, 0x21, 0x96, 0xc9, 0x14, 0xca, 0x16]],
-        [[0x01, 0x07, 0x91, 0x04, 0x91, 0x19, 0x04, 0x01], [0x2d, 0xfa, 0x9f, 0x45, 0x73, 0x59, 0x49, 0x65]],
-        [[0x01, 0x07, 0x91, 0x04, 0x91, 0x19, 0x01, 0x01], [0xb4, 0x66, 0x04, 0x81, 0x6c, 0x0e, 0x07, 0x74]],
-        [[0x01, 0x07, 0x94, 0x04, 0x91, 0x19, 0x04, 0x01], [0x6e, 0x7e, 0x62, 0x21, 0xa4, 0xf3, 0x4e, 0x87]],
-        [[0x19, 0x07, 0x92, 0x10, 0x98, 0x1a, 0x01, 0x01], [0xaa, 0x85, 0xe7, 0x46, 0x43, 0x23, 0x31, 0x99]],
-        [[0x10, 0x07, 0x91, 0x19, 0x98, 0x19, 0x08, 0x01], [0x2e, 0x5a, 0x19, 0xdb, 0x4d, 0x19, 0x62, 0xd6]],
-        [[0x10, 0x07, 0x91, 0x19, 0x98, 0x1a, 0x08, 0x01], [0x23, 0xa8, 0x66, 0xa8, 0x09, 0xd3, 0x08, 0x94]],
-        [[0x10, 0x07, 0x92, 0x10, 0x98, 0x19, 0x01, 0x01], [0xd8, 0x12, 0xd9, 0x61, 0xf0, 0x17, 0xd3, 0x20]],
-        [[0x10, 0x07, 0x91, 0x15, 0x98, 0x19, 0x01, 0x0b], [0x05, 0x56, 0x05, 0x81, 0x6e, 0x58, 0x60, 0x8f]],
-        [[0x10, 0x04, 0x80, 0x15, 0x98, 0x19, 0x01, 0x01], [0xab, 0xd8, 0x8e, 0x8b, 0x1b, 0x77, 0x16, 0xf1]],
-        [[0x10, 0x04, 0x80, 0x15, 0x98, 0x19, 0x01, 0x02], [0x53, 0x7a, 0xc9, 0x5b, 0xe6, 0x9d, 0xa1, 0xe1]],
-        [[0x10, 0x04, 0x80, 0x15, 0x98, 0x19, 0x01, 0x08], [0xae, 0xd0, 0xf6, 0xae, 0x3c, 0x25, 0xcd, 0xd8]],
-        [[0x10, 0x02, 0x91, 0x14, 0x98, 0x10, 0x01, 0x04], [0xb3, 0xe3, 0x5a, 0x5e, 0xe5, 0x3e, 0x7b, 0x8d]],
-        [[0x10, 0x02, 0x91, 0x15, 0x98, 0x19, 0x01, 0x04], [0x61, 0xc7, 0x9c, 0x71, 0x92, 0x1a, 0x2e, 0xf8]],
-        [[0x10, 0x02, 0x91, 0x15, 0x98, 0x10, 0x02, 0x01], [0xe2, 0xf5, 0x72, 0x8f, 0x09, 0x95, 0x01, 0x3c]],
-        [[0x10, 0x02, 0x91, 0x16, 0x98, 0x10, 0x01, 0x01], [0x1a, 0xea, 0xc3, 0x9a, 0x61, 0xf0, 0xa4, 0x64]],
-    ];
-
-    // S-Box test. Encrypt.
-    ubyte[8][3][19] desTestVectors4 = [
-        [[0x7c, 0xa1, 0x10, 0x45, 0x4a, 0x1a, 0x6e, 0x57], [0x01, 0xa1, 0xd6, 0xd0, 0x39, 0x77, 0x67, 0x42],
-        [0x69, 0x0f, 0x5b, 0x0d, 0x9a, 0x26, 0x93, 0x9b]],
-        [[0x01, 0x31, 0xd9, 0x61, 0x9d, 0xc1, 0x37, 0x6e], [0x5c, 0xd5, 0x4c, 0xa8, 0x3d, 0xef, 0x57, 0xda],
-        [0x7a, 0x38, 0x9d, 0x10, 0x35, 0x4b, 0xd2, 0x71]],
-        [[0x07, 0xa1, 0x13, 0x3e, 0x4a, 0x0b, 0x26, 0x86], [0x02, 0x48, 0xd4, 0x38, 0x06, 0xf6, 0x71, 0x72],
-        [0x86, 0x8e, 0xbb, 0x51, 0xca, 0xb4, 0x59, 0x9a]],
-        [[0x38, 0x49, 0x67, 0x4c, 0x26, 0x02, 0x31, 0x9e], [0x51, 0x45, 0x4b, 0x58, 0x2d, 0xdf, 0x44, 0x0a],
-        [0x71, 0x78, 0x87, 0x6e, 0x01, 0xf1, 0x9b, 0x2a]],
-        [[0x04, 0xb9, 0x15, 0xba, 0x43, 0xfe, 0xb5, 0xb6], [0x42, 0xfd, 0x44, 0x30, 0x59, 0x57, 0x7f, 0xa2],
-        [0xaf, 0x37, 0xfb, 0x42, 0x1f, 0x8c, 0x40, 0x95]],
-        [[0x01, 0x13, 0xb9, 0x70, 0xfd, 0x34, 0xf2, 0xce], [0x05, 0x9b, 0x5e, 0x08, 0x51, 0xcf, 0x14, 0x3a],
-        [0x86, 0xa5, 0x60, 0xf1, 0x0e, 0xc6, 0xd8, 0x5b]],
-        [[0x01, 0x70, 0xf1, 0x75, 0x46, 0x8f, 0xb5, 0xe6], [0x07, 0x56, 0xd8, 0xe0, 0x77, 0x47, 0x61, 0xd2],
-        [0x0c, 0xd3, 0xda, 0x02, 0x00, 0x21, 0xdc, 0x09]],
-        [[0x43, 0x29, 0x7f, 0xad, 0x38, 0xe3, 0x73, 0xfe], [0x76, 0x25, 0x14, 0xb8, 0x29, 0xbf, 0x48, 0x6a],
-        [0xea, 0x67, 0x6b, 0x2c, 0xb7, 0xdb, 0x2b, 0x7a]],
-        [[0x07, 0xa7, 0x13, 0x70, 0x45, 0xda, 0x2a, 0x16], [0x3b, 0xdd, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02],
-        [0xdf, 0xd6, 0x4a, 0x81, 0x5c, 0xaf, 0x1a, 0x0f]],
-        [[0x04, 0x68, 0x91, 0x04, 0xc2, 0xfd, 0x3b, 0x2f], [0x26, 0x95, 0x5f, 0x68, 0x35, 0xaf, 0x60, 0x9a],
-        [0x5c, 0x51, 0x3c, 0x9c, 0x48, 0x86, 0xc0, 0x88]],
-        [[0x37, 0xd0, 0x6b, 0xb5, 0x16, 0xcb, 0x75, 0x46], [0x16, 0x4d, 0x5e, 0x40, 0x4f, 0x27, 0x52, 0x32],
-        [0x0a, 0x2a, 0xee, 0xae, 0x3f, 0xf4, 0xab, 0x77]],
-        [[0x1f, 0x08, 0x26, 0x0d, 0x1a, 0xc2, 0x46, 0x5e], [0x6b, 0x05, 0x6e, 0x18, 0x75, 0x9f, 0x5c, 0xca],
-        [0xef, 0x1b, 0xf0, 0x3e, 0x5d, 0xfa, 0x57, 0x5a]],
-        [[0x58, 0x40, 0x23, 0x64, 0x1a, 0xba, 0x61, 0x76], [0x00, 0x4b, 0xd6, 0xef, 0x09, 0x17, 0x60, 0x62],
-        [0x88, 0xbf, 0x0d, 0xb6, 0xd7, 0x0d, 0xee, 0x56]],
-        [[0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xb0, 0x07], [0x48, 0x0d, 0x39, 0x00, 0x6e, 0xe7, 0x62, 0xf2],
-        [0xa1, 0xf9, 0x91, 0x55, 0x41, 0x02, 0x0b, 0x56]],
-        [[0x49, 0x79, 0x3e, 0xbc, 0x79, 0xb3, 0x25, 0x8f], [0x43, 0x75, 0x40, 0xc8, 0x69, 0x8f, 0x3c, 0xfa],
-        [0x6f, 0xbf, 0x1c, 0xaf, 0xcf, 0xfd, 0x05, 0x56]],
-        [[0x4f, 0xb0, 0x5e, 0x15, 0x15, 0xab, 0x73, 0xa7], [0x07, 0x2d, 0x43, 0xa0, 0x77, 0x07, 0x52, 0x92],
-        [0x2f, 0x22, 0xe4, 0x9b, 0xab, 0x7c, 0xa1, 0xac]],
-        [[0x49, 0xe9, 0x5d, 0x6d, 0x4c, 0xa2, 0x29, 0xbf], [0x02, 0xfe, 0x55, 0x77, 0x81, 0x17, 0xf1, 0x2a],
-        [0x5a, 0x6b, 0x61, 0x2c, 0xc2, 0x6c, 0xce, 0x4a]],
-        [[0x01, 0x83, 0x10, 0xdc, 0x40, 0x9b, 0x26, 0xd6], [0x1d, 0x9d, 0x5c, 0x50, 0x18, 0xf7, 0x28, 0xc2],
-        [0x5f, 0x4c, 0x03, 0x8e, 0xd1, 0x2b, 0x2e, 0x41]],
-        [[0x1c, 0x58, 0x7f, 0x1c, 0x13, 0x92, 0x4f, 0xef], [0x30, 0x55, 0x32, 0x28, 0x6d, 0x6f, 0x29, 0x5a],
-        [0x63, 0xfa, 0xc0, 0xd0, 0x34, 0xd9, 0xf7, 0x93]],
-    ];
-}
-
-///
-unittest
-{
-    auto des = scoped!(DES!1);
-    ubyte[8] key = [0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01];
-    ubyte[8] plain = [0x80, 0, 0, 0, 0, 0, 0, 0];
-    ubyte[8] cipher;
-
-    des.key = key;
-    foreach (ubyte i; 0..64)
-    {
-        if (i != 0)
-        {
-            plain[i / 8] = i % 8 ? plain[i / 8] >> 1 : 0x80;
-            if (i % 8 == 0)
-            {
-                plain[i / 8 - 1] = 0;
-            }
-        }
-        // Initial Permutation and Expansion test.
-        des.encrypt(plain, cipher);
-        assert(cipher == desTestVectors1[i]);
-
-        // Inverse Permutation and Expansion test.
-        des.encrypt(cipher, cipher);
-        assert(cipher == plain);
-    }
-
-    plain[0..$] = 0;
-    foreach (ubyte i; 0..56)
-    {
-        key[i / 7] = i % 7 ? key[i / 7] >> 1 : 0x80;
-        if (i % 7 == 0 && i != 0)
-        {
-            key[i / 7 - 1] = 0x01;
-        }
-        des.key = key;
-
-        // Initial Permutation and Expansion test.
-        des.encrypt(plain, cipher);
-        assert(cipher == desTestVectors2[i]);
-
-        // Test of right-shifts in Decryption.
-        des.decrypt(desTestVectors2[i], cipher);
-        assert(cipher == plain);
-    }
-
-    // Data permutation test.
-    plain[0..$] = 0;
-    foreach (i; desTestVectors3)
-    {
-        des.key = i[0];
-        des.encrypt(plain, cipher);
-        assert(cipher == i[1]);
-    }
-
-    // S-Box test.
-    foreach (i; desTestVectors4)
-    {
-        des.key = i[0];
-        des.encrypt(i[1], cipher);
-        assert(cipher == i[2]);
-    }
-}

source/tanya/crypto/mode.d

@@ -1,279 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Block cipher modes of operation.
- *
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.crypto.mode;
-
-import tanya.memory;
-import std.algorithm.iteration;
-import std.typecons;
-
-/**
- * Supported padding mode.
- *
- * See_Also:
- *     $(D_PSYMBOL pad)
- */
-enum PaddingMode
-{
-    zero,
-    pkcs7,
-    ansiX923,
-}
-
-/**
- * Params:
- *     input     = Sequence that should be padded.
- *     mode      = Padding mode.
- *     blockSize = Block size.
- *  allocator = Allocator was used to allocate $(D_PARAM input).
- *
- * Returns: The function modifies the initial array and returns it.
- *
- * See_Also:
- *     $(D_PSYMBOL PaddingMode)
- */
-ubyte[] pad(ref ubyte[] input,
-            in PaddingMode mode,
-            in ushort blockSize,
-            shared Allocator allocator = defaultAllocator)
-in
-{
-    assert(blockSize > 0 && blockSize <= 256);
-    assert(blockSize % 64 == 0);
-    assert(input.length > 0);
-}
-body
-{
-    immutable rest = cast(ubyte) input.length % blockSize;
-    immutable size_t lastBlock = input.length - (rest > 0 ? rest : blockSize);
-    immutable needed = cast(ubyte) (rest > 0 ? blockSize - rest : 0);
-
-    final switch (mode) with (PaddingMode)
-    {
-        case zero:
-            allocator.expandArray(input, needed);
-            break;
-        case pkcs7:
-            if (needed)
-            {
-                allocator.expandArray(input, needed);
-                input[input.length - needed ..$].each!((ref e) => e = needed);
-            }
-            else
-            {
-                allocator.expandArray(input, blockSize);
-            }
-            break;
-        case ansiX923:
-            allocator.expandArray(input, needed ? needed : blockSize);
-            input[$ - 1] = needed;
-            break;
-    }
-
-    return input;
-}
-
-///
-unittest
-{
-    { // Zeros
-        auto input = defaultAllocator.makeArray!ubyte(50);
-
-        pad(input, PaddingMode.zero, 64);
-        assert(input.length == 64);
-
-        pad(input, PaddingMode.zero, 64);
-        assert(input.length == 64);
-        assert(input[63] == 0);
-
-        defaultAllocator.dispose(input);
-    }
-    { // PKCS#7
-        auto input = defaultAllocator.makeArray!ubyte(50);
-        for (ubyte i; i < 40; ++i)
-        {
-            input[i] = i;
-        }
-
-        pad(input, PaddingMode.pkcs7, 64);
-        assert(input.length == 64);
-        for (ubyte i; i < 64; ++i)
-        {
-            if (i >= 40 && i < 50)
-            {
-                assert(input[i] == 0);
-            }
-            else if (i >= 50)
-            {
-                assert(input[i] == 14);
-            }
-            else
-            {
-                assert(input[i] == i);
-            }
-        }
-
-        pad(input, PaddingMode.pkcs7, 64);
-        assert(input.length == 128);
-        for (ubyte i; i < 128; ++i)
-        {
-            if (i >= 64 || (i >= 40 && i < 50))
-            {
-                assert(input[i] == 0);
-            }
-            else if (i >= 50 && i < 64)
-            {
-                assert(input[i] == 14);
-            }
-            else
-            {
-                assert(input[i] == i);
-            }
-        }
-
-        defaultAllocator.dispose(input);
-    }
-    { // ANSI X.923
-        auto input = defaultAllocator.makeArray!ubyte(50);
-        for (ubyte i; i < 40; ++i)
-        {
-            input[i] = i;
-        }
-
-        pad(input, PaddingMode.ansiX923, 64);
-        assert(input.length == 64);
-        for (ubyte i; i < 64; ++i)
-        {
-            if (i < 40)
-            {
-                assert(input[i] == i);
-            }
-            else if (i == 63)
-            {
-                assert(input[i] == 14);
-            }
-            else
-            {
-                assert(input[i] == 0);
-            }
-        }
-
-        pad(input, PaddingMode.pkcs7, 64);
-        assert(input.length == 128);
-        for (ubyte i = 0; i < 128; ++i)
-        {
-            if (i < 40)
-            {
-                assert(input[i] == i);
-            }
-            else if (i == 63)
-            {
-                assert(input[i] == 14);
-            }
-            else
-            {
-                assert(input[i] == 0);
-            }
-        }
-
-        defaultAllocator.dispose(input);
-    }
-}
-
-/**
- * Params:
- *     input     = Sequence that should be padded.
- *     mode      = Padding mode.
- *     blockSize = Block size.
- *  allocator = Allocator was used to allocate $(D_PARAM input).
- *
- * Returns: The function modifies the initial array and returns it.
- *
- * See_Also:
- *     $(D_PSYMBOL pad)
- */
-ref ubyte[] unpad(ref ubyte[] input,
-                  in PaddingMode mode,
-                  in ushort blockSize,
-                  shared Allocator allocator = defaultAllocator)
-in
-{
-    assert(input.length != 0);
-    assert(input.length % 64 == 0);
-}
-body
-{
-    final switch (mode) with (PaddingMode)
-    {
-        case zero:
-            break;
-        case pkcs7:
-        case ansiX923:
-            immutable last = input[$ - 1];
-
-            allocator.shrinkArray(input, last ? last : blockSize);
-            break;
-    }
-
-    return input;
-}
-
-///
-unittest
-{
-    { // Zeros
-        auto input = defaultAllocator.makeArray!ubyte(50);
-        auto inputDup = defaultAllocator.makeArray!ubyte(50);
-
-        pad(input, PaddingMode.zero, 64);
-        pad(inputDup, PaddingMode.zero, 64);
-
-        unpad(input, PaddingMode.zero, 64);
-        assert(input == inputDup);
-
-        defaultAllocator.dispose(input);
-        defaultAllocator.dispose(inputDup);
-
-    }
-    { // PKCS#7
-        auto input = defaultAllocator.makeArray!ubyte(50);
-        auto inputDup = defaultAllocator.makeArray!ubyte(50);
-        for (ubyte i; i < 40; ++i)
-        {
-            input[i] = i;
-            inputDup[i] = i;
-        }
-
-        pad(input, PaddingMode.pkcs7, 64);
-        unpad(input, PaddingMode.pkcs7, 64);
-        assert(input == inputDup);
-
-        defaultAllocator.dispose(input);
-        defaultAllocator.dispose(inputDup);
-    }
-    { // ANSI X.923
-        auto input = defaultAllocator.makeArray!ubyte(50);
-        auto inputDup = defaultAllocator.makeArray!ubyte(50);
-        for (ubyte i; i < 40; ++i)
-        {
-            input[i] = i;
-            inputDup[i] = i;
-        }
-
-        pad(input, PaddingMode.pkcs7, 64);
-        unpad(input, PaddingMode.pkcs7, 64);
-        assert(input == inputDup);
-
-        defaultAllocator.dispose(input);
-        defaultAllocator.dispose(inputDup);
-    }
-}

source/tanya/crypto/symmetric.d

@@ -1,177 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Interfaces for implementing secret key algorithms.
- *
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */
-module tanya.crypto.symmetric;
-
-/**
- * Implemented by secret key algorithms.
- */
-interface SymmetricCipher
-{
-    /**
-     * Returns: Key length.
-     */
-    @property inout(uint) keyLength() inout const pure nothrow @safe @nogc;
-
-    /**
-     * Returns: Minimum key length.
-     */
-    @property inout(uint) minKeyLength() inout const pure nothrow @safe @nogc;
-
-    /**
-     * Returns: Maximum key length.
-     */
-    @property inout(uint) maxKeyLength() inout const pure nothrow @safe @nogc;
-
-    /// Cipher direction.
-    protected enum Direction : ushort
-    {
-        encryption,
-        decryption,
-    }
-
-    /**
-     * Params:
-     *     key = Key.
-     */
-    @property void key(ubyte[] key) pure nothrow @safe @nogc
-    in
-    {
-        assert(key.length >= minKeyLength);
-        assert(key.length <= maxKeyLength);
-    }
-}
-
-/**
- * Implemented by block ciphers.
- */
-interface BlockCipher : SymmetricCipher
-{
-    /**
-     * Returns: Block size.
-     */
-    @property inout(uint) blockSize() inout const pure nothrow @safe @nogc;
-
-    /**
-     * Encrypts a block.
-     *
-     * Params:
-     *    plain  = Plain text, input.
-     *    cipher = Cipher text, output.
-     */
-    void encrypt(in ubyte[] plain, ubyte[] cipher)
-    in
-    {
-        assert(plain.length == blockSize);
-        assert(cipher.length == blockSize);
-    }
-
-    /**
-     * Decrypts a block.
-     *
-     * Params:
-     *    cipher = Cipher text, input.
-     *    plain  = Plain text, output.
-     */
-    void decrypt(in ubyte[] cipher, ubyte[] plain)
-    in
-    {
-        assert(plain.length == blockSize);
-        assert(cipher.length == blockSize);
-    }
-}
-
-/**
- * Mixed in by algorithms with fixed block size.
- *
- * Params:
- *     N = Block size.
- */
-mixin template FixedBlockSize(uint N)
-    if (N != 0)
-{
-    private enum uint blockSize_ = N;
-
-    /**
-     * Returns: Fixed block size.
-     */
-    final @property inout(uint) blockSize() inout const pure nothrow @safe @nogc
-    {
-        return blockSize_;
-    }
-}
-
-/**
- * Mixed in by symmetric algorithms.
- * If $(D_PARAM Min) equals $(D_PARAM Max) fixed key length is assumed.
- *
- * Params:
- *     Min = Minimum key length.
- *     Max = Maximum key length.
- */
-mixin template KeyLength(uint Min, uint Max = Min)
-    if (Min != 0 && Max != 0)
-{
-    static if (Min == Max)
-    {
-        private enum uint keyLength_ = Min;
-
-        /**
-         * Returns: Key length.
-         */
-        final @property inout(uint) keyLength() inout const pure nothrow @safe @nogc
-        {
-            return keyLength_;
-        }
-
-        /**
-         * Returns: Minimum key length.
-         */
-        final @property inout(uint) minKeyLength() inout const pure nothrow @safe @nogc
-        {
-            return keyLength_;
-        }
-
-        /**
-         * Returns: Maximum key length.
-         */
-        final @property inout(uint) maxKeyLength() inout const pure nothrow @safe @nogc
-        {
-            return keyLength_;
-        }
-    }
-    else static if (Min < Max)
-    {
-        private enum uint minKeyLength_ = Min;
-        private enum uint maxKeyLength_ = Max;
-
-        /**
-         * Returns: Minimum key length.
-         */
-        final @property inout(uint) minKeyLength() inout const pure nothrow @safe @nogc
-        {
-            return minKeyLength_;
-        }
-
-        /**
-         * Returns: Maximum key length.
-         */
-        final @property inout(uint) maxKeyLength() inout const pure nothrow @safe @nogc
-        {
-            return maxKeyLength_;
-        }
-    }
-    else
-    {
-        static assert(false, "Max should be larger or equal to Min");
-    }
-}

source/tanya/math.d

@@ -1,112 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */  
-module tanya.container.math;
-
-version (unittest)
-{
-	import std.algorithm.iteration;
-}
-
-@nogc:
-
-/**
- * Computes $(D_PARAM x) to the power $(D_PARAM y) modulo $(D_PARAM z).
- *
- * Params:
- * 	x = Base.
- * 	y = Exponent.
- * 	z = Divisor.
- *
- * Returns: Reminder of the division of $(D_PARAM x) to the power $(D_PARAM y)
- *          by $(D_PARAM z).
- */
-ulong pow(ulong x, ulong y, ulong z) @safe nothrow pure
-in
-{
-	assert(z > 0);
-}
-out (result)
-{
-	assert(result >= 0);
-}
-body
-{
-    ulong mask = ulong.max / 2 + 1, result;
-
-	if (y == 0)
-	{
-		return 1 % z;
-	}
-	else if (y == 1)
-	{
-		return x % z;
-	}
-    do
-    {
-        auto bit = y & mask;
-        if (!result && bit)
-        {
-            result = x;
-            continue;
-        }
-
-        result *= result;
-        if (bit)
-        {
-            result *= x;
-        }
-        result %= z;
-
-    }
-    while (mask >>= 1);
-
-	return result;
-}
-
-///
-unittest
-{
-    assert(pow(3, 5, 7) == 5);
-    assert(pow(2, 2, 1) == 0);
-    assert(pow(3, 3, 3) == 0);
-    assert(pow(7, 4, 2) == 1);
-    assert(pow(53, 0, 2) == 1);
-    assert(pow(53, 1, 3) == 2);
-    assert(pow(53, 2, 5) == 4);
-    assert(pow(0, 0, 5) == 1);
-    assert(pow(0, 5, 5) == 0);
-}
-
-/**
- * Checks if $(D_PARAM x) is a prime.
- *
- * Params:
- * 	x = The number should be checked.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM x) is a prime number,
- *          $(D_KEYWORD false) otherwise.
- */
-bool isPseudoprime(ulong x) @safe nothrow pure
-{
-	return pow(2, x - 1, x) == 1;
-}
-
-///
-unittest
-{
-	uint[30] known = [74623, 74653, 74687, 74699, 74707, 74713, 74717, 74719,
-                      74843, 74747, 74759, 74761, 74771, 74779, 74797, 74821,
-	                  74827, 9973, 104729, 15485867, 49979693, 104395303,
-	                  593441861, 104729, 15485867, 49979693, 104395303,
-	                  593441861, 899809363, 982451653];
-
-	known.each!((ref x) => assert(isPseudoprime(x)));
-}

source/tanya/math/package.d

@@ -0,0 +1,201 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Copyright: Eugene Wissner 2016-2017.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ */
+module tanya.math;
+
+import std.traits;
+public import tanya.math.mp;
+public import tanya.math.random;
+
+version (unittest)
+{
+    import std.algorithm.iteration;
+}
+
+/**
+ * Computes $(D_PARAM x) to the power $(D_PARAM y) modulo $(D_PARAM z).
+ *
+ * If $(D_PARAM I) is an $(D_PSYMBOL Integer), the allocator of $(D_PARAM x)
+ * is used to allocate the result.
+ *
+ * Params:
+ *  I = Base type.
+ *  G = Exponent type.
+ *  H = Divisor type:
+ *  x = Base.
+ *  y = Exponent.
+ *  z = Divisor.
+ *
+ * Returns: Reminder of the division of $(D_PARAM x) to the power $(D_PARAM y)
+ *          by $(D_PARAM z).
+ *
+ * Precondition: $(D_INLINECODE z > 0)
+ */
+H pow(I, G, H)(in auto ref I x, in auto ref G y, in auto ref H z)
+    if (isIntegral!I && isIntegral!G && isIntegral!H)
+in
+{
+    assert(z > 0, "Division by zero.");
+}
+body
+{
+    G mask = G.max / 2 + 1;
+    H result;
+
+    if (y == 0)
+    {
+        return 1 % z;
+    }
+    else if (y == 1)
+    {
+        return x % z;
+    }
+    do
+    {
+        immutable bit = y & mask;
+        if (!result && bit)
+        {
+            result = x;
+            continue;
+        }
+
+        result *= result;
+        if (bit)
+        {
+            result *= x;
+        }
+        result %= z;
+    }
+    while (mask >>= 1);
+
+    return result;
+}
+
+/// Ditto.
+I pow(I)(const auto ref I x, const auto ref I y, const auto ref I z)
+    if (is(I == Integer))
+in
+{
+    assert(z.length > 0, "Division by zero.");
+}
+body
+{
+    size_t i;
+    auto tmp1 = Integer(x, x.allocator);
+    auto result = Integer(x.allocator);
+    bool firstBit;
+
+    if (x.size == 0 && y.size != 0)
+    {
+        i = y.size;
+    }
+    else
+    {
+        result = 1;
+    }
+    while (i < y.size)
+    {
+        for (uint mask = 0x01; mask != 0x10000000; mask <<= 1)
+        {
+            if (y.rep[i] & mask)
+            {
+                result *= tmp1;
+                result %= z;
+            }
+            auto tmp2 = tmp1;
+            tmp1 *= tmp2;
+            tmp1 %= z;
+        }
+        ++i;
+    }
+    return result;
+}
+
+///
+pure nothrow @safe @nogc unittest
+{
+    assert(pow(3, 5, 7) == 5);
+    assert(pow(2, 2, 1) == 0);
+    assert(pow(3, 3, 3) == 0);
+    assert(pow(7, 4, 2) == 1);
+    assert(pow(53, 0, 2) == 1);
+    assert(pow(53, 1, 3) == 2);
+    assert(pow(53, 2, 5) == 4);
+    assert(pow(0, 0, 5) == 1);
+    assert(pow(0, 5, 5) == 0);
+}
+
+///
+unittest
+{
+    assert(pow(Integer(3), Integer(5), Integer(7)) == 5);
+    assert(pow(Integer(2), Integer(2), Integer(1)) == 0);
+    assert(pow(Integer(3), Integer(3), Integer(3)) == 0);
+    assert(pow(Integer(7), Integer(4), Integer(2)) == 1);
+    assert(pow(Integer(53), Integer(0), Integer(2)) == 1);
+    assert(pow(Integer(53), Integer(1), Integer(3)) == 2);
+    assert(pow(Integer(53), Integer(2), Integer(5)) == 4);
+    assert(pow(Integer(0), Integer(0), Integer(5)) == 1);
+    assert(pow(Integer(0), Integer(5), Integer(5)) == 0);
+}
+
+/**
+ * Checks if $(D_PARAM x) is a prime.
+ *
+ * Params:
+ *  x = The number should be checked.
+ *
+ * Returns: $(D_KEYWORD true) if $(D_PARAM x) is a prime number,
+ *          $(D_KEYWORD false) otherwise.
+ */
+bool isPseudoprime(ulong x) nothrow pure @safe @nogc
+{
+    return pow(2, x - 1, x) == 1;
+}
+
+///
+unittest
+{
+    uint[30] known = [74623, 74653, 74687, 74699, 74707, 74713, 74717, 74719,
+                      74843, 74747, 74759, 74761, 74771, 74779, 74797, 74821,
+                      74827, 9973, 104729, 15485867, 49979693, 104395303,
+                      593441861, 104729, 15485867, 49979693, 104395303,
+                      593441861, 899809363, 982451653];
+
+    known.each!((ref x) => assert(isPseudoprime(x)));
+}
+
+/**
+ * Params:
+ *  I = Value type.
+ *  x = Value.
+ *
+ * Returns: The absolute value of a number.
+ */
+I abs(I : Integer)(const auto ref I x)
+{
+    auto result = Integer(x, x.allocator);
+    result.sign = Sign.positive;
+    return result;
+}
+
+/// Ditto.
+I abs(I : Integer)(I x)
+{
+    x.sign = Sign.positive;
+    return x;
+}
+
+/// Ditto.
+I abs(I)(const I x)
+    if (isIntegral!I)
+{
+    return x >= 0 ? x : -x;
+}

source/tanya/math/random.d

@@ -0,0 +1,320 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Random number generator.
+ *
+ * Copyright: Eugene Wissner 2016.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ */
+module tanya.math.random;
+
+import std.digest.sha;
+import std.typecons;
+import tanya.memory;
+
+/// Block size of entropy accumulator (SHA-512).
+enum blockSize = 64;
+
+/// Maximum amount gathered from the entropy sources.
+enum maxGather = 128;
+
+/**
+ * Exception thrown if random number generating fails.
+ */
+class EntropyException : Exception
+{
+    /**
+     * Params:
+     *  msg  = Message to output.
+     *  file = The file where the exception occurred.
+     *  line = The line number where the exception occurred.
+     *  next = The previous exception in the chain of exceptions, if any.
+     */
+    this(string msg,
+         string file = __FILE__,
+         size_t line = __LINE__,
+         Throwable next = null) pure @safe nothrow const @nogc
+    {
+        super(msg, file, line, next);
+    }
+}
+
+/**
+ * Interface for implementing entropy sources.
+ */
+abstract class EntropySource
+{
+    /// Amount of already generated entropy.
+    protected ushort size_;
+
+    /**
+     * Returns: Minimum bytes required from the entropy source.
+     */
+    @property immutable(ubyte) threshold() const @safe pure nothrow;
+
+    /**
+     * Returns: Whether this entropy source is strong.
+     */
+    @property immutable(bool) strong() const @safe pure nothrow;
+
+    /**
+     * Returns: Amount of already generated entropy.
+     */
+    @property ushort size() const @safe pure nothrow
+    {
+        return size_;
+    }
+
+    /**
+     * Params:
+     *  size = Amount of already generated entropy. Cannot be smaller than the
+     *         already set value.
+     */
+    @property void size(ushort size) @safe pure nothrow
+    {
+        size_ = size;
+    }
+
+    /**
+     * Poll the entropy source.
+     *
+     * Params:
+     *  output = Buffer to save the generate random sequence (the method will
+     *           to fill the buffer).
+     *
+     * Returns: Number of bytes that were copied to the $(D_PARAM output)
+     *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+     */
+    Nullable!ubyte poll(out ubyte[maxGather] output);
+}
+
+version (linux)
+{
+    extern (C) long syscall(long number, ...) nothrow;
+
+    /**
+     * Uses getrandom system call.
+     */
+    class PlatformEntropySource : EntropySource
+    {
+        /**
+         * Returns: Minimum bytes required from the entropy source.
+         */
+        override @property immutable(ubyte) threshold() const @safe pure nothrow
+        {
+            return 32;
+        }
+
+        /**
+         * Returns: Whether this entropy source is strong.
+         */
+        override @property immutable(bool) strong() const @safe pure nothrow
+        {
+            return true;
+        }
+
+        /**
+         * Poll the entropy source.
+         *
+         * Params:
+         *  output = Buffer to save the generate random sequence (the method will
+         *           to fill the buffer).
+         *
+         * Returns: Number of bytes that were copied to the $(D_PARAM output)
+         *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
+         */
+        override Nullable!ubyte poll(out ubyte[maxGather] output) nothrow
+        out (length)
+        {
+            assert(length <= maxGather);
+        }
+        body
+        {
+            // int getrandom(void *buf, size_t buflen, unsigned int flags);
+            auto length = syscall(318, output.ptr, output.length, 0);
+            Nullable!ubyte ret;
+
+            if (length >= 0)
+            {
+                ret = cast(ubyte) length;
+            }
+            return ret;
+        }
+    }
+}
+
+/**
+ * Pseudorandom number generator.
+ * ---
+ * auto entropy = defaultAllocator.make!Entropy();
+ *
+ * ubyte[blockSize] output;
+ *
+ * output = entropy.random;
+ *
+ * defaultAllocator.dispose(entropy);
+ * ---
+ */
+class Entropy
+{
+    /// Entropy sources.
+    protected EntropySource[] sources;
+
+    private ubyte sourceCount_;
+
+    private shared Allocator allocator;
+
+    /// Entropy accumulator.
+    protected SHA!(maxGather * 8, 512) accumulator;
+
+    /**
+     * Params:
+     *  maxSources = Maximum amount of entropy sources can be set.
+     *  allocator  = Allocator to allocate entropy sources available on the
+     *               system.
+     */
+    this(size_t maxSources = 20, shared Allocator allocator = defaultAllocator)
+    in
+    {
+        assert(maxSources > 0 && maxSources <= ubyte.max);
+        assert(allocator !is null);
+    }
+    body
+    {
+        allocator.resize(sources, maxSources);
+
+        version (linux)
+        {
+            this ~= allocator.make!PlatformEntropySource;
+        }
+    }
+
+    /**
+     * Returns: Amount of the registered entropy sources.
+     */
+    @property ubyte sourceCount() const @safe pure nothrow
+    {
+        return sourceCount_;
+    }
+
+    /**
+     * Add an entropy source.
+     *
+     * Params:
+     *  source = Entropy source.
+     *
+     * Returns: $(D_PSYMBOL this).
+     *
+     * See_Also:
+     *  $(D_PSYMBOL EntropySource)
+     */
+    Entropy opOpAssign(string Op)(EntropySource source) @safe pure nothrow
+        if (Op == "~")
+    in
+    {
+        assert(sourceCount_ <= sources.length);
+    }
+    body
+    {
+        sources[sourceCount_++] = source;
+        return this;
+    }
+
+    /**
+     * Returns: Generated random sequence.
+     *
+     * Throws: $(D_PSYMBOL EntropyException) if no strong entropy source was
+     *         registered or it failed.
+     */
+    @property ubyte[blockSize] random()
+    in
+    {
+        assert(sourceCount_ > 0, "No entropy sources defined.");
+    }
+    body
+    {
+        bool haveStrong;
+        ushort done;
+        ubyte[blockSize] output;
+
+        do
+        {
+            ubyte[maxGather] buffer;
+
+            // Run through our entropy sources
+            for (ubyte i; i < sourceCount; ++i)
+            {
+                auto outputLength = sources[i].poll(buffer);
+
+                if (!outputLength.isNull)
+                {
+                    if (outputLength > 0)
+                    {
+                        update(i, buffer, outputLength);
+                        sources[i].size = cast(ushort) (sources[i].size + outputLength);
+                    }
+                    if (sources[i].size < sources[i].threshold)
+                    {
+                        continue;
+                    }
+                    else if (sources[i].strong)
+                    {
+                        haveStrong = true;
+                    }
+                }
+                done = 257;
+            }
+        }
+        while (++done < 256);
+
+        if (!haveStrong)
+        {
+            throw allocator.make!EntropyException("No strong entropy source defined.");
+        }
+
+        output = accumulator.finish();
+
+        // Reset accumulator and counters and recycle existing entropy
+        accumulator.start();
+
+        // Perform second SHA-512 on entropy
+        output = sha512Of(output);
+
+        for (ubyte i = 0; i < sourceCount; ++i)
+        {
+            sources[i].size = 0;
+        }
+        return output;
+    }
+
+    /**
+     * Update entropy accumulator.
+     *
+     * Params:
+     *  sourceId = Entropy source index in $(D_PSYMBOL sources).
+     *  data     = Data got from the entropy source.
+     *  length   = Length of the received data.
+     */
+    protected void update(in ubyte sourceId,
+                          ref ubyte[maxGather] data,
+                          ubyte length) @safe pure nothrow
+    {
+        ubyte[2] header;
+
+        if (length > blockSize)
+        {
+            data[0..64] = sha512Of(data);
+            length = blockSize;
+        }
+
+        header[0] = sourceId;
+        header[1] = length;
+
+        accumulator.put(header);
+        accumulator.put(data[0..length]);
+    }
+}

source/tanya/memory/allocator.d

@@ -3,35 +3,32 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.memory.allocator;
 
-import std.experimental.allocator;
-import std.traits;
-
-version (unittest)
-{
-    import tanya.memory : defaultAllocator;
-}
-
 /**
- * Allocator interface.
+ * Abstract class implementing a basic allocator.
  */
 interface Allocator
 {
+    /**
+     * Returns: Alignment offered.
+     */
+    @property uint alignment() const shared pure nothrow @safe @nogc;
+
     /**
      * Allocates $(D_PARAM size) bytes of memory.
      *
      * Params:
      *  size = Amount of memory to allocate.
      *
-     * Returns: The pointer to the new allocated memory.
+     * Returns: Pointer to the new allocated memory.
      */
-    void[] allocate(size_t size) shared;
+    void[] allocate(in size_t size) shared nothrow @nogc;
 
     /**
      * Deallocates a memory block.
@@ -41,7 +38,7 @@ interface Allocator
      *
      * Returns: Whether the deallocation was successful.
      */
-    bool deallocate(void[] p) shared;
+    bool deallocate(void[] p) shared nothrow @nogc;
 
     /**
      * Increases or decreases the size of a memory block.
@@ -50,58 +47,21 @@ interface Allocator
      *  p    = A pointer to the memory block.
      *  size = Size of the reallocated block.
      *
-     * Returns: Whether the reallocation was successful.
+     * Returns: Pointer to the allocated memory.
      */
-    bool reallocate(ref void[] p, size_t size) shared;
+    bool reallocate(ref void[] p, in size_t size) shared nothrow @nogc;
 
     /**
-     * Returns: The alignment offered.
-     */
-    @property immutable(uint) alignment() shared const @safe pure nothrow;
-}
-
-/**
- * Params:
- *     T         = Element type of the array being created.
- *     allocator = The allocator used for getting memory.
- *     array     = A reference to the array being changed.
- *     length    = New array length.
+     * Reallocates a memory block in place if possible or returns
+     * $(D_KEYWORD false). This function cannot be used to allocate or
+     * deallocate memory, so if $(D_PARAM p) is $(D_KEYWORD null) or
+     * $(D_PARAM size) is `0`, it should return $(D_KEYWORD false).
      *
- * Returns: $(D_KEYWORD true) upon success, $(D_KEYWORD false) if memory could
- *          not be reallocated. In the latter
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
      */
-bool resizeArray(T)(shared Allocator allocator,
-                    ref T[] array,
-                    in size_t length)
-{
-    void[] buf = array;
-
-    if (!allocator.reallocate(buf, length * T.sizeof))
-    {
-        return false;
-    }
-    array = cast(T[]) buf;
-
-    return true;
+    bool reallocateInPlace(ref void[] p, in size_t size) shared nothrow @nogc;
 }
-
-///
-unittest
-{
-    int[] p;
-
-    defaultAllocator.resizeArray(p, 20);
-    assert(p.length == 20);
-
-    defaultAllocator.resizeArray(p, 30);
-    assert(p.length == 30);
-
-    defaultAllocator.resizeArray(p, 10);
-    assert(p.length == 10);
-
-    defaultAllocator.resizeArray(p, 0);
-    assert(p is null);
-}
-
-enum bool isFinalizable(T) = is(T == class) || is(T == interface)
-                           || hasElaborateDestructor!T || isDynamicArray!T;

source/tanya/memory/mallocator.d

@@ -3,22 +3,21 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.memory.mallocator;
 
-import tanya.memory.allocator;
-import core.exception;
 import core.stdc.stdlib;
 import std.algorithm.comparison;
+import tanya.memory.allocator;
 
 /**
  * Wrapper for malloc/realloc/free from the C standard library.
  */
-class Mallocator : Allocator
+final class Mallocator : Allocator
 {
     /**
      * Allocates $(D_PARAM size) bytes of memory.
@@ -28,7 +27,7 @@ class Mallocator : Allocator
      *
      * Returns: The pointer to the new allocated memory.
      */
-    void[] allocate(size_t size) shared @nogc nothrow
+    void[] allocate(in size_t size) shared nothrow @nogc
     {
         if (!size)
         {
@@ -36,11 +35,7 @@ class Mallocator : Allocator
         }
         auto p = malloc(size + psize);
 
-        if (!p)
-        {
-            onOutOfMemoryError();
-        }
-        return p[psize.. psize + size];
+        return p is null ? null : p[psize .. psize + size];
     }
 
     ///
@@ -61,7 +56,7 @@ class Mallocator : Allocator
      *
      * Returns: Whether the deallocation was successful.
      */
-    bool deallocate(void[] p) shared @nogc nothrow
+    bool deallocate(void[] p) shared nothrow @nogc
     {
         if (p !is null)
         {
@@ -80,6 +75,20 @@ class Mallocator : Allocator
         assert(Mallocator.instance.deallocate(p));
     }
 
+    /**
+     * Reallocating in place isn't supported.
+     *
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: $(D_KEYWORD false).
+     */
+    bool reallocateInPlace(ref void[] p, const size_t size) shared nothrow @nogc
+    {
+        return false;
+    }
+
     /**
      * Increases or decreases the size of a memory block.
      *
@@ -89,52 +98,56 @@ class Mallocator : Allocator
      *
      * Returns: Whether the reallocation was successful.
      */
-    bool reallocate(ref void[] p, size_t size) shared @nogc nothrow
+    bool reallocate(ref void[] p, const size_t size) shared nothrow @nogc
     {
-        if (!size)
+        if (size == 0)
+        {
+            if (deallocate(p))
             {
-            deallocate(p);
                 p = null;
                 return true;
             }
+        }
         else if (p is null)
         {
             p = allocate(size);
-            return true;
+            return p is null ? false : true;
         }
+        else
+        {
             auto r = realloc(p.ptr - psize, size + psize);
 
-        if (!r)
+            if (r !is null)
             {
-            onOutOfMemoryError();
-        }
-        p = r[psize.. psize + size];
-
+                p = r[psize .. psize + size];
                 return true;
             }
+        }
+        return false;
+    }
 
     ///
     @nogc nothrow unittest
     {
         void[] p;
 
-        Mallocator.instance.reallocate(p, 20);
+        assert(Mallocator.instance.reallocate(p, 20));
         assert(p.length == 20);
 
-        Mallocator.instance.reallocate(p, 30);
+        assert(Mallocator.instance.reallocate(p, 30));
         assert(p.length == 30);
 
-        Mallocator.instance.reallocate(p, 10);
+        assert(Mallocator.instance.reallocate(p, 10));
         assert(p.length == 10);
 
-        Mallocator.instance.reallocate(p, 0);
+        assert(Mallocator.instance.reallocate(p, 0));
         assert(p is null);
     }
 
     /**
      * Returns: The alignment offered.
      */
-    @property immutable(uint) alignment() shared const @safe pure nothrow
+    @property uint alignment() shared const pure nothrow @safe @nogc
     {
         return cast(uint) max(double.alignof, real.alignof);
     }
@@ -151,12 +164,11 @@ class Mallocator : Allocator
             immutable size = __traits(classInstanceSize, Mallocator) + psize;
             void* p = malloc(size);
 
-            if (p is null)
+            if (p !is null)
             {
-                onOutOfMemoryError();
+                p[psize .. size] = typeid(Mallocator).initializer[];
+                instance_ = cast(shared Mallocator) p[psize .. size].ptr;
             }
-            p[psize..size] = typeid(Mallocator).initializer[];
-            instance_ = cast(shared Mallocator) p[psize..size].ptr;
         }
         return instance_;
     }

source/tanya/memory/mmappool.d

@@ -3,16 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.memory.mmappool;
 
+import core.stdc.string;
+import std.algorithm.comparison;
 import tanya.memory.allocator;
-import core.atomic;
-import core.exception;
 
 version (Posix)
 {
@@ -27,7 +27,7 @@ else version (Windows)
 }
 
 /**
- * This allocator allocates memory in regions (multiple of 4 KB for example).
+ * This allocator allocates memory in regions (multiple of 64 KB for example).
  * Each region is then splitted in blocks. So it doesn't request the memory
  * from the operating system on each call, but only if there are no large
  * enough free blocks in the available regions.
@@ -36,7 +36,7 @@ else version (Windows)
  * block as free and only if all blocks in the region are free, the complete
  * region is deallocated.
  *
- * ----------------------------------------------------------------------------
+ * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  * |      |     |         |     |            ||      |     |                  |
  * |      |prev <-----------    |            ||      |     |                  |
  * |  R   |  B  |         |  B  |            ||   R  |  B  |                  |
@@ -46,32 +46,22 @@ else version (Windows)
  * |  O   |  K  |         |  K  |           prev  O  |  K  |                  |
  * |  N   |    -----------> next|            ||   N  |     |                  |
  * |      |     |         |     |            ||      |     |                  |
- * --------------------------------------------------- ------------------------
- *
- * TODO:
- *     $(UL
- *         $(LI Thread safety (core.atomic.cas))
- *         $(LI If two neighbour blocks are free, they can be merged)
- *         $(LI Reallocation shoud check if there is enough free space in the
- *              next block instead of always moving the memory)
- *         $(LI Make 64 KB regions mininmal region size on Linux)
- *     )
+ * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  */
-class MmapPool : Allocator
+final class MmapPool : Allocator
 {
-    @disable this();
-
-    shared static this()
+	invariant
 	{
-        version (Posix)
+		for (auto r = &head; *r !is null; r = &((*r).next))
 		{
-            pageSize = sysconf(_SC_PAGE_SIZE);
+			auto block = cast(Block) (cast(void*) *r + RegionEntry.sizeof);
+			do
+			{
+				assert(block.prev is null || block.prev.next is block);
+				assert(block.next is null || block.next.prev is block);
+				assert(block.region is *r);
 			}
-        else version (Windows)
-        {
-            SYSTEM_INFO si;
-            GetSystemInfo(&si);
-            pageSize = si.dwPageSize;
+			while ((block = block.next) !is null);
 		}
 	}
 
@@ -81,9 +71,9 @@ class MmapPool : Allocator
 	 * Params:
 	 * 	size = Amount of memory to allocate.
 	 *
-     * Returns: The pointer to the new allocated memory.
+	 * Returns: Pointer to the new allocated memory.
 	 */
-    void[] allocate(size_t size) shared @nogc @trusted nothrow
+	void[] allocate(in size_t size) shared nothrow @nogc
 	{
 		if (!size)
 		{
@@ -97,11 +87,11 @@ class MmapPool : Allocator
 			data = initializeRegion(dataSize);
 		}
 
-        return data is null ? null : data[0..size];
+		return data is null ? null : data[0 .. size];
 	}
 
 	///
-    @nogc @safe nothrow unittest
+	nothrow unittest
 	{
 		auto p = MmapPool.instance.allocate(20);
 
@@ -115,16 +105,16 @@ class MmapPool : Allocator
 	 * into two blocks if the block is too large.
 	 *
 	 * Params:
-     *     size = Minimum size the block should have.
+	 * 	size = Minimum size the block should have (aligned).
 	 *
 	 * Returns: Data the block points to or $(D_KEYWORD null).
 	 */
-    private void* findBlock(size_t size) shared @nogc nothrow
+	private void* findBlock(in ref size_t size) shared nothrow @nogc
 	{
 		Block block1;
 		RegionLoop: for (auto r = head; r !is null; r = r.next)
 		{
-            block1 = cast(Block) (cast(void*) r + regionEntrySize);
+			block1 = cast(Block) (cast(void*) r + RegionEntry.sizeof);
 			do
 			{
 				if (block1.free && block1.size >= size)
@@ -138,35 +128,37 @@ class MmapPool : Allocator
 		{
 			return null;
 		}
-        else if (block1.size >= size + alignment + blockEntrySize)
+		else if (block1.size >= size + alignment_ + BlockEntry.sizeof)
 		{ // Split the block if needed
-            Block block2 = cast(Block) (cast(void*) block1 + blockEntrySize + size);
+			Block block2 = cast(Block) (cast(void*) block1 + BlockEntry.sizeof + size);
 			block2.prev = block1;
-            if (block1.next is null)
+			block2.next = block1.next;
+			block2.free = true;
+			block2.size = block1.size - BlockEntry.sizeof - size;
+			block2.region = block1.region;
+
+			if (block1.next !is null)
 			{
-                block2.next = null;
-            }
-            else
-            {
-                block2.next = block1.next.next;
+				block1.next.prev = block2;
 			}
 			block1.next = block2;
-
-            block1.free = false;
-            block2.free = true;
-
-            block2.size = block1.size - blockEntrySize - size;
 			block1.size = size;
-
-            block2.region = block1.region;
-            atomicOp!"+="(block1.region.blocks, 1);
 		}
-        else
-        {
 		block1.free = false;
-            atomicOp!"+="(block1.region.blocks, 1);
+		block1.region.blocks = block1.region.blocks + 1;
+
+		return cast(void*) block1 + BlockEntry.sizeof;
 	}
-        return cast(void*) block1 + blockEntrySize;
+
+	// Merge block with the next one.
+	private void mergeNext(Block block) shared const pure nothrow @safe @nogc
+	{
+		block.size = block.size + BlockEntry.sizeof + block.next.size;
+		if (block.next.next !is null)
+		{
+			block.next.next.prev = block;
+		}
+		block.next = block.next.next;
 	}
 
 	/**
@@ -177,14 +169,14 @@ class MmapPool : Allocator
 	 *
 	 * Returns: Whether the deallocation was successful.
 	 */
-    bool deallocate(void[] p) shared @nogc @trusted nothrow
+	bool deallocate(void[] p) shared nothrow @nogc
 	{
-        if (p is null)
+		if (p.ptr is null)
 		{
 			return true;
 		}
 
-        Block block = cast(Block) (p.ptr - blockEntrySize);
+		Block block = cast(Block) (p.ptr - BlockEntry.sizeof);
 		if (block.region.blocks <= 1)
 		{
 			if (block.region.prev !is null)
@@ -208,22 +200,130 @@ class MmapPool : Allocator
 				return VirtualFree(cast(void*) block.region, 0, MEM_RELEASE) == 0;
 			}
 		}
+		// Merge blocks if neigbours are free.
+		if (block.next !is null && block.next.free)
+		{
+			mergeNext(block);
+		}
+		if (block.prev !is null && block.prev.free)
+		{
+			block.prev.size = block.prev.size + BlockEntry.sizeof + block.size;
+			if (block.next !is null)
+			{
+				block.next.prev = block.prev;
+			}
+			block.prev.next = block.next;
+		}
 		else
 		{
 			block.free = true;
-            atomicOp!"-="(block.region.blocks, 1);
-            return true;
 		}
+		block.region.blocks = block.region.blocks - 1;
+		return true;
 	}
 
 	///
-    @nogc @safe nothrow unittest
+	nothrow unittest
 	{
 		auto p = MmapPool.instance.allocate(20);
 
 		assert(MmapPool.instance.deallocate(p));
 	}
 
+	/**
+	 * Reallocates a memory block in place if possible or returns
+	 * $(D_KEYWORD false). This function cannot be used to allocate or
+	 * deallocate memory, so if $(D_PARAM p) is $(D_KEYWORD null) or
+	 * $(D_PARAM size) is `0`, it should return $(D_KEYWORD false).
+	 *
+	 * Params:
+	 * 	p    = A pointer to the memory block.
+	 * 	size = Size of the reallocated block.
+	 *
+	 * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
+	 */
+	bool reallocateInPlace(ref void[] p, in size_t size) shared nothrow @nogc
+	{
+		if (p is null || size == 0)
+		{
+			return false;
+		}
+		if (size <= p.length)
+		{
+			// Leave the block as is.
+			p = p.ptr[0 .. size];
+			return true;
+		}
+		Block block1 = cast(Block) (p.ptr - BlockEntry.sizeof);
+
+		if (block1.size >= size)
+		{
+			// Enough space in the current block. Can happen because of the alignment.
+			p = p.ptr[0 .. size];
+			return true;
+		}
+		immutable dataSize = addAlignment(size);
+		immutable delta = dataSize - addAlignment(p.length);
+
+		if (block1.next is null
+		 || !block1.next.free
+		 || block1.next.size + BlockEntry.sizeof < delta)
+		{
+			// It is the last block in the region or the next block is too small or not
+			// free.
+			return false;
+		}
+		if (block1.next.size >= delta + alignment_)
+		{
+			// Move size from block2 to block1.
+			block1.next.size = block1.next.size - delta;
+			block1.size = block1.size + delta;
+
+			auto block2 = cast(Block) (p.ptr + dataSize);
+			if (block1.next.next !is null)
+			{
+				block1.next.next.prev = block2;
+			}
+			// block1.next and block2 can overlap.
+			memmove(cast(void*) block2, cast(void*) block1.next, BlockEntry.sizeof);
+			block1.next = block2;
+		}
+		else
+		{
+			// The next block has enough space, but is too small for further
+			// allocations. Merge it with the current block.
+			mergeNext(block1);
+		}
+
+		p = p.ptr[0 .. size];
+		return true;
+	}
+
+	///
+	nothrow unittest
+	{
+		void[] p;
+		assert(!MmapPool.instance.reallocateInPlace(p, 5));
+		assert(p is null);
+
+		p = MmapPool.instance.allocate(1);
+		auto orig = p.ptr;
+
+		assert(MmapPool.instance.reallocateInPlace(p, 2));
+		assert(p.length == 2);
+		assert(p.ptr == orig);
+
+		assert(MmapPool.instance.reallocateInPlace(p, 4));
+		assert(p.length == 4);
+		assert(p.ptr == orig);
+
+		assert(MmapPool.instance.reallocateInPlace(p, 2));
+		assert(p.length == 2);
+		assert(p.ptr == orig);
+
+		MmapPool.instance.deallocate(p);
+	}
+
 	/**
 	 * Increases or decreases the size of a memory block.
 	 *
@@ -233,33 +333,31 @@ class MmapPool : Allocator
 	 *
 	 * Returns: Whether the reallocation was successful.
 	 */
-    bool reallocate(ref void[] p, size_t size) shared @nogc @trusted nothrow
+	bool reallocate(ref void[] p, in size_t size) shared nothrow @nogc
 	{
-        void[] reallocP;
-
-        if (size == p.length)
+		if (size == 0)
+		{
+			if (deallocate(p))
+			{
+				p = null;
+				return true;
+			}
+			return false;
+		}
+		else if (reallocateInPlace(p, size))
 		{
 			return true;
 		}
-        else if (size > 0)
-        {
-            reallocP = allocate(size);
+		// Can't reallocate in place, allocate a new block,
+		// copy and delete the previous one.
+		void[] reallocP = allocate(size);
 		if (reallocP is null)
 		{
 			return false;
 		}
-        }
-
 		if (p !is null)
 		{
-            if (size > p.length)
-            {
-                reallocP[0..p.length] = p[0..$];
-            }
-            else if (size > 0)
-            {
-                reallocP[0..size] = p[0..size];
-            }
+			memcpy(reallocP.ptr, p.ptr, min(p.length, size));
 			deallocate(p);
 		}
 		p = reallocP;
@@ -268,7 +366,7 @@ class MmapPool : Allocator
 	}
 
 	///
-    @nogc @safe nothrow unittest
+	nothrow unittest
 	{
 		void[] p;
 		MmapPool.instance.reallocate(p, 10 * int.sizeof);
@@ -301,17 +399,33 @@ class MmapPool : Allocator
 	 *
 	 * Returns: Global $(D_PSYMBOL MmapPool) instance.
 	 */
-    static @property ref shared(MmapPool) instance() @nogc @trusted nothrow
+	static @property ref shared(MmapPool) instance() nothrow @nogc
 	{
 		if (instance_ is null)
 		{
+			// Get system dependend page size.
+			version (Posix)
+			{
+				pageSize = sysconf(_SC_PAGE_SIZE);
+				if (pageSize < 65536)
+				{
+					pageSize = pageSize * 65536 / pageSize;
+				}
+			}
+			else version (Windows)
+			{
+				SYSTEM_INFO si;
+				GetSystemInfo(&si);
+				pageSize = si.dwPageSize;
+			}
+
 			immutable instanceSize = addAlignment(__traits(classInstanceSize, MmapPool));
 
 			Region head; // Will become soon our region list head
 			void* data = initializeRegion(instanceSize, head);
 			if (data !is null)
 			{
-                data[0..instanceSize] = typeid(MmapPool).initializer[];
+				memcpy(data, typeid(MmapPool).initializer.ptr, instanceSize);
 				instance_ = cast(shared MmapPool) data;
 				instance_.head = head;
 			}
@@ -320,12 +434,12 @@ class MmapPool : Allocator
 	}
 
 	///
-    @nogc @safe nothrow unittest
+	nothrow unittest
 	{
 		assert(instance is instance);
 	}
 
-    /**
+	/*
 	 * Initializes a region for one element.
 	 *
 	 * Params:
@@ -334,9 +448,8 @@ class MmapPool : Allocator
 	 *
 	 * Returns: A pointer to the data.
 	 */
-    pragma(inline)
-    private static void* initializeRegion(size_t size,
-                                          ref Region head) @nogc nothrow
+	private static void* initializeRegion(size_t size, ref Region head)
+	nothrow @nogc
 	{
 		immutable regionSize = calculateRegionSize(size);
 		
@@ -350,10 +463,6 @@ class MmapPool : Allocator
 			               0);
 			if (p is MAP_FAILED)
 			{
-                if (errno == ENOMEM)
-                {
-                    onOutOfMemoryError();
-                }
 				return null;
 			}
 		}
@@ -365,10 +474,6 @@ class MmapPool : Allocator
 			                       PAGE_READWRITE);
 			if (p is null)
 			{
-                if (GetLastError() == ERROR_NOT_ENOUGH_MEMORY)
-                {
-                    onOutOfMemoryError();
-                }
 				return null;
 			}
 		}
@@ -387,13 +492,13 @@ class MmapPool : Allocator
 		head = region;
 
 		// Initialize the data block
-        void* memoryPointer = p + regionEntrySize;
+		void* memoryPointer = p + RegionEntry.sizeof;
 		Block block1 = cast(Block) memoryPointer;
 		block1.size = size;
 		block1.free = false;
 
 		// It is what we want to return
-        void* data = memoryPointer + blockEntrySize;
+		void* data = memoryPointer + BlockEntry.sizeof;
 
 		// Free block after data
 		memoryPointer = data + size;
@@ -401,28 +506,26 @@ class MmapPool : Allocator
 		block1.prev = block2.next = null;
 		block1.next = block2;
 		block2.prev = block1;
-        block2.size = regionSize - size - regionEntrySize - blockEntrySize * 2;
+		block2.size = regionSize - size - RegionEntry.sizeof - BlockEntry.sizeof * 2;
 		block2.free = true;
 		block1.region = block2.region = region;
 
 		return data;
 	}
 
-    /// Ditto.
-    private void* initializeRegion(size_t size) shared @nogc nothrow
+	private void* initializeRegion(size_t size) shared nothrow @nogc
 	{
 		return initializeRegion(size, head);
 	}
 
-    /**
+	/*
 	 * Params:
 	 * 	x = Space to be aligned.
 	 *
 	 * Returns: Aligned size of $(D_PARAM x).
 	 */
-    pragma(inline)
 	private static immutable(size_t) addAlignment(size_t x)
-    @nogc @safe pure nothrow
+	pure nothrow @safe @nogc
 	out (result)
 	{
 		assert(result > 0);
@@ -432,34 +535,35 @@ class MmapPool : Allocator
 		return (x - 1) / alignment_ * alignment_ + alignment_;
 	}
 
-    /**
+	/*
 	 * Params:
 	 * 	x = Required space.
 	 *
 	 * Returns: Minimum region size (a multiple of $(D_PSYMBOL pageSize)).
 	 */
-    pragma(inline)
 	private static immutable(size_t) calculateRegionSize(size_t x)
-    @nogc @safe pure nothrow
+	nothrow @safe @nogc
 	out (result)
 	{
 		assert(result > 0);
 	}
 	body
 	{
-        x += regionEntrySize + blockEntrySize * 2;
+		x += RegionEntry.sizeof + BlockEntry.sizeof * 2;
 		return x / pageSize * pageSize + pageSize;
 	}
 
-    @property immutable(uint) alignment() shared const @nogc @safe pure nothrow
+	/**
+	 * Returns: Alignment offered.
+	 */
+	@property uint alignment() shared const pure nothrow @safe @nogc
 	{
 		return alignment_;
 	}
 	private enum alignment_ = 8;
 
 	private shared static MmapPool instance_;
-
-    private shared static immutable size_t pageSize;
+	private shared static size_t pageSize;
 
 	private shared struct RegionEntry
 	{
@@ -469,18 +573,73 @@ class MmapPool : Allocator
 		size_t size;
 	}
 	private alias Region = shared RegionEntry*;
-    private enum regionEntrySize = 32;
-
 	private shared Region head;
 
 	private shared struct BlockEntry
 	{
 		Block prev;
 		Block next;
-        bool free;
-        size_t size;
 		Region region;
+		size_t size;
+		bool free;
 	}
 	private alias Block = shared BlockEntry*;
-    private enum blockEntrySize = 40;
+}
+
+// A lot of allocations/deallocations, but it is the minimum caused a
+// segmentation fault because MmapPool reallocateInPlace moves a block wrong.
+unittest
+{
+	auto a = MmapPool.instance.allocate(16);
+	auto d = MmapPool.instance.allocate(16);
+	auto b = MmapPool.instance.allocate(16);
+	auto e = MmapPool.instance.allocate(16);
+	auto c = MmapPool.instance.allocate(16);
+	auto f = MmapPool.instance.allocate(16);
+
+	MmapPool.instance.deallocate(a);
+	MmapPool.instance.deallocate(b);
+	MmapPool.instance.deallocate(c);
+
+	a = MmapPool.instance.allocate(50);
+	MmapPool.instance.reallocateInPlace(a, 64);
+	MmapPool.instance.deallocate(a);
+
+	a = MmapPool.instance.allocate(1);
+	auto tmp1 = MmapPool.instance.allocate(1);
+	auto h1 = MmapPool.instance.allocate(1);
+	auto tmp2 = cast(ubyte[]) MmapPool.instance.allocate(1);
+
+	auto h2 = MmapPool.instance.allocate(2);
+	tmp1 = MmapPool.instance.allocate(1);
+	MmapPool.instance.deallocate(h2);
+	MmapPool.instance.deallocate(h1);
+
+	h2 = MmapPool.instance.allocate(2);
+	h1 = MmapPool.instance.allocate(1);
+	MmapPool.instance.deallocate(h2);
+
+	auto rep = cast(void[]) tmp2;
+	MmapPool.instance.reallocate(rep, tmp1.length);
+	tmp2 = cast(ubyte[]) rep;
+
+	MmapPool.instance.reallocate(tmp1, 9);
+
+	rep = cast(void[]) tmp2;
+	MmapPool.instance.reallocate(rep, tmp1.length);
+	tmp2 = cast(ubyte[]) rep;
+	MmapPool.instance.reallocate(tmp1, 17);
+
+	tmp2[$ - 1] = 0;
+
+	MmapPool.instance.deallocate(tmp1);
+
+	b = MmapPool.instance.allocate(16);
+
+	MmapPool.instance.deallocate(h1);
+	MmapPool.instance.deallocate(a);
+	MmapPool.instance.deallocate(b);
+	MmapPool.instance.deallocate(d);
+	MmapPool.instance.deallocate(e);
+	MmapPool.instance.deallocate(f);
 }

source/tanya/memory/package.d

@@ -3,27 +3,307 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.memory;
 
-public
+import core.exception;
+import std.algorithm.iteration;
+public import std.experimental.allocator : make;
+import std.traits;
+public import tanya.memory.allocator;
+
+/**
+ * The mixin generates common methods for classes and structs using
+ * allocators. It provides a protected member, constructor and a read-only property,
+ * that checks if an allocator was already set and sets it to the default
+ * one, if not (useful for structs which don't have a default constructor).
+ */
+mixin template DefaultAllocator()
 {
-    import tanya.memory.allocator;
-    import std.experimental.allocator : make, dispose, shrinkArray, expandArray, makeArray, dispose;
+    /// Allocator.
+    protected shared Allocator allocator_;
+
+    /**
+     * Params:
+     *  allocator = The allocator should be used.
+     *
+     * Precondition: $(D_INLINECODE allocator_ !is null)
+     */
+    this(shared Allocator allocator)
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.allocator_ = allocator;
+    }
+
+    /**
+     * This property checks if the allocator was set in the constructor
+     * and sets it to the default one, if not.
+     *
+     * Returns: Used allocator.
+     *
+     * Postcondition: $(D_INLINECODE allocator !is null)
+     */
+    protected @property shared(Allocator) allocator() nothrow @safe @nogc
+    out (allocator)
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        if (allocator_ is null)
+        {
+            allocator_ = defaultAllocator;
+        }
+        return allocator_;
+    }
+
+    /// Ditto.
+    @property shared(Allocator) allocator() const nothrow @trusted @nogc
+    out (allocator)
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        if (allocator_ is null)
+        {
+            return defaultAllocator;
+        }
+        return cast(shared Allocator) allocator_;
+    }
 }
 
+// From druntime
+private extern (C) void _d_monitordelete(Object h, bool det) nothrow @nogc;
+
 shared Allocator allocator;
 
-@property ref shared(Allocator) defaultAllocator()
+shared static this() nothrow @trusted @nogc
+{
+    import tanya.memory.mmappool;
+    allocator = MmapPool.instance;
+}
+
+@property ref shared(Allocator) defaultAllocator() nothrow @safe @nogc
+out (allocator)
+{
+    assert(allocator !is null);
+}
+body
 {
-    import tanya.memory.mallocator;
-    if (allocator is null)
-    {
-        allocator = Mallocator.instance;
-    }
     return allocator;
 }
+
+@property void defaultAllocator(shared(Allocator) allocator) nothrow @safe @nogc
+in
+{
+    assert(allocator !is null);
+}
+body
+{
+    .allocator = allocator;
+}
+
+/**
+ * Returns the size in bytes of the state that needs to be allocated to hold an
+ * object of type $(D_PARAM T).
+ *
+ * Params:
+ *  T = Object type.
+ */
+template stateSize(T)
+{
+    static if (is(T == class) || is(T == interface))
+    {
+        enum stateSize = __traits(classInstanceSize, T);
+    }
+    else
+    {
+        enum stateSize = T.sizeof;
+    }
+}
+
+/**
+ * Params:
+ *  size      = Raw size.
+ *  alignment = Alignment.
+ *
+ * Returns: Aligned size.
+ */
+size_t alignedSize(const size_t size, const size_t alignment = 8)
+pure nothrow @safe @nogc
+{
+    return (size - 1) / alignment * alignment + alignment;
+}
+
+/**
+ * Internal function used to create, resize or destroy a dynamic array. It
+ * may throw $(D_PSYMBOL OutOfMemoryError). The new
+ * allocated part of the array isn't initialized. This function can be trusted
+ * only in the data structures that can ensure that the array is
+ * allocated/rellocated/deallocated with the same allocator.
+ *
+ * Params:
+ *  T         = Element type of the array being created.
+ *  allocator = The allocator used for getting memory.
+ *  array     = A reference to the array being changed.
+ *  length    = New array length.
+ *
+ * Returns: $(D_PARAM array).
+ */
+package(tanya) T[] resize(T)(shared Allocator allocator,
+                             auto ref T[] array,
+                             const size_t length) @trusted
+{
+    if (length == 0)
+    {
+        if (allocator.deallocate(array))
+        {
+            return null;
+        }
+        else
+        {
+            onOutOfMemoryErrorNoGC();
+        }
+    }
+
+    void[] buf = array;
+    if (!allocator.reallocate(buf, length * T.sizeof))
+    {
+        onOutOfMemoryErrorNoGC();
+    }
+    // Casting from void[] is unsafe, but we know we cast to the original type.
+    array = cast(T[]) buf;
+
+    return array;
+}
+
+private unittest
+{
+    int[] p;
+
+    p = defaultAllocator.resize(p, 20);
+    assert(p.length == 20);
+
+    p = defaultAllocator.resize(p, 30);
+    assert(p.length == 30);
+
+    p = defaultAllocator.resize(p, 10);
+    assert(p.length == 10);
+
+    p = defaultAllocator.resize(p, 0);
+    assert(p is null);
+}
+
+/*
+ * Destroys the object.
+ * Returns the memory should be freed.
+ */
+package(tanya) void[] finalize(T)(ref T* p)
+{
+    static if (hasElaborateDestructor!T)
+    {
+        destroy(*p);
+    }
+    return (cast(void*) p)[0 .. T.sizeof];
+}
+
+package(tanya) void[] finalize(T)(ref T p)
+    if (is(T == class) || is(T == interface))
+{
+    if (p is null)
+    {
+        return null;
+    }
+    static if (is(T == interface))
+    {
+        version(Windows)
+        {
+            import core.sys.windows.unknwn : IUnknown;
+            static assert(!is(T : IUnknown), "COM interfaces can't be destroyed in "
+                                           ~ __PRETTY_FUNCTION__);
+        }
+        auto ob = cast(Object) p;
+    }
+    else
+    {
+        alias ob = p;
+    }
+    auto ptr = cast(void*) ob;
+    auto support = ptr[0 .. typeid(ob).initializer.length];
+
+    auto ppv = cast(void**) ptr;
+    if (!*ppv)
+    {
+        return null;
+    }
+    auto pc = cast(ClassInfo*) *ppv;
+    scope (exit)
+    {
+        *ppv = null;
+    }
+
+    auto c = *pc;
+    do
+    {
+        // Assume the destructor is @nogc. Leave it nothrow since the destructor
+        // shouldn't throw and if it does, it is an error anyway.
+        if (c.destructor)
+        {
+            (cast(void function (Object) nothrow @safe @nogc) c.destructor)(ob);
+        }
+    }
+    while ((c = c.base) !is null);
+
+    if (ppv[1]) // if monitor is not null
+    {
+        _d_monitordelete(cast(Object) ptr, true);
+    }
+    return support;
+}
+
+package(tanya) void[] finalize(T)(ref T[] p)
+{
+    static if (hasElaborateDestructor!(typeof(p[0])))
+    {
+        p.each!((ref e) => destroy(e));
+    }
+    return p;
+}
+
+/**
+ * Destroys and deallocates $(D_PARAM p) of type $(D_PARAM T).
+ * It is assumed the respective entities had been allocated with the same
+ * allocator.
+ *
+ * Params:
+ *  T         = Type of $(D_PARAM p).
+ *  allocator = Allocator the $(D_PARAM p) was allocated with.
+ *  p         = Object or array to be destroyed.
+ */
+void dispose(T)(shared Allocator allocator, auto ref T p)
+{
+    () @trusted { allocator.deallocate(finalize(p)); }();
+    p = null;
+}
+
+private unittest
+{
+    struct S
+    {
+        ~this()
+        {
+        }
+    }
+    auto p = cast(S[]) defaultAllocator.allocate(S.sizeof);
+
+    defaultAllocator.dispose(p);
+}

source/tanya/memory/types.d

@@ -0,0 +1,497 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Copyright: Eugene Wissner 2016-2017.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ */
+module tanya.memory.types;
+
+import core.exception;
+import std.algorithm.comparison;
+import std.algorithm.mutation;
+import std.conv;
+import std.range;
+import std.traits;
+import tanya.memory;
+
+package(tanya) final class RefCountedStore(T)
+{
+    T payload;
+    size_t counter = 1;
+
+    size_t opUnary(string op)()
+        if (op == "--" || op == "++")
+    in
+    {
+        assert(counter > 0);
+    }
+    body
+    {
+        mixin("return " ~ op ~ "counter;");
+    }
+
+    int opCmp(size_t counter)
+    {
+        if (this.counter > counter)
+        {
+            return 1;
+        }
+        else if (this.counter < counter)
+        {
+            return -1;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    int opEquals(size_t counter)
+    {
+        return this.counter == counter;
+    }
+}
+
+private void separateDeleter(T)(RefCountedStore!T storage,
+                                shared Allocator allocator)
+{
+    allocator.dispose(storage.payload);
+    allocator.dispose(storage);
+}
+
+private void unifiedDeleter(T)(RefCountedStore!T storage,
+                               shared Allocator allocator)
+{
+    auto ptr1 = finalize(storage);
+    auto ptr2 = finalize(storage.payload);
+    allocator.deallocate(ptr1.ptr[0 .. ptr1.length + ptr2.length]);
+}
+
+/**
+ * Reference-counted object containing a $(D_PARAM T) value as payload.
+ * $(D_PSYMBOL RefCounted) keeps track of all references of an object, and
+ * when the reference count goes down to zero, frees the underlying store.
+ *
+ * Params:
+ *  T = Type of the reference-counted value.
+ */
+struct RefCounted(T)
+{
+    static if (is(T == class) || is(T == interface) || isArray!T)
+    {
+        private alias Payload = T;
+    }
+    else
+    {
+        private alias Payload = T*;
+    }
+    private alias Storage = RefCountedStore!Payload;
+
+    private Storage storage;
+    private void function(Storage storage,
+                          shared Allocator allocator) @nogc deleter;
+
+    invariant
+    {
+        assert(storage is null || allocator_ !is null);
+        assert(storage is null || deleter !is null);
+    }
+
+    /**
+     * Takes ownership over $(D_PARAM value), setting the counter to 1.
+     * $(D_PARAM value) may be a pointer, an object or a dynamic array.
+     *
+     * Params:
+     *  value     = Value whose ownership is taken over.
+     *  allocator = Allocator used to destroy the $(D_PARAM value) and to
+     *              allocate/deallocate internal storage.
+     *
+     * Precondition: $(D_INLINECODE allocator !is null)
+     */
+    this()(auto ref Payload value,
+           shared Allocator allocator = defaultAllocator)
+    {
+        this(allocator);
+        this.storage = allocator.make!Storage();
+        this.deleter = &separateDeleter!Payload;
+        move(value, this.storage.payload);
+    }
+
+    /// Ditto.
+    this(shared Allocator allocator)
+    in
+    {
+        assert(allocator !is null);
+    }
+    body
+    {
+        this.allocator_ = allocator;
+    }
+
+    /**
+     * Increases the reference counter by one.
+     */
+    this(this)
+    {
+        if (count != 0)
+        {
+            ++storage;
+        }
+    }
+
+    /**
+     * Decreases the reference counter by one.
+     *
+     * If the counter reaches 0, destroys the owned object.
+     */
+    ~this()
+    {
+        if (this.storage !is null && !(this.storage.counter && --this.storage))
+        {
+            deleter(storage, allocator);
+        }
+    }
+
+    /**
+     * Takes ownership over $(D_PARAM rhs). Initializes this
+     * $(D_PSYMBOL RefCounted) if needed.
+     *
+     * If it is the last reference of the previously owned object,
+     * it will be destroyed.
+     *
+     * To reset the $(D_PSYMBOL RefCounted) assign $(D_KEYWORD null).
+     *
+     * If the allocator wasn't set before, $(D_PSYMBOL defaultAllocator) will
+     * be used. If you need a different allocator, create a new
+     * $(D_PSYMBOL RefCounted) and assign it.
+     *
+     * Params:
+     *  rhs = $(D_KEYWORD this).
+     */
+    ref typeof(this) opAssign()(auto ref Payload rhs)
+    {
+        if (this.storage is null)
+        {
+            this.storage = allocator.make!Storage();
+            this.deleter = &separateDeleter!Payload;
+        }
+        else if (this.storage > 1)
+        {
+            --this.storage;
+            this.storage = allocator.make!Storage();
+            this.deleter = &separateDeleter!Payload;
+        }
+        else
+        {
+            // Created with refCounted. Always destroyed togethter with the pointer.
+            assert(this.storage.counter != 0);
+            finalize(this.storage.payload);
+            this.storage.payload = Payload.init;
+        }
+        move(rhs, this.storage.payload);
+        return this;
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(typeof(null))
+    {
+        if (this.storage is null)
+        {
+            return this;
+        }
+        else if (this.storage > 1)
+        {
+            --this.storage;
+            this.storage = null;
+        }
+        else
+        {
+            // Created with refCounted. Always destroyed togethter with the pointer.
+            assert(this.storage.counter != 0);
+            finalize(this.storage.payload);
+            this.storage.payload = Payload.init;
+        }
+        return this;
+    }
+
+    /// Ditto.
+    ref typeof(this) opAssign(typeof(this) rhs)
+    {
+        swap(this.allocator_, rhs.allocator_);
+        swap(this.storage, rhs.storage);
+        swap(this.deleter, rhs.deleter);
+        return this;
+    }
+
+    /**
+     * Returns: Reference to the owned object.
+     */
+    inout(Payload) get() inout pure nothrow @safe @nogc
+    in
+    {
+        assert(count > 0, "Attempted to access an uninitialized reference.");
+    }
+    body
+    {
+        return storage.payload;
+    }
+
+    static if (isPointer!Payload)
+    {
+        /**
+         * Params:
+         *  op = Operation. 
+         *
+         * Dereferences the pointer. It is defined only for pointers, not for
+         * reference types like classes, that can be accessed directly.
+         *
+         * Returns: Reference to the pointed value.
+         */
+        ref T opUnary(string op)()
+            if (op == "*")
+        {
+            return *storage.payload;
+        }
+    }
+
+    /**
+     * Returns: Whether this $(D_PSYMBOL RefCounted) already has an internal 
+     *          storage.
+     */
+    @property bool isInitialized() const
+    {
+        return storage !is null;
+    }
+
+    /**
+     * Returns: The number of $(D_PSYMBOL RefCounted) instances that share
+     *          ownership over the same pointer (including $(D_KEYWORD this)).
+     *          If this $(D_PSYMBOL RefCounted) isn't initialized, returns `0`.
+     */
+    @property size_t count() const
+    {
+        return storage is null ? 0 : storage.counter;
+    }
+
+    mixin DefaultAllocator;
+    alias get this;
+}
+
+///
+unittest
+{
+    auto rc = RefCounted!int(defaultAllocator.make!int(5), defaultAllocator);
+    auto val = rc.get;
+
+    *val = 8;
+    assert(*rc.storage.payload == 8);
+
+    val = null;
+    assert(rc.storage.payload !is null);
+    assert(*rc.storage.payload == 8);
+
+    *rc = 9;
+    assert(*rc.storage.payload == 9);
+}
+
+version (unittest)
+{
+    private class A
+    {
+        uint *destroyed;
+
+        this(ref uint destroyed) @nogc
+        {
+            this.destroyed = &destroyed;
+        }
+
+        ~this() @nogc
+        {
+            ++(*destroyed);
+        }
+    }
+
+    private struct B
+    {
+        int prop;
+        @disable this();
+        this(int param1) @nogc
+        {
+            prop = param1;
+        }
+    }
+}
+
+private unittest
+{
+    uint destroyed;
+    auto a = defaultAllocator.make!A(destroyed);
+
+    assert(destroyed == 0);
+    {
+        auto rc = RefCounted!A(a, defaultAllocator);
+        assert(rc.count == 1);
+
+        void func(RefCounted!A rc)
+        {
+            assert(rc.count == 2);
+        }
+        func(rc);
+
+        assert(rc.count == 1);
+    }
+    assert(destroyed == 1);
+
+    RefCounted!int rc;
+    assert(rc.count == 0);
+    rc = defaultAllocator.make!int(8);
+    assert(rc.count == 1);
+}
+
+private unittest
+{
+    static assert(is(typeof(RefCounted!int.storage.payload) == int*));
+    static assert(is(typeof(RefCounted!A.storage.payload) == A));
+
+    static assert(is(RefCounted!B));
+    static assert(is(RefCounted!A));
+}
+
+/**
+ * Constructs a new object of type $(D_PARAM T) and wraps it in a
+ * $(D_PSYMBOL RefCounted) using $(D_PARAM args) as the parameter list for
+ * the constructor of $(D_PARAM T).
+ *
+ * This function is more efficient than the using of $(D_PSYMBOL RefCounted)
+ * directly, since it allocates only ones (the internal storage and the
+ * object).
+ *
+ * Params:
+ *  T         = Type of the constructed object.
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = Allocator.
+ *  args      = Constructor arguments of $(D_PARAM T).
+ * 
+ * Returns: Newly created $(D_PSYMBOL RefCounted!T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null)
+ */
+RefCounted!T refCounted(T, A...)(shared Allocator allocator, auto ref A args)
+    if (!is(T == interface) && !isAbstractClass!T
+     && !isAssociativeArray!T && !isArray!T)
+in
+{
+    assert(allocator !is null);
+}
+body
+{
+    auto rc = typeof(return)(allocator);
+
+    const storageSize = alignedSize(stateSize!(RefCounted!T.Storage));
+    const size = alignedSize(stateSize!T + storageSize);
+
+    auto mem = (() @trusted => allocator.allocate(size))();
+    if (mem is null)
+    {
+        onOutOfMemoryError();
+    }
+    scope (failure)
+    {
+        () @trusted { allocator.deallocate(mem); }();
+    }
+    rc.storage = emplace!((RefCounted!T.Storage))(mem[0 .. storageSize]);
+
+    static if (is(T == class))
+    {
+        rc.storage.payload = emplace!T(mem[storageSize .. $], args);
+    }
+    else
+    {
+        auto ptr = (() @trusted => (cast(T*) mem[storageSize .. $].ptr))();
+        rc.storage.payload = emplace!T(ptr, args);
+    }
+    rc.deleter = &unifiedDeleter!(RefCounted!T.Payload);
+    return rc;
+}
+
+/**
+ * Constructs a new array with $(D_PARAM size) elements and wraps it in a
+ * $(D_PSYMBOL RefCounted) using.
+ *
+ * Params:
+ *  T         = Array type.
+ *  size      = Array size.
+ *  allocator = Allocator.
+ *
+ * Returns: Newly created $(D_PSYMBOL RefCounted!T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null
+ *                           && size <= size_t.max / ElementType!T.sizeof)
+ */
+ RefCounted!T refCounted(T)(shared Allocator allocator, const size_t size)
+    if (isArray!T)
+in
+{
+    assert(allocator !is null);
+    assert(size <= size_t.max / ElementType!T.sizeof);
+}
+body
+{
+    auto payload = cast(T) allocator.allocate(ElementType!T.sizeof * size);
+    initializeAll(payload);
+    return RefCounted!T(payload, allocator);
+}
+
+///
+unittest
+{
+    auto rc = defaultAllocator.refCounted!int(5);
+    assert(rc.count == 1);
+
+    void func(RefCounted!int param)
+    {
+        if (param.count == 2)
+        {
+            func(param);
+        }
+        else
+        {
+            assert(param.count == 3);
+        }
+    }
+    func(rc);
+
+    assert(rc.count == 1);
+}
+
+private @nogc unittest
+{
+    struct E
+    {
+    }
+    auto b = defaultAllocator.refCounted!B(15);
+    static assert(is(typeof(b.storage.payload) == B*));
+    static assert(is(typeof(b.prop) == int));
+    static assert(!is(typeof(defaultAllocator.refCounted!B())));
+
+    static assert(is(typeof(defaultAllocator.refCounted!E())));
+    static assert(!is(typeof(defaultAllocator.refCounted!E(5))));
+    {
+        auto rc = defaultAllocator.refCounted!B(3);
+        assert(rc.get.prop == 3);
+    }
+    {
+        auto rc = defaultAllocator.refCounted!E();
+        assert(rc.count);
+    }
+}
+
+private @nogc unittest
+{
+    auto rc = defaultAllocator.refCounted!(int[])(5);
+    assert(rc.length == 5);
+}

source/tanya/network/inet.d

@@ -0,0 +1,356 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Internet utilities.
+ *
+ * Copyright: Eugene Wissner 2016-2017.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ */
+module tanya.network.inet;
+
+import std.math;
+import std.range.primitives;
+import std.traits;
+
+version (unittest)
+{
+    version (Windows)
+    {
+        import core.sys.windows.winsock2;
+        version = PlattformUnittest;
+    }
+    else version (Posix)
+    {
+        import core.sys.posix.arpa.inet;
+        version = PlattformUnittest;
+    }
+}
+
+/**
+ * Represents an unsigned integer as an $(D_KEYWORD ubyte) range.
+ *
+ * The range is bidirectional. The byte order is always big-endian.
+ *
+ * It can accept any unsigned integral type but the value should fit
+ * in $(D_PARAM L) bytes.
+ *
+ * Params:
+ *  L = Desired range length.
+ */
+struct NetworkOrder(uint L)
+    if (L > ubyte.sizeof && L <= ulong.sizeof)
+{
+    static if (L > uint.sizeof)
+    {
+        private alias StorageType = ulong;
+    }
+    else static if (L > ushort.sizeof)
+    {
+        private alias StorageType = uint;
+    }
+    else static if (L > ubyte.sizeof)
+    {
+        private alias StorageType = ushort;
+    }
+    else
+    {
+        private alias StorageType = ubyte;
+    }
+
+    private StorageType value;
+    private size_t size = L;
+
+    const pure nothrow @safe @nogc invariant
+    {
+        assert(this.size <= L);
+    }
+
+    /**
+     * Constructs a new range.
+     *
+     * $(D_PARAM T) can be any unsigned type but $(D_PARAM value) cannot be
+     * larger than the maximum can be stored in $(D_PARAM L) bytes. Otherwise
+     * an assertion failure will be caused.
+     *
+     * Params:
+     *  T      = Value type.
+     *  value  = The value should be represented by this range.
+     *
+     * Precondition: $(D_INLINECODE value <= 2 ^^ (length * 8) - 1).
+     */
+    this(T)(const T value)
+        if (isUnsigned!T)
+    in
+    {
+        assert(value <= pow(2, L * 8) - 1);
+    }
+    body
+    {
+        this.value = value & StorageType.max;
+    }
+
+    /**
+     * Returns: LSB.
+     *
+     * Precondition: $(D_INLINECODE length > 0).
+     */
+    @property ubyte back() const
+    in
+    {
+        assert(this.length > 0);
+    }
+    body
+    {
+        return this.value & 0xff;
+    }
+
+    /**
+     * Returns: MSB.
+     *
+     * Precondition: $(D_INLINECODE length > 0).
+     */
+    @property ubyte front() const
+    in
+    {
+        assert(this.length > 0);
+    }
+    body
+    {
+        return (this.value >> ((this.length - 1) * 8)) & 0xff;
+    }
+
+    /**
+     * Eliminates the LSB.
+     *
+     * Precondition: $(D_INLINECODE length > 0).
+     */
+    void popBack()
+    in
+    {
+        assert(this.length > 0);
+    }
+    body
+    {
+        this.value >>= 8;
+        --this.size;
+    }
+
+    /**
+     * Eliminates the MSB.
+     *
+     * Precondition: $(D_INLINECODE length > 0).
+     */
+    void popFront()
+    in
+    {
+        assert(this.length > 0);
+    }
+    body
+    {
+        this.value &= StorageType.max >> ((StorageType.sizeof - this.length) * 8);
+        --this.size;
+    }
+
+    /**
+     * Returns: Copy of this range.
+     */
+    typeof(this) save() const
+    {
+        return this;
+    }
+
+    /**
+     * Returns: Whether the range is empty.
+     */
+    @property bool empty() const
+    {
+        return this.length == 0;
+    }
+
+    /**
+     * Returns: Byte length.
+     */
+    @property size_t length() const
+    {
+        return this.size;
+    }
+}
+
+///
+pure nothrow @safe @nogc unittest
+{
+    auto networkOrder = NetworkOrder!3(0xae34e2u);
+    assert(!networkOrder.empty);
+    assert(networkOrder.front == 0xae);
+
+    networkOrder.popFront();
+    assert(networkOrder.length == 2);
+    assert(networkOrder.front == 0x34);
+    assert(networkOrder.back == 0xe2);
+
+    networkOrder.popBack();
+    assert(networkOrder.length == 1);
+    assert(networkOrder.front == 0x34);
+    assert(networkOrder.front == 0x34);
+
+    networkOrder.popFront();
+    assert(networkOrder.empty);
+}
+
+// Static.
+private unittest
+{
+    static assert(isBidirectionalRange!(NetworkOrder!4));
+    static assert(isBidirectionalRange!(NetworkOrder!8));
+    static assert(!is(NetworkOrder!9));
+    static assert(!is(NetworkOrder!1));
+}
+
+// Tests against the system's htonl, htons.
+version (PlattformUnittest)
+{
+    private unittest
+    {
+        for (uint counter; counter <= 8 * uint.sizeof; ++counter)
+        {
+            const value = pow(2, counter) - 1;
+            const inNetworkOrder = htonl(value);
+            const p = cast(ubyte*) &inNetworkOrder;
+            auto networkOrder = NetworkOrder!4(value);
+
+            assert(networkOrder.length == 4);
+            assert(!networkOrder.empty);
+            assert(networkOrder.front == *p);
+            assert(networkOrder.back == *(p + 3));
+
+            networkOrder.popBack();
+            assert(networkOrder.length == 3);
+            assert(networkOrder.front == *p);
+            assert(networkOrder.back == *(p + 2));
+
+            networkOrder.popFront();
+            assert(networkOrder.length == 2);
+            assert(networkOrder.front == *(p + 1));
+            assert(networkOrder.back == *(p + 2));
+
+            networkOrder.popFront();
+            assert(networkOrder.length == 1);
+            assert(networkOrder.front == *(p + 2));
+            assert(networkOrder.back == *(p + 2));
+
+            networkOrder.popBack();
+            assert(networkOrder.length == 0);
+            assert(networkOrder.empty);
+        }
+
+        for (ushort counter; counter <= 8 * ushort.sizeof; ++counter)
+        {
+            const value = cast(ushort) (pow(2, counter) - 1);
+            const inNetworkOrder = htons(value);
+            const p = cast(ubyte*) &inNetworkOrder;
+
+            auto networkOrder = NetworkOrder!2(value);
+
+            assert(networkOrder.length == 2);
+            assert(!networkOrder.empty);
+            assert(networkOrder.front == *p);
+            assert(networkOrder.back == *(p + 1));
+
+            networkOrder.popBack();
+            assert(networkOrder.length == 1);
+            assert(networkOrder.front == *p);
+            assert(networkOrder.back == *p);
+
+            networkOrder.popBack();
+            assert(networkOrder.length == 0);
+            assert(networkOrder.empty);
+
+            networkOrder = NetworkOrder!2(value);
+
+            networkOrder.popFront();
+            assert(networkOrder.length == 1);
+            assert(networkOrder.front == *(p + 1));
+            assert(networkOrder.back == *(p + 1));
+
+            networkOrder.popFront();
+            assert(networkOrder.length == 0);
+            assert(networkOrder.empty);
+        }
+    }
+}
+
+/**
+ * Converts the $(D_KEYWORD ubyte) input range $(D_PARAM range) to
+ * $(D_PARAM T).
+ *
+ * The byte order of $(D_PARAM r) is assumed to be big-endian. The length
+ * cannot be larger than $(D_INLINECODE T.sizeof). Otherwise an assertion
+ * failure will be caused.
+ *
+ * Params:
+ *  T     = Desired return type.
+ *  R     = Range type.
+ *  range = Input range.
+ *
+ * Returns: Integral representation of $(D_PARAM range) with the host byte
+ *          order.
+ */
+T toHostOrder(T = size_t, R)(R range)
+    if (isInputRange!R
+     && !isInfinite!R
+     && is(Unqual!(ElementType!R) == ubyte)
+     && isUnsigned!T)
+{
+    T ret;
+    ushort pos = T.sizeof * 8;
+
+    for (; !range.empty && range.front == 0; pos -= 8, range.popFront())
+    {
+    }
+    for (; !range.empty; range.popFront())
+    {
+        assert(pos != 0);
+        pos -= 8;
+        ret |= (cast(T) range.front) << pos;
+    }
+
+    return ret >> pos;
+}
+
+///
+pure nothrow @safe @nogc unittest
+{
+    const value = 0xae34e2u;
+    auto networkOrder = NetworkOrder!4(value);
+    assert(networkOrder.toHostOrder() == value);
+}
+
+// Tests against the system's htonl, htons.
+version (PlattformUnittest)
+{
+    private unittest
+    {
+        for (uint counter; counter <= 8 * uint.sizeof; ++counter)
+        {
+            const value = pow(2, counter) - 1;
+            const inNetworkOrder = htonl(value);
+            const p = cast(ubyte*) &inNetworkOrder;
+            auto networkOrder = NetworkOrder!4(value);
+
+            assert(p[0 .. uint.sizeof].toHostOrder() == value);
+        }
+        for (ushort counter; counter <= 8 * ushort.sizeof; ++counter)
+        {
+            const value = cast(ushort) (pow(2, counter) - 1);
+            const inNetworkOrder = htons(value);
+            const p = cast(ubyte*) &inNetworkOrder;
+            auto networkOrder = NetworkOrder!2(value);
+
+            assert(p[0 .. ushort.sizeof].toHostOrder() == value);
+        }
+    }
+}

source/tanya/network/package.d

@@ -3,16 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Network programming.
+ *
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
-module tanya.crypto;
+module tanya.network;
 
-public
-{
-    import tanya.crypto.des;
-    import tanya.crypto.mode;
-    import tanya.crypto.symmetric;
-}
+public import tanya.network.inet;
+public import tanya.network.socket;
+public import tanya.network.url;

source/tanya/network/socket.d

@@ -3,10 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * Copyright: Eugene Wissner 2016.
+ * Socket programming.
+ *
+ * Copyright: Eugene Wissner 2016-2017.
  * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
  *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */
 module tanya.network.socket;
 
@@ -15,9 +17,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;
 
@@ -154,6 +155,23 @@ else version (Windows)
                     DWORD lpFlags,
                     LPOVERLAPPED lpOverlapped,
                     LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
+        int WSAIoctl(SOCKET s,
+                     uint dwIoControlCode,
+                     void* lpvInBuffer,
+                     uint cbInBuffer,
+                     void* lpvOutBuffer,
+                     uint cbOutBuffer,
+                     uint* lpcbBytesReturned,
+                     LPWSAOVERLAPPED lpOverlapped,
+                     LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
+        alias LPFN_ACCEPTEX = BOOL function(SOCKET,
+                                            SOCKET,
+                                            PVOID,
+                                            DWORD,
+                                            DWORD,
+                                            DWORD,
+                                            LPDWORD,
+                                            LPOVERLAPPED);
     }
     alias WSASocket = WSASocketW;
 
@@ -213,7 +231,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,13 +251,13 @@ 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;
 
             overlapped.handle = cast(HANDLE) handle_;
             overlapped.event = OverlappedSocketEvent.read;
-            overlapped.buffer.len = buffer.length;
+            overlapped.buffer.len = cast(ULONG) buffer.length;
             overlapped.buffer.buf = cast(char*) buffer.ptr;
 
             auto result = WSARecv(handle_,
@@ -267,7 +285,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,11 +324,11 @@ 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;
-            overlapped.buffer.len = buffer.length;
+            overlapped.buffer.len = cast(ULONG) buffer.length;
             overlapped.buffer.buf = cast(char*) buffer.ptr;
 
             auto result = WSASend(handle_,
@@ -339,7 +357,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 +391,7 @@ else version (Windows)
          *
          * Throws: $(D_PSYMBOL SocketException) on errors.
          */
-        this(AddressFamily af) @trusted
+        this(AddressFamily af) @nogc @trusted
         {
             super(af);
             scope (failure)
@@ -396,7 +414,8 @@ else version (Windows)
                                    NULL);
             if (!result == SOCKET_ERROR)
             {
-                throw defaultAllocator.make!SocketException("Unable to retrieve an accept extension function pointer");
+                throw make!SocketException(defaultAllocator,
+                                           "Unable to retrieve an accept extension function pointer");
             }
         }
 
@@ -411,7 +430,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)
@@ -425,8 +444,10 @@ else version (Windows)
             DWORD dwBytes;
             overlapped.handle = cast(HANDLE) socket;
             overlapped.event = OverlappedSocketEvent.accept;
-            overlapped.buffer.len = (sockaddr_in.sizeof + 16) * 2;
-            overlapped.buffer.buf = defaultAllocator.makeArray!char(overlapped.buffer.len).ptr;
+
+            immutable len = (sockaddr_in.sizeof + 16) * 2;
+            overlapped.buffer.len = len;
+            overlapped.buffer.buf = cast(char*) defaultAllocator.allocate(len).ptr;
 
             // We don't want to get any data now, but only start to accept the connections
             BOOL result = acceptExtension(handle_,
@@ -455,13 +476,14 @@ else version (Windows)
          *
          * Throws: $(D_PSYMBOL SocketException) if unable to accept.
          */
-        OverlappedConnectedSocket endAccept(SocketState overlapped) @trusted
+        OverlappedConnectedSocket endAccept(SocketState overlapped) @nogc @trusted
         {
             scope (exit)
             {
-                defaultAllocator.dispose(overlapped.buffer.buf[0..overlapped.buffer.len]);
+                defaultAllocator.dispose(overlapped.buffer.buf[0 .. overlapped.buffer.len]);
             }
-            auto socket = defaultAllocator.make!OverlappedConnectedSocket(cast(socket_t) overlapped.handle,
+            auto socket = make!OverlappedConnectedSocket(defaultAllocator,
+                                                         cast(socket_t) overlapped.handle,
                                                          addressFamily);
             scope (failure)
             {
@@ -663,7 +685,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);
@@ -693,7 +715,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);
@@ -728,7 +750,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_,
@@ -743,19 +767,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.
@@ -784,12 +814,13 @@ abstract class Socket
      * Params:
      *  level  = Protocol level at that the option exists.
      *  option = Option.
-     *     result = Option value.
+     *  value  = Option value.
      *
      * 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,
@@ -802,19 +833,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)
         {
@@ -852,7 +886,7 @@ abstract class Socket
      * Params:
      *  yes = Socket's blocking flag.
      */
-    @property void blocking(bool yes)
+    @property void blocking(bool yes) @nogc
     {
         version (Posix)
         {
@@ -865,7 +899,8 @@ abstract class Socket
             }
             if (fl == SOCKET_ERROR)
             {
-                throw defaultAllocator.make!SocketException("Unable to set socket blocking");
+                throw make!SocketException(defaultAllocator,
+                                           "Unable to set socket blocking");
             }
         }
         else version (Windows)
@@ -873,7 +908,8 @@ abstract class Socket
             uint num = !yes;
             if (ioctlsocket(handle_, FIONBIO, &num) == SOCKET_ERROR)
             {
-                throw defaultAllocator.make!SocketException("Unable to set socket blocking");
+                throw make!SocketException(defaultAllocator,
+                                           "Unable to set socket blocking");
             }
             blocking_ = yes;
         }
@@ -938,7 +974,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)
         {
@@ -970,10 +1006,14 @@ interface ConnectionOrientedSocket
      */
     enum Flag : int
     {
-        none      = 0,             /// No flags specified
-        outOfBand = MSG_OOB,       /// Out-of-band stream data
-        peek      = MSG_PEEK,      /// Peek at incoming data without removing it from the queue, only for receiving
-        dontRoute = MSG_DONTROUTE, /// Data should not be subject to routing; this flag may be ignored. Only for sending
+        /// No flags specified.
+        none      = 0,
+        /// Out-of-band stream data.
+        outOfBand = MSG_OOB,
+        /// Peek at incoming data without removing it from the queue, only for receiving.
+        peek      = MSG_PEEK,
+        /// Data should not be subject to routing; this flag may be ignored. Only for sending.
+        dontRoute = MSG_DONTROUTE,
     }
 
     alias Flags = BitFlags!Flag;
@@ -987,7 +1027,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)
@@ -1005,7 +1045,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)
         {
@@ -1024,7 +1064,7 @@ class StreamSocket : Socket, ConnectionOrientedSocket
      *
      * Throws: $(D_PSYMBOL SocketException) if unable to accept.
      */
-    ConnectedSocket accept() @trusted
+    ConnectedSocket accept() @trusted @nogc
     {
         socket_t sock;
 
@@ -1048,7 +1088,8 @@ class StreamSocket : Socket, ConnectionOrientedSocket
             {
                 return null;
             }
-            throw defaultAllocator.make!SocketException("Unable to accept socket connection");
+            throw make!SocketException(defaultAllocator,
+                                       "Unable to accept socket connection");
         }
 
         auto newSocket = defaultAllocator.make!ConnectedSocket(sock, addressFamily);
@@ -1106,7 +1147,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);
     }
@@ -1142,7 +1183,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)
@@ -1180,7 +1221,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;
@@ -1238,22 +1280,23 @@ 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 defaultAllocator.make!AddressException("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;
 
         // Make C-string from host.
-        char[] node = defaultAllocator.makeArray!char(host.length + 1);
+        auto node = cast(char[]) allocator.allocate(host.length + 1);
         node[0.. $ - 1] = host;
         node[$ - 1] = '\0';
         scope (exit)
         {
-            defaultAllocator.dispose(node);
+            allocator.deallocate(node);
         }
 
         // Convert port to a C-string.
@@ -1278,7 +1321,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)
         {
@@ -1292,7 +1335,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");
         }
     }
 
@@ -1352,7 +1395,8 @@ bool wouldHaveBlocked() nothrow @trusted @nogc
     }
     else version (Windows)
     {
-        return WSAGetLastError() == ERROR_IO_PENDING || WSAGetLastError() == EWOULDBLOCK
+        return WSAGetLastError() == ERROR_IO_PENDING
+            || WSAGetLastError() == EWOULDBLOCK
             || WSAGetLastError() == ERROR_IO_INCOMPLETE;
     }
 }

source/tanya/random.d

@@ -1,318 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2016.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
- */  
-module tanya.random;
-
-import tanya.memory;
-import std.digest.sha;
-import std.typecons;
-
-/// Block size of entropy accumulator (SHA-512).
-enum blockSize = 64;
-
-/// Maximum amount gathered from the entropy sources.
-enum maxGather = 128;
-
-/**
- * Exception thrown if random number generating fails.
- */
-class EntropyException : Exception
-{
-	/**
-	 * Params:
-	 * 	msg  = Message to output.
-	 * 	file = The file where the exception occurred.
-	 * 	line = The line number where the exception occurred.
-	 * 	next = The previous exception in the chain of exceptions, if any.
-	 */
-	this(string msg,
-	     string file = __FILE__,
-	     size_t line = __LINE__,
-	     Throwable next = null) pure @safe nothrow const @nogc
-	{
-		super(msg, file, line, next);
-	}
-}
-
-/**
- * Interface for implementing entropy sources.
- */
-abstract class EntropySource
-{
-	/// Amount of already generated entropy.
-	protected ushort size_;
-
-	/**
-	 * Returns: Minimum bytes required from the entropy source.
-	 */
-	@property immutable(ubyte) threshold() const @safe pure nothrow;
-
-	/**
-	 * Returns: Whether this entropy source is strong.
-	 */
-	@property immutable(bool) strong() const @safe pure nothrow;
-
-	/**
-	 * Returns: Amount of already generated entropy.
-	 */
-	@property ushort size() const @safe pure nothrow
-	{
-		return size_;
-	}
-
-	/**
-	 * Params:
-	 * 	size = Amount of already generated entropy. Cannot be smaller than the
-	 * 	       already set value.
-	 */
-	@property void size(ushort size) @safe pure nothrow
-	{
-		size_ = size;
-	}
-
-	/**
-	 * Poll the entropy source.
-	 *
-	 * Params:
-	 * 	output = Buffer to save the generate random sequence (the method will
-	 * 	         to fill the buffer).
-	 *
-	 * Returns: Number of bytes that were copied to the $(D_PARAM output)
-	 *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
-	 */
-	Nullable!ubyte poll(out ubyte[maxGather] output);
-}
-
-version (linux)
-{
-	extern (C) long syscall(long number, ...) nothrow;
-
-	/**
-	 * Uses getrandom system call.
-	 */
-	class PlatformEntropySource : EntropySource
-	{
-		/**
-		 * Returns: Minimum bytes required from the entropy source.
-		 */
-		override @property immutable(ubyte) threshold() const @safe pure nothrow
-		{
-			return 32;
-		}
-
-		/**
-		 * Returns: Whether this entropy source is strong.
-		 */
-		override @property immutable(bool) strong() const @safe pure nothrow
-		{
-			return true;
-		}
-
-		/**
-		 * Poll the entropy source.
-		 *
-		 * Params:
-		 * 	output = Buffer to save the generate random sequence (the method will
-		 * 	         to fill the buffer).
-		 *
-		 * Returns: Number of bytes that were copied to the $(D_PARAM output)
-		 *          or $(D_PSYMBOL Nullable!ubyte.init) on error.
-		 */
-		override Nullable!ubyte poll(out ubyte[maxGather] output) nothrow
-		out (length)
-		{
-			assert(length <= maxGather);
-		}
-		body
-		{
-			// int getrandom(void *buf, size_t buflen, unsigned int flags);
-			auto length = syscall(318, output.ptr, output.length, 0);
-			Nullable!ubyte ret;
-
-			if (length >= 0)
-			{
-				ret = cast(ubyte) length;
-			}
-			return ret;
-		}
-	}
-}
-
-/**
- * Pseudorandom number generator.
- * ---
- * auto entropy = defaultAllocator.make!Entropy;
- *
- * ubyte[blockSize] output;
- *
- * output = entropy.random;
- *
- * defaultAllocator.finalize(entropy);
- * ---
- */
-class Entropy
-{
-	/// Entropy sources.
-	protected EntropySource[] sources;
-
-	private ubyte sourceCount_;
-
-	private shared Allocator allocator;
-
-	/// Entropy accumulator.
-	protected SHA!(maxGather * 8, 512) accumulator;
-
-	/**
-	 * Params:
-	 *  maxSources = Maximum amount of entropy sources can be set.
-	 * 	allocator  = Allocator to allocate entropy sources available on the
-	 * 	             system.
-	 */
-	this(size_t maxSources = 20, shared Allocator allocator = defaultAllocator)
-	in
-	{
-		assert(maxSources > 0 && maxSources <= ubyte.max);
-		assert(allocator !is null);
-	}
-	body
-	{
-		allocator.resizeArray(sources, maxSources);
-
-		version (linux)
-		{
-			this ~= allocator.make!PlatformEntropySource;
-		}
-	}
-
-	/**
-	 * Returns: Amount of the registered entropy sources.
-	 */
-	@property ubyte sourceCount() const @safe pure nothrow
-	{
-		return sourceCount_;
-	}
-
-	/**
-	 * Add an entropy source.
-	 *
-	 * Params:
-	 * 	source = Entropy source.
-	 *
-	 * Returns: $(D_PSYMBOL this).
-	 *
-	 * See_Also:
-	 * 	$(D_PSYMBOL EntropySource)
-	 */
-	Entropy opOpAssign(string Op)(EntropySource source) @safe pure nothrow
-		if (Op == "~")
-	in
-	{
-		assert(sourceCount_ <= sources.length);
-	}
-	body
-	{
-		sources[sourceCount_++] = source;
-		return this;
-	}
-
-	/**
-	 * Returns: Generated random sequence.
-	 *
-	 * Throws: $(D_PSYMBOL EntropyException) if no strong entropy source was
-	 *         registered or it failed.
-	 */
-	@property ubyte[blockSize] random()
-	in
-	{
-		assert(sourceCount_ > 0, "No entropy sources defined.");
-	}
-	body
-	{
-		bool haveStrong;
-		ushort done;
-		ubyte[blockSize] output;
-
-		do
-		{
-			ubyte[maxGather] buffer;
-
-			// Run through our entropy sources
-			for (ubyte i; i < sourceCount; ++i)
-			{
-				auto outputLength = sources[i].poll(buffer);
-
-				if (!outputLength.isNull)
-				{
-					if (outputLength > 0)
-					{
-						update(i, buffer, outputLength);
-						sources[i].size = cast(ushort) (sources[i].size + outputLength);
-					}
-					if (sources[i].size < sources[i].threshold)
-					{
-						continue;
-					}
-					else if (sources[i].strong)
-					{
-						haveStrong = true;
-					}
-				}
-				done = 257;
-			}
-		}
-		while (++done < 256);
-
-		if (!haveStrong)
-		{
-			throw allocator.make!EntropyException("No strong entropy source defined.");
-		}
-
-		output = accumulator.finish();
-
-		// Reset accumulator and counters and recycle existing entropy
-		accumulator.start();
-
-		// Perform second SHA-512 on entropy
-		output = sha512Of(output);
-
-		for (ubyte i = 0; i < sourceCount; ++i)
-		{
-			sources[i].size = 0;
-		}
-		return output;
-	}
-
-	/**
-	 * Update entropy accumulator.
-	 *
-	 * Params:
-	 * 	sourceId = Entropy source index in $(D_PSYMBOL sources).
-	 * 	data     = Data got from the entropy source.
-	 * 	length   = Length of the received data.
-	 */
-	protected void update(in ubyte sourceId,
-	                      ref ubyte[maxGather] data,
-	                      ubyte length) @safe pure nothrow
-	{
-		ubyte[2] header;
-
-		if (length > blockSize)
-		{
-			data[0..64] = sha512Of(data);
-			length = blockSize;
-		}
-
-		header[0] = sourceId;
-		header[1] = length;
-
-		accumulator.put(header);
-		accumulator.put(data[0..length]);
-	}
-}