Fix socket build on Windows

.gitignore

@@ -4,3 +4,4 @@
 # D
 .dub
 __test__*__
+__test__*__.core

.travis.yml

@@ -0,0 +1,16 @@
+sudo: false
+
+os:
+ - linux
+
+language: d
+
+d:
+ - dmd-2.072.1
+
+env: 
+ matrix:
+  - ARCH=x86_64
+
+script:
+ - dub test --arch=$ARCH

README.md

@@ -1,4 +1,68 @@
-# tanya
+# Tanya
 
-tanya's mission is to provide a GC-free, general purpose library for D
-programming language for developing servers.
+[![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)
+[![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 that doesn't
+rely on the Garbage Collector.
+
+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.
+
+## Overview
+
+Tanya consists of the following packages:
+
+* `async`: Event loop.
+* `container`: Queue, Vector, Singly linked list.
+* `crypto`: Work in progress TLS implementation.
+* `math`: Multiple precision integer and a set of functions.
+* `memory`: Tools for manual memory management (allocator, reference counting, helper functions).
+* `network`: URL-Parsing, sockets.
+
+### Current status
+
+The library is currently under development, but some parts of it can already be
+used.
+
+Containers were newly reworked and the API won't change significantly, but will
+be only extended. The same is true for the `memory` package.
+
+`network` and `async` packages should be reviewed in the future and the API may
+change.
+
+`math` package contains an arbitrary precision integer implementation that has
+a stable API (that mostly consists of operator overloads), but still needs
+testing and work on its performance.
+
+I'm currently mostly working on `crypto` that is not a complete cryptographic
+suite, but contains (will contain) algorithm implementations required by TLS.
+
+### Other properties
+
+* Tanya is a native D library (only D and Assembler are tolerated).
+
+* It is important for me to document the code and attach at least a few unit
+tests where possible. So the documentation and usage examples can be found in
+the source code.
+
+* Tanya is mostly tested on a 64-bit Linux and some features are
+platform-dependant, but not because it is a Linux-only library. Therefore any
+help to bring better support for Windows and BSD systems would be accepted.
+
+* The library isn't thread-safe. Thread-safity should be added later.
+
+* I'm working with the latest dmd version, but will be looking to support other
+D compilers and keep compatibility with the elder dmd versions in the future.
+
+## 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.

source/tanya/async/event/epoll.d

@@ -26,153 +26,162 @@ import core.sys.posix.unistd;
 import core.time;
 import std.algorithm.comparison;
 
+extern (C) nothrow @nogc
+{
+	int epoll_create1(int flags);
+	int epoll_ctl (int epfd, int op, int fd, epoll_event *event);
+	int epoll_wait (int epfd, epoll_event *events, int maxevents, int timeout);
+}
+
 class EpollLoop : SelectorLoop
 {
-    protected int fd;
-    private epoll_event[] events;
+	protected int fd;
+	private epoll_event[] events;
 
-    /**
-     * Initializes the loop.
-     */
-    this()
-    {
-        if ((fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
-        {
-            throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
-        }
-        super();
-        events = MmapPool.instance.makeArray!epoll_event(maxEvents);
-    }
+	/**
+	 * Initializes the loop.
+	 */
+	this() @nogc
+	{
+		if ((fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
+		{
+			throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
+		}
+		super();
+		MmapPool.instance.resizeArray(events, maxEvents);
+	}
 
-    /**
-     * Free loop internals.
-     */
-    ~this()
-    {
-        MmapPool.instance.dispose(events);
-        close(fd);
-    }
+	/**
+	 * Free loop internals.
+	 */
+	~this() @nogc
+	{
+		MmapPool.instance.dispose(events);
+		close(fd);
+	}
 
-    /**
-     * 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.
-     */
-    protected override bool reify(ConnectionWatcher watcher, EventMask oldEvents, EventMask events)
-    in
-    {
-        assert(watcher !is null);
-    }
-    body
-    {
-        int op = EPOLL_CTL_DEL;
-        epoll_event ev;
+	/**
+	 * 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.
+	 */
+	protected override bool reify(ConnectionWatcher watcher,
+	                              EventMask oldEvents,
+	                              EventMask events) @nogc
+	in
+	{
+		assert(watcher !is null);
+	}
+	body
+	{
+		int op = EPOLL_CTL_DEL;
+		epoll_event ev;
 
-        if (events == oldEvents)
-        {
-            return true;
-        }
-        if (events && oldEvents)
-        {
-            op = EPOLL_CTL_MOD;
-        }
-        else if (events && !oldEvents)
-        {
-            op = EPOLL_CTL_ADD;
-        }
+		if (events == oldEvents)
+		{
+			return true;
+		}
+		if (events && oldEvents)
+		{
+			op = EPOLL_CTL_MOD;
+		}
+		else if (events && !oldEvents)
+		{
+			op = EPOLL_CTL_ADD;
+		}
 
-        ev.data.fd = watcher.socket.handle;
-        ev.events = (events & (Event.read | Event.accept) ? EPOLLIN | EPOLLPRI : 0)
-                  | (events & Event.write ? EPOLLOUT : 0)
-                  | EPOLLET;
+		ev.data.fd = watcher.socket.handle;
+		ev.events = (events & (Event.read | Event.accept) ? EPOLLIN | EPOLLPRI : 0)
+				  | (events & Event.write ? EPOLLOUT : 0)
+				  | EPOLLET;
 
-        return epoll_ctl(fd, op, watcher.socket.handle, &ev) == 0;
-    }
+		return epoll_ctl(fd, op, watcher.socket.handle, &ev) == 0;
+	}
 
-    /**
-     * Does the actual polling.
-     */
-    protected override void poll()
-    {
-        // Don't block
-        immutable timeout = cast(immutable int) blockTime.total!"msecs";
-        auto eventCount = epoll_wait(fd, events.ptr, maxEvents, timeout);
+	/**
+	 * Does the actual polling.
+	 */
+	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);
 
-        if (eventCount < 0)
-        {
-            if (errno != EINTR)
-            {
-                throw theAllocator.make!BadLoopException();
-            }
-            return;
-        }
+		if (eventCount < 0)
+		{
+			if (errno != EINTR)
+			{
+				throw defaultAllocator.make!BadLoopException();
+			}
+			return;
+		}
 
-        for (auto i = 0; i < eventCount; ++i)
-        {
-            auto io = cast(IOWatcher) connections[events[i].data.fd];
+		for (auto i = 0; i < eventCount; ++i)
+		{
+			auto io = cast(IOWatcher) connections[events[i].data.fd];
 
-            if (io is null)
-            {
-                acceptConnections(connections[events[i].data.fd]);
-            }
-            else if (events[i].events & EPOLLERR)
-            {
-                kill(io, null);
-            }
-            else if (events[i].events & (EPOLLIN | EPOLLPRI | EPOLLHUP))
-            {
-                auto transport = cast(SelectorStreamTransport) io.transport;
-                assert(transport !is null);
+			if (io is null)
+			{
+				acceptConnections(connections[events[i].data.fd]);
+			}
+			else if (events[i].events & EPOLLERR)
+			{
+				kill(io, null);
+			}
+			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;
-                    }
-                    while (received);
-                }
-                catch (SocketException e)
-                {
-                    exception = e;
-                }
-                if (transport.socket.disconnected)
-                {
-                    kill(io, exception);
-                }
-                else if (io.output.length)
-                {
-                    swapPendings.insertBack(io);
-                }
-            }
-            else if (events[i].events & EPOLLOUT)
-            {
-                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;
+					}
+					while (received);
+				}
+				catch (SocketException e)
+				{
+					exception = e;
+				}
+				if (transport.socket.disconnected)
+				{
+					kill(io, exception);
+				}
+				else if (io.output.length)
+				{
+					swapPendings.insertBack(io);
+				}
+			}
+			else if (events[i].events & EPOLLOUT)
+			{
+				auto transport = cast(SelectorStreamTransport) io.transport;
+				assert(transport !is null);
 
-                transport.writeReady = true;
-                if (transport.input.length)
-                {
-                    feed(transport);
-                }
-            }
-        }
-    }
+				transport.writeReady = true;
+				if (transport.input.length)
+				{
+					feed(transport);
+				}
+			}
+		}
+	}
 
-    /**
-     * Returns: The blocking time.
-     */
-    override protected @property inout(Duration) blockTime()
-    inout @safe pure nothrow
-    {
-        return min(super.blockTime, 1.dur!"seconds");
-    }
+	/**
+	 * Returns: The blocking time.
+	 */
+	override protected @property inout(Duration) blockTime()
+	inout @safe pure nothrow
+	{
+		return min(super.blockTime, 1.dur!"seconds");
+	}
 }

source/tanya/async/event/iocp.d

@@ -28,267 +28,264 @@ import core.sys.windows.winsock2;
 
 class IOCPStreamTransport : StreamTransport
 {
-    private OverlappedConnectedSocket socket_;
+	private OverlappedConnectedSocket socket_;
 
-    private WriteBuffer input;
+	private WriteBuffer!ubyte input;
 
-    /**
-     * Creates new completion port transport.
-     * Params:
-     *     socket   = Socket.
-     */
-    this(OverlappedConnectedSocket socket)
-    in
-    {
-        assert(socket !is null);
-    }
-    body
-    {
-        socket_ = socket;
-        input = MmapPool.instance.make!WriteBuffer();
-    }
+	/**
+	 * Creates new completion port transport.
+	 * Params:
+	 * 	socket = Socket.
+	 */
+	this(OverlappedConnectedSocket socket) @nogc
+	in
+	{
+		assert(socket !is null);
+	}
+	body
+	{
+		socket_ = socket;
+		input = WriteBuffer!ubyte(8192, MmapPool.instance);
+	}
 
-    ~this()
-    {
-        MmapPool.instance.dispose(input);
-    }
+	@property inout(OverlappedConnectedSocket) socket()
+	inout pure nothrow @safe @nogc
+	{
+		return socket_;
+	}
 
-    @property inout(OverlappedConnectedSocket) socket() inout pure nothrow @safe @nogc
-    {
-        return socket_;
-    }
-
-    /**
-     * Write some data to the transport.
-     *
-     * Params:
-     *     data = Data to send.
-     */
-    void write(ubyte[] data)
-    {
-        immutable empty = input.length == 0;
-        input ~= data;
-        if (empty)
-        {
-            SocketState overlapped;
-            try
-            {
-                overlapped = MmapPool.instance.make!SocketState;
-                socket.beginSend(input[], overlapped);
-            }
-            catch (SocketException e)
-            {
-                MmapPool.instance.dispose(overlapped);
-                MmapPool.instance.dispose(e);
-            }
-        }
-    }
+	/**
+	 * Write some data to the transport.
+	 *
+	 * Params:
+	 * 	data = Data to send.
+	 */
+	void write(ubyte[] data) @nogc
+	{
+		immutable empty = input.length == 0;
+		input ~= data;
+		if (empty)
+		{
+			SocketState overlapped;
+			try
+			{
+				overlapped = MmapPool.instance.make!SocketState;
+				socket.beginSend(input[], overlapped);
+			}
+			catch (SocketException e)
+			{
+				MmapPool.instance.dispose(overlapped);
+				MmapPool.instance.dispose(e);
+			}
+		}
+	}
 }
 
 class IOCPLoop : Loop
 {
-    protected HANDLE completionPort;
+	protected HANDLE completionPort;
 
-    protected OVERLAPPED overlap;
+	protected OVERLAPPED overlap;
 
-    /**
-     * Initializes the loop.
-     */
-    this()
-    {
-        super();
+	/**
+	 * Initializes the loop.
+	 */
+	this() @nogc
+	{
+		super();
 
-        completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
-        if (!completionPort)
-        {
-            throw theAllocator.make!BadLoopException("Creating completion port failed");
-        }
-    }
+		completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
+		if (!completionPort)
+		{
+			throw make!BadLoopException(defaultAllocator,
+			                            "Creating completion port failed");
+		}
+	}
 
-    /**
-     * 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 protected bool reify(ConnectionWatcher watcher,
-                                  EventMask oldEvents,
-                                  EventMask events)
-    {
-        SocketState overlapped;
-        if (!(oldEvents & Event.accept) && (events & Event.accept))
-        {
-            auto socket = cast(OverlappedStreamSocket) watcher.socket;
-            assert(socket !is null);
+	/**
+	 * 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 protected bool reify(ConnectionWatcher watcher,
+								  EventMask oldEvents,
+								  EventMask events) @nogc
+	{
+		SocketState overlapped;
+		if (!(oldEvents & Event.accept) && (events & Event.accept))
+		{
+			auto socket = cast(OverlappedStreamSocket) watcher.socket;
+			assert(socket !is null);
 
-            if (CreateIoCompletionPort(cast(HANDLE) socket.handle,
-                                       completionPort,
-                                       cast(ULONG_PTR) (cast(void*) watcher),
-                                       0) !is completionPort)
-            {
-                return false;
-            }
+			if (CreateIoCompletionPort(cast(HANDLE) socket.handle,
+									   completionPort,
+									   cast(ULONG_PTR) (cast(void*) watcher),
+									   0) !is completionPort)
+			{
+				return false;
+			}
 
-            try
-            {
-                overlapped = MmapPool.instance.make!SocketState;
-                socket.beginAccept(overlapped);
-            }
-            catch (SocketException e)
-            {
-                MmapPool.instance.dispose(overlapped);
-                theAllocator.dispose(e);
-                return false;
-            }
-        }
-        if (!(oldEvents & Event.read) && (events & Event.read)
-            || !(oldEvents & Event.write) && (events & Event.write))
-        {
-            auto io = cast(IOWatcher) watcher;
-            assert(io !is null);
+			try
+			{
+				overlapped = MmapPool.instance.make!SocketState;
+				socket.beginAccept(overlapped);
+			}
+			catch (SocketException e)
+			{
+				MmapPool.instance.dispose(overlapped);
+				defaultAllocator.dispose(e);
+				return false;
+			}
+		}
+		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;
-            assert(transport !is null);
+			auto transport = cast(IOCPStreamTransport) io.transport;
+			assert(transport !is null);
 
-            if (CreateIoCompletionPort(cast(HANDLE) transport.socket.handle,
-                                       completionPort,
-                                       cast(ULONG_PTR) (cast(void*) watcher),
-                                       0) !is completionPort)
-            {
-                return false;
-            }
+			if (CreateIoCompletionPort(cast(HANDLE) transport.socket.handle,
+									   completionPort,
+									   cast(ULONG_PTR) (cast(void*) watcher),
+									   0) !is completionPort)
+			{
+				return false;
+			}
 
-            // Begin to read
-            if (!(oldEvents & Event.read) && (events & Event.read))
-            {
-                try
-                {
-                    overlapped = MmapPool.instance.make!SocketState;
-                    transport.socket.beginReceive(io.output[], overlapped);
-                }
-                catch (SocketException e)
-                {
-                    MmapPool.instance.dispose(overlapped);
-                    theAllocator.dispose(e);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
+			// Begin to read
+			if (!(oldEvents & Event.read) && (events & Event.read))
+			{
+				try
+				{
+					overlapped = MmapPool.instance.make!SocketState;
+					transport.socket.beginReceive(io.output[], overlapped);
+				}
+				catch (SocketException e)
+				{
+					MmapPool.instance.dispose(overlapped);
+					defaultAllocator.dispose(e);
+					return false;
+				}
+			}
+		}
+		return true;
+	}
 
-    /**
-     * Does the actual polling.
-     */
-    override protected void poll()
-    {
-        DWORD lpNumberOfBytes;
-        ULONG_PTR key;
-        LPOVERLAPPED overlap;
-        immutable timeout = cast(immutable int) blockTime.total!"msecs";
+	/**
+	 * Does the actual polling.
+	 */
+	override protected void poll() @nogc
+	{
+		DWORD lpNumberOfBytes;
+		ULONG_PTR key;
+		LPOVERLAPPED overlap;
+		immutable timeout = cast(immutable int) blockTime.total!"msecs";
 
-        auto result = GetQueuedCompletionStatus(completionPort,
-                                                &lpNumberOfBytes,
-                                                &key,
-                                                &overlap,
-                                                timeout);
-        if (result == FALSE && overlap == NULL)
-        {
-            return; // Timeout
-        }
+		auto result = GetQueuedCompletionStatus(completionPort,
+												&lpNumberOfBytes,
+												&key,
+												&overlap,
+												timeout);
+		if (result == FALSE && overlap == NULL)
+		{
+			return; // Timeout
+		}
 
-        auto overlapped = (cast(SocketState) ((cast(void*) overlap) - 8));
-        assert(overlapped !is null);
-        scope (failure)
-        {
-            MmapPool.instance.dispose(overlapped);
-        }
+		auto overlapped = (cast(SocketState) ((cast(void*) overlap) - 8));
+		assert(overlapped !is null);
+		scope (failure)
+		{
+			MmapPool.instance.dispose(overlapped);
+		}
 
-        switch (overlapped.event)
-        {
-            case OverlappedSocketEvent.accept:
-                auto connection = cast(ConnectionWatcher) (cast(void*) key);
-                assert(connection !is null);
+		switch (overlapped.event)
+		{
+			case OverlappedSocketEvent.accept:
+				auto connection = cast(ConnectionWatcher) (cast(void*) key);
+				assert(connection !is null);
 
-                auto listener = cast(OverlappedStreamSocket) connection.socket;
-                assert(listener !is null);
+				auto listener = cast(OverlappedStreamSocket) connection.socket;
+				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 socket = listener.endAccept(overlapped);
+				auto transport = MmapPool.instance.make!IOCPStreamTransport(socket);
+				auto io = MmapPool.instance.make!IOWatcher(transport, connection.protocol);
 
-                connection.incoming.insertBack(io);
+				connection.incoming.insertBack(io);
 
-                reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
+				reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
 
-                swapPendings.insertBack(connection);
-                listener.beginAccept(overlapped);
-                break;
-            case OverlappedSocketEvent.read:
-                auto io = cast(IOWatcher) (cast(void*) key);
-                assert(io !is null);
-                if (!io.active)
-                {
-                    MmapPool.instance.dispose(io);
-                    MmapPool.instance.dispose(overlapped);
-                    return;
-                }
+				swapPendings.insertBack(connection);
+				listener.beginAccept(overlapped);
+				break;
+			case OverlappedSocketEvent.read:
+				auto io = cast(IOWatcher) (cast(void*) key);
+				assert(io !is null);
+				if (!io.active)
+				{
+					MmapPool.instance.dispose(io);
+					MmapPool.instance.dispose(overlapped);
+					return;
+				}
 
-                auto transport = cast(IOCPStreamTransport) io.transport;
-                assert(transport !is null);
+				auto transport = cast(IOCPStreamTransport) io.transport;
+				assert(transport !is null);
 
-                int received;
-                SocketException exception;
-                try
-                {
-                    received = transport.socket.endReceive(overlapped);
-                }
-                catch (SocketException e)
-                {
-                    exception = e;
-                }
-                if (transport.socket.disconnected)
-                {
-                    // We want to get one last notification to destroy the watcher
-                    transport.socket.beginReceive(io.output[], overlapped);
-                    kill(io, exception);
-                }
-                else if (received > 0)
-                {
-                    immutable full = io.output.free == received;
+				int received;
+				SocketException exception;
+				try
+				{
+					received = transport.socket.endReceive(overlapped);
+				}
+				catch (SocketException e)
+				{
+					exception = e;
+				}
+				if (transport.socket.disconnected)
+				{
+					// We want to get one last notification to destroy the watcher
+					transport.socket.beginReceive(io.output[], overlapped);
+					kill(io, exception);
+				}
+				else if (received > 0)
+				{
+					immutable full = io.output.free == received;
 
-                    io.output += received;
-                    // Receive was interrupted because the buffer is full. We have to continue
-                    if (full)
-                    {
-                        transport.socket.beginReceive(io.output[], overlapped);
-                    }
-                    swapPendings.insertBack(io);
-                }
-                break;
-            case OverlappedSocketEvent.write:
-                auto io = cast(IOWatcher) (cast(void*) key);
-                assert(io !is null);
+					io.output += received;
+					// Receive was interrupted because the buffer is full. We have to continue
+					if (full)
+					{
+						transport.socket.beginReceive(io.output[], overlapped);
+					}
+					swapPendings.insertBack(io);
+				}
+				break;
+			case OverlappedSocketEvent.write:
+				auto io = cast(IOWatcher) (cast(void*) key);
+				assert(io !is null);
 
-                auto transport = cast(IOCPStreamTransport) io.transport;
-                assert(transport !is null);
+				auto transport = cast(IOCPStreamTransport) io.transport;
+				assert(transport !is null);
 
-                transport.input += transport.socket.endSend(overlapped);
-                if (transport.input.length)
-                {
-                    transport.socket.beginSend(transport.input[], overlapped);
-                }
-                else
-                {
-                    transport.socket.beginReceive(io.output[], overlapped);
-                }
-                break;
-            default:
-                assert(false, "Unknown event");
-        }
-    }
+				transport.input += transport.socket.endSend(overlapped);
+				if (transport.input.length)
+				{
+					transport.socket.beginSend(transport.input[], overlapped);
+				}
+				else
+				{
+					transport.socket.beginReceive(io.output[], overlapped);
+				}
+				break;
+			default:
+				assert(false, "Unknown event");
+		}
+	}
 }

source/tanya/async/event/kqueue.d

@@ -6,127 +6,102 @@
  * 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)
+ * 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;
-}
-else version (OpenBSD)
-{
-    version = MissingKevent;
-}
-else version (DragonFlyBSD)
-{
-    version = MissingKevent;
-}
-
-version (MissingKevent)
-{
-    extern (C):
-    nothrow:
-    @nogc:
-
-    import core.stdc.stdint;    // intptr_t, uintptr_t
-    import core.sys.posix.time; // timespec
-
-    enum : short
-    {
-        EVFILT_READ     =  -1,
-        EVFILT_WRITE    =  -2,
-        EVFILT_AIO      =  -3, /* attached to aio requests */
-        EVFILT_VNODE    =  -4, /* attached to vnodes */
-        EVFILT_PROC     =  -5, /* attached to struct proc */
-        EVFILT_SIGNAL   =  -6, /* attached to struct proc */
-        EVFILT_TIMER    =  -7, /* timers */
-        EVFILT_MACHPORT =  -8, /* Mach portsets */
-        EVFILT_FS       =  -9, /* filesystem events */
-        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
-    {
-        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
-    {
-        /* actions */
-        EV_ADD      = 0x0001, /* add event to kq (implies enable) */
-        EV_DELETE   = 0x0002, /* delete event from kq */
-        EV_ENABLE   = 0x0004, /* enable event */
-        EV_DISABLE  = 0x0008, /* disable event (not reported) */
-
-        /* flags */
-        EV_ONESHOT  = 0x0010, /* only report one occurrence */
-        EV_CLEAR    = 0x0020, /* clear event state after reporting */
-        EV_RECEIPT  = 0x0040, /* force EV_ERROR on success, data=0 */
-        EV_DISPATCH = 0x0080, /* disable event after reporting */
-
-        EV_SYSFLAGS = 0xF000, /* reserved by system */
-        EV_FLAG1    = 0x2000, /* filter-specific flag */
-
-        /* 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;
+	version = MacBSD;
 }
 else version (FreeBSD)
 {
-    version = MacBSD;
-    public import core.sys.freebsd.sys.event;
+	version = MacBSD;
 }
 else version (OpenBSD)
 {
-    version = MacBSD;
+	version = MacBSD;
 }
 else version (DragonFlyBSD)
 {
-    version = MacBSD;
+	version = MacBSD;
 }
 
 version (MacBSD):
 
+import core.stdc.stdint;    // intptr_t, uintptr_t
+import core.sys.posix.time; // timespec
+
+void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args) pure nothrow @nogc
+{
+	*kevp = kevent_t(args);
+}
+
+enum : short
+{
+	EVFILT_READ     =  -1,
+	EVFILT_WRITE    =  -2,
+	EVFILT_AIO      =  -3, /* attached to aio requests */
+	EVFILT_VNODE    =  -4, /* attached to vnodes */
+	EVFILT_PROC     =  -5, /* attached to struct proc */
+	EVFILT_SIGNAL   =  -6, /* attached to struct proc */
+	EVFILT_TIMER    =  -7, /* timers */
+	EVFILT_MACHPORT =  -8, /* Mach portsets */
+	EVFILT_FS       =  -9, /* filesystem events */
+	EVFILT_USER     = -10, /* User events */
+	EVFILT_VM       = -12, /* virtual memory events */
+	EVFILT_SYSCOUNT =  11
+}
+
+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
+{
+	/* actions */
+	EV_ADD      = 0x0001, /* add event to kq (implies enable) */
+	EV_DELETE   = 0x0002, /* delete event from kq */
+	EV_ENABLE   = 0x0004, /* enable event */
+	EV_DISABLE  = 0x0008, /* disable event (not reported) */
+
+	/* flags */
+	EV_ONESHOT  = 0x0010, /* only report one occurrence */
+	EV_CLEAR    = 0x0020, /* clear event state after reporting */
+	EV_RECEIPT  = 0x0040, /* force EV_ERROR on success, data=0 */
+	EV_DISPATCH = 0x0080, /* disable event after reporting */
+
+	EV_SYSFLAGS = 0xF000, /* reserved by system */
+	EV_FLAG1    = 0x2000, /* filter-specific flag */
+
+	/* returned values */
+	EV_EOF      = 0x8000, /* EOF detected */
+	EV_ERROR    = 0x4000, /* error, data contains errno */
+}
+
+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;
+
 import tanya.async.event.selector;
 import tanya.async.loop;
 import tanya.async.transport;
@@ -142,208 +117,210 @@ import std.algorithm.comparison;
 
 class KqueueLoop : SelectorLoop
 {
-    protected int fd;
-    private kevent_t[] events;
-    private kevent_t[] changes;
-    private size_t changeCount;
+	protected int fd;
+	private kevent_t[] events;
+	private 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
-    {
-        return cast(uint) events.length;
-    }
+	/**
+	 * 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
+	{
+		return cast(uint) events.length;
+	}
 
-    this()
-    {
-        super();
+	this() @nogc
+	{
+		super();
 
-        if ((fd = kqueue()) == -1)
-        {
-            throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
-        }
-        events = MmapPool.instance.makeArray!kevent_t(64);
-        changes = MmapPool.instance.makeArray!kevent_t(64);
-    }
+		if ((fd = kqueue()) == -1)
+		{
+			throw MmapPool.instance.make!BadLoopException("epoll initialization failed");
+		}
+		MmapPool.instance.resizeArray(events, 64);
+		MmapPool.instance.resizeArray(changes, 64);
+	}
 
-    /**
-     * Free loop internals.
-     */
-    ~this()
-    {
-        MmapPool.instance.dispose(events);
-        MmapPool.instance.dispose(changes);
-        close(fd);
-    }
+	/**
+	 * Free loop internals.
+	 */
+	~this() @nogc
+	{
+		MmapPool.instance.dispose(events);
+		MmapPool.instance.dispose(changes);
+		close(fd);
+	}
 
-    private void set(socket_t socket, short filter, ushort flags)
-    {
-        if (changes.length <= changeCount)
-        {
-            MmapPool.instance.resizeArray(changes, changeCount + maxEvents);
-        }
-        EV_SET(&changes[changeCount],
-               cast(ulong) socket,
-               filter,
-               flags,
-               0U,
-               0L,
-               null);
-        ++changeCount;
-    }
+	private void set(socket_t socket, short filter, ushort flags) @nogc
+	{
+		if (changes.length <= changeCount)
+		{
+			MmapPool.instance.resizeArray(changes, changeCount + maxEvents);
+		}
+		EV_SET(&changes[changeCount],
+			   cast(ulong) socket,
+			   filter,
+			   flags,
+			   0U,
+			   0L,
+			   null);
+		++changeCount;
+	}
 
-    /**
-     * 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 protected bool reify(ConnectionWatcher watcher,
-                                  EventMask oldEvents,
-                                  EventMask events)
-    {
-        if (events != oldEvents)
-        {
-            if (oldEvents & Event.read || oldEvents & Event.accept)
-            {
-                set(watcher.socket.handle, EVFILT_READ, EV_DELETE);
-            }
-            if (oldEvents & Event.write)
-            {
-                set(watcher.socket.handle, EVFILT_WRITE, EV_DELETE);
-            }
-        }
-        if (events & (Event.read | events & Event.accept))
-        {
-            set(watcher.socket.handle, EVFILT_READ, EV_ADD | EV_ENABLE);
-        }
-        if (events & Event.write)
-        {
-            set(watcher.socket.handle, EVFILT_WRITE, EV_ADD | EV_DISPATCH);
-        }
-        return true;
-    }
+	/**
+	 * 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 protected bool reify(ConnectionWatcher watcher,
+	                              EventMask oldEvents,
+	                              EventMask events) @nogc
+	{
+		if (events != oldEvents)
+		{
+			if (oldEvents & Event.read || oldEvents & Event.accept)
+			{
+				set(watcher.socket.handle, EVFILT_READ, EV_DELETE);
+			}
+			if (oldEvents & Event.write)
+			{
+				set(watcher.socket.handle, EVFILT_WRITE, EV_DELETE);
+			}
+		}
+		if (events & (Event.read | events & Event.accept))
+		{
+			set(watcher.socket.handle, EVFILT_READ, EV_ADD | EV_ENABLE);
+		}
+		if (events & Event.write)
+		{
+			set(watcher.socket.handle, EVFILT_WRITE, EV_ADD | EV_DISPATCH);
+		}
+		return true;
+	}
 
-    /**
-     * Does the actual polling.
-     */
-    protected override void poll()
-    {
-        timespec ts;
-        blockTime.split!("seconds", "nsecs")(ts.tv_sec, ts.tv_nsec);
+	/**
+	 * Does the actual polling.
+	 */
+	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);
-        }
+		if (changeCount > maxEvents) 
+		{
+			MmapPool.instance.resizeArray(events, changes.length);
+		}
 
-        auto eventCount = kevent(fd, changes.ptr, cast(int) changeCount, events.ptr, maxEvents, &ts);
-        changeCount = 0;
+		auto eventCount = kevent(fd, changes.ptr, cast(int) changeCount, events.ptr, maxEvents, &ts);
+		changeCount = 0;
 
-        if (eventCount < 0)
-        {
-            if (errno != EINTR)
-            {
-                throw theAllocator.make!BadLoopException();
-            }
-            return;
-        }
+		if (eventCount < 0)
+		{
+			if (errno != EINTR)
+			{
+				throw defaultAllocator.make!BadLoopException();
+			}
+			return;
+		}
 
-        for (int i; i < eventCount; ++i)
-        {
-            assert(connections.length > events[i].ident);
+		for (int i; i < eventCount; ++i)
+		{
+			assert(connections.length > events[i].ident);
 
-            IOWatcher io = cast(IOWatcher) connections[events[i].ident];
-            // If it is a ConnectionWatcher. Accept connections.
-            if (io is null)
-            {
-                acceptConnections(connections[events[i].ident]);
-            }
-            else if (events[i].flags & EV_ERROR)
-            {
-                kill(io, null);
-            }
-            else if (events[i].filter == EVFILT_READ)
-            {
-                auto transport = cast(SelectorStreamTransport) io.transport;
-                assert(transport !is null);
+			IOWatcher io = cast(IOWatcher) connections[events[i].ident];
+			// If it is a ConnectionWatcher. Accept connections.
+			if (io is null)
+			{
+				acceptConnections(connections[events[i].ident]);
+			}
+			else if (events[i].flags & EV_ERROR)
+			{
+				kill(io, null);
+			}
+			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;
-                    }
-                    while (received);
-                }
-                catch (SocketException e)
-                {
-                    exception = e;
-                }
-                if (transport.socket.disconnected)
-                {
-                    kill(io, exception);
-                }
-                else if (io.output.length)
-                {
-                    swapPendings.insertBack(io);
-                }
-            }
-            else if (events[i].filter == EVFILT_WRITE)
-            {
-                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;
+					}
+					while (received);
+				}
+				catch (SocketException e)
+				{
+					exception = e;
+				}
+				if (transport.socket.disconnected)
+				{
+					kill(io, exception);
+				}
+				else if (io.output.length)
+				{
+					swapPendings.insertBack(io);
+				}
+			}
+			else if (events[i].filter == EVFILT_WRITE)
+			{
+				auto transport = cast(SelectorStreamTransport) io.transport;
+				assert(transport !is null);
 
-                transport.writeReady = true;
-                if (transport.input.length)
-                {
-                    feed(transport);
-                }
-            }
-        }
-    }
+				transport.writeReady = true;
+				if (transport.input.length)
+				{
+					feed(transport);
+				}
+			}
+		}
+	}
 
-    /**
-     * Returns: The blocking time.
-     */
-    override protected @property inout(Duration) blockTime()
-    inout @safe pure nothrow
-    {
-        return min(super.blockTime, 1.dur!"seconds");
-    }
+	/**
+	 * Returns: The blocking time.
+	 */
+	override protected @property inout(Duration) blockTime()
+	inout @nogc @safe pure nothrow
+	{
+		return min(super.blockTime, 1.dur!"seconds");
+	}
 
-    /**
-     * If the transport couldn't send the data, the further sending should
-     * be handled by the event loop.
-     *
-     * Params:
-     *     transport = Transport.
-     *     exception = Exception thrown on sending.
-     *
-     * Returns: $(D_KEYWORD true) if the operation could be successfully
-     *          completed or scheduled, $(D_KEYWORD false) otherwise (the
-     *          transport is be destroyed then).
-     */
-    protected override bool feed(SelectorStreamTransport transport, SocketException exception = null)
-    {
-        if (!super.feed(transport, exception))
-        {
-            return false;
-        }
-        if (!transport.writeReady)
-        {
-            set(transport.socket.handle, EVFILT_WRITE, EV_DISPATCH);
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * If the transport couldn't send the data, the further sending should
+	 * be handled by the event loop.
+	 *
+	 * Params:
+	 * 	transport = Transport.
+	 * 	exception = Exception thrown on sending.
+	 *
+	 * Returns: $(D_KEYWORD true) if the operation could be successfully
+	 *          completed or scheduled, $(D_KEYWORD false) otherwise (the
+	 *          transport is be destroyed then).
+	 */
+	protected override bool feed(SelectorStreamTransport transport,
+	                             SocketException exception = null) @nogc
+	{
+		if (!super.feed(transport, exception))
+		{
+			return false;
+		}
+		if (!transport.writeReady)
+		{
+			set(transport.socket.handle, EVFILT_WRITE, EV_DISPATCH);
+			return true;
+		}
+		return false;
+	}
 }

source/tanya/async/event/selector.d

@@ -27,240 +27,233 @@ import core.stdc.errno;
  */
 class SelectorStreamTransport : StreamTransport
 {
-    private ConnectedSocket socket_;
+	private ConnectedSocket socket_;
 
-    /// Input buffer.
-    package WriteBuffer input;
+	/// Input buffer.
+	package WriteBuffer!ubyte input;
 
-    private SelectorLoop loop;
+	private SelectorLoop loop;
 
-    /// Received notification that the underlying socket is write-ready.
-    package bool writeReady;
+	/// Received notification that the underlying socket is write-ready.
+	package bool writeReady;
 
-    /**
-     * Params:
-     *     loop     = Event loop.
-     *     socket   = Socket.
-     */
-    this(SelectorLoop loop, ConnectedSocket socket)
-    {
-        socket_ = socket;
-        this.loop = loop;
-        input = MmapPool.instance.make!WriteBuffer();
-    }
+	/**
+	 * Params:
+	 * 	loop     = Event loop.
+	 * 	socket   = Socket.
+	 */
+	this(SelectorLoop loop, ConnectedSocket socket) @nogc
+	{
+		socket_ = socket;
+		this.loop = loop;
+		input = WriteBuffer!ubyte(8192, MmapPool.instance);
+	}
 
-    /**
-     * Close the transport and deallocate the data buffers.
-     */
-    ~this()
-    {
-        MmapPool.instance.dispose(input);
-    }
+	/**
+	 * Returns: Transport socket.
+	 */
+	inout(ConnectedSocket) socket() inout pure nothrow @safe @nogc
+	{
+		return socket_;
+	}
 
-    /**
-     * Returns: Transport socket.
-     */
-    inout(ConnectedSocket) socket() inout pure nothrow @safe @nogc
-    {
-        return socket_;
-    }
-
-    /**
-     * Write some data to the transport.
-     *
-     * Params:
-     *     data = Data to send.
-     */
-    void write(ubyte[] data)
-    {
-        if (!data.length)
-        {
-            return;
-        }
-        // Try to write if the socket is write ready.
-        if (writeReady)
-        {
-            ptrdiff_t sent;
-            SocketException exception;
-            try
-            {
-                sent = socket.send(data);
-                if (sent == 0)
-                {
-                    writeReady = false;
-                }
-            }
-            catch (SocketException e)
-            {
-                writeReady = false;
-                exception = e;
-            }
-            if (sent < data.length)
-            {
-                input ~= data[sent..$];
-                loop.feed(this, exception);
-            }
-        }
-        else
-        {
-            input ~= data;
-        }
-    }
+	/**
+	 * Write some data to the transport.
+	 *
+	 * Params:
+	 * 	data = Data to send.
+	 */
+	void write(ubyte[] data) @nogc
+	{
+		if (!data.length)
+		{
+			return;
+		}
+		// Try to write if the socket is write ready.
+		if (writeReady)
+		{
+			ptrdiff_t sent;
+			SocketException exception;
+			try
+			{
+				sent = socket.send(data);
+				if (sent == 0)
+				{
+					writeReady = false;
+				}
+			}
+			catch (SocketException e)
+			{
+				writeReady = false;
+				exception = e;
+			}
+			if (sent < data.length)
+			{
+				input ~= data[sent..$];
+				loop.feed(this, exception);
+			}
+		}
+		else
+		{
+			input ~= data;
+		}
+	}
 }
 
 abstract class SelectorLoop : Loop
 {
-    /// Pending connections.
-    protected ConnectionWatcher[] connections;
+	/// Pending connections.
+	protected ConnectionWatcher[] connections;
 
-    this()
-    {
-        super();
-        connections = MmapPool.instance.makeArray!ConnectionWatcher(maxEvents);
-    }
+	this() @nogc
+	{
+		super();
+		MmapPool.instance.resizeArray(connections, maxEvents);
+	}
 
-    ~this()
-    {
-        foreach (ref connection; connections)
-        {
-            // We want to free only IOWatchers. ConnectionWatcher are created by the
-            // user and should be freed by himself.
-            auto io = cast(IOWatcher) connection;
-            if (io !is null)
-            {
-                MmapPool.instance.dispose(io);
-                connection = null;
-            }
-        }
-        MmapPool.instance.dispose(connections);
-    }
+	~this() @nogc
+	{
+		foreach (ref connection; connections)
+		{
+			// We want to free only IOWatchers. ConnectionWatcher are created by the
+			// user and should be freed by himself.
+			auto io = cast(IOWatcher) connection;
+			if (io !is null)
+			{
+				MmapPool.instance.dispose(io);
+				connection = null;
+			}
+		}
+		MmapPool.instance.dispose(connections);
+	}
 
-    /**
-     * If the transport couldn't send the data, the further sending should
-     * be handled by the event loop.
-     *
-     * Params:
-     *     transport = Transport.
-     *     exception = Exception thrown on sending.
-     *
-     * Returns: $(D_KEYWORD true) if the operation could be successfully
-     *          completed or scheduled, $(D_KEYWORD false) otherwise (the
-     *          transport will be destroyed then).
-     */
-    protected bool feed(SelectorStreamTransport transport, SocketException exception = null)
-    {
-        while (transport.input.length && transport.writeReady)
-        {
-            try
-            {
-                ptrdiff_t sent = transport.socket.send(transport.input[]);
-                if (sent == 0)
-                {
-                    transport.writeReady = false;
-                }
-                else
-                {
-                    transport.input += sent;
-                }
-            }
-            catch (SocketException e)
-            {
-                exception = e;
-                transport.writeReady = false;
-            }
-        }
-        if (exception !is null)
-        {
-            auto watcher = cast(IOWatcher) connections[transport.socket.handle];
-            assert(watcher !is null);
+	/**
+	 * If the transport couldn't send the data, the further sending should
+	 * be handled by the event loop.
+	 *
+	 * Params:
+	 * 	transport = Transport.
+	 * 	exception = Exception thrown on sending.
+	 *
+	 * Returns: $(D_KEYWORD true) if the operation could be successfully
+	 *          completed or scheduled, $(D_KEYWORD false) otherwise (the
+	 *          transport will be destroyed then).
+	 */
+	protected bool feed(SelectorStreamTransport transport,
+	                    SocketException exception = null) @nogc
+	{
+		while (transport.input.length && transport.writeReady)
+		{
+			try
+			{
+				ptrdiff_t sent = transport.socket.send(transport.input[]);
+				if (sent == 0)
+				{
+					transport.writeReady = false;
+				}
+				else
+				{
+					transport.input += sent;
+				}
+			}
+			catch (SocketException e)
+			{
+				exception = e;
+				transport.writeReady = false;
+			}
+		}
+		if (exception !is null)
+		{
+			auto watcher = cast(IOWatcher) connections[transport.socket.handle];
+			assert(watcher !is null);
 
-            kill(watcher, exception);
-            return false;
-        }
-        return true;
-    }
+			kill(watcher, exception);
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * Start watching.
-     *
-     * Params:
-     *     watcher = Watcher.
-     */
-    override void start(ConnectionWatcher watcher)
-    {
-        if (watcher.active)
-        {
-            return;
-        }
+	/**
+	 * Start watching.
+	 *
+	 * Params:
+	 * 	watcher = Watcher.
+	 */
+	override void start(ConnectionWatcher watcher) @nogc
+	{
+		if (watcher.active)
+		{
+			return;
+		}
 
-        if (connections.length <= watcher.socket)
-        {
-            MmapPool.instance.resizeArray(connections, watcher.socket.handle + maxEvents / 2);
-        }
-        connections[watcher.socket.handle] = watcher;
+		if (connections.length <= watcher.socket)
+		{
+			MmapPool.instance.resizeArray(connections, watcher.socket.handle + maxEvents / 2);
+		}
+		connections[watcher.socket.handle] = watcher;
 
-        super.start(watcher);
-    }
+		super.start(watcher);
+	}
 
-    /**
-     * Accept incoming connections.
-     *
-     * Params:
-     *     connection = Connection watcher ready to accept.
-     */
-    package void acceptConnections(ConnectionWatcher connection)
-    in
-    {
-        assert(connection !is null);
-    }
-    body
-    {
-        while (true)
-        {
-            ConnectedSocket client;
-            try
-            {
-                client = (cast(StreamSocket) connection.socket).accept();
-            }
-            catch (SocketException e)
-            {
-                theAllocator.dispose(e);
-                break;
-            }
-            if (client is null)
-            {
-                break;
-            }
+	/**
+	 * Accept incoming connections.
+	 *
+	 * Params:
+	 * 	connection = Connection watcher ready to accept.
+	 */
+	package void acceptConnections(ConnectionWatcher connection) @nogc
+	in
+	{
+		assert(connection !is null);
+	}
+	body
+	{
+		while (true)
+		{
+			ConnectedSocket client;
+			try
+			{
+				client = (cast(StreamSocket) connection.socket).accept();
+			}
+			catch (SocketException e)
+			{
+				defaultAllocator.dispose(e);
+				break;
+			}
+			if (client is null)
+			{
+				break;
+			}
 
-            IOWatcher io;
-            auto transport = MmapPool.instance.make!SelectorStreamTransport(this, client);
+			IOWatcher io;
+			auto transport = MmapPool.instance.make!SelectorStreamTransport(this, client);
 
-            if (connections.length > client.handle)
-            {
-                io = cast(IOWatcher) connections[client.handle];
-            }
-            else
-            {
-                MmapPool.instance.resizeArray(connections, client.handle + maxEvents / 2);
-            }
-            if (io is null)
-            {
-                io = MmapPool.instance.make!IOWatcher(transport,
-                                                      connection.protocol);
-                connections[client.handle] = io;
-            }
-            else
-            {
-                io(transport, connection.protocol);
-            }
+			if (connections.length > client.handle)
+			{
+				io = cast(IOWatcher) connections[client.handle];
+			}
+			else
+			{
+				MmapPool.instance.resizeArray(connections, client.handle + maxEvents / 2);
+			}
+			if (io is null)
+			{
+				io = MmapPool.instance.make!IOWatcher(transport,
+				                                      connection.protocol);
+				connections[client.handle] = io;
+			}
+			else
+			{
+				io(transport, connection.protocol);
+			}
 
-            reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
-            connection.incoming.insertBack(io);
-        }
+			reify(io, EventMask(Event.none), EventMask(Event.read, Event.write));
+			connection.incoming.insertBack(io);
+		}
 
-        if (!connection.incoming.empty)
-        {
-            swapPendings.insertBack(connection);
-        }
-    }
+		if (!connection.incoming.empty)
+		{
+			swapPendings.insertBack(connection);
+		}
+	}
 }

source/tanya/async/iocp.d

@@ -21,12 +21,12 @@ import core.sys.windows.windef;
  */
 class State
 {
-    /// For internal use by Windows API.
-    align(1) OVERLAPPED overlapped;
+	/// For internal use by Windows API.
+	align(1) OVERLAPPED overlapped;
 
-    /// File/socket handle.
-    HANDLE handle;
+	/// File/socket handle.
+	HANDLE handle;
 
-    /// For keeping events or event masks.
-    int event;
+	/// For keeping events or event masks.
+	int event;
 }

source/tanya/async/loop.d

@@ -10,100 +10,105 @@
  *
  * ---
  * import tanya.async;
+ * import tanya.memory;
  * import tanya.network.socket;
  *
  * class EchoProtocol : TransmissionControlProtocol
  * {
- *     private DuplexTransport transport;
+ * 	private DuplexTransport transport;
  *
- *     void received(ubyte[] data)
- *     {
- *         transport.write(data);
- *     }
+ * 	void received(ubyte[] data) @nogc
+ * 	{
+ * 		transport.write(data);
+ * 	}
  *
- *     void connected(DuplexTransport transport)
- *     {
- *         this.transport = transport;
- *     }
+ * 	void connected(DuplexTransport transport) @nogc
+ * 	{
+ * 		this.transport = transport;
+ * 	}
  *
- *     void disconnected(SocketException e = null)
- *     {
- *     }
+ * 	void disconnected(SocketException e = null) @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);
- *     }
- *     else
- *     {
- *         auto sock = new StreamSocket(AddressFamily.INET);
- *         sock.blocking = false;
- *     }
+ * 	version (Windows)
+ * 	{
+ * 		auto sock = defaultAllocator.make!OverlappedStreamSocket(AddressFamily.INET);
+ * 	}
+ * 	else
+ * 	{
+ * 		auto sock = defaultAllocator.make!StreamSocket(AddressFamily.INET);
+ * 		sock.blocking = false;
+ * 	}
  *
- *     sock.bind(address);
- *     sock.listen(5);
+ * 	sock.bind(address);
+ * 	sock.listen(5);
  *
- *     auto io = new ConnectionWatcher(sock);
- *     io.setProtocol!EchoProtocol;
+ * 	auto io = defaultAllocator.make!ConnectionWatcher(sock);
+ * 	io.setProtocol!EchoProtocol;
  *
- *     defaultLoop.start(io);
- *     defaultLoop.run();
+ * 	defaultLoop.start(io);
+ * 	defaultLoop.run();
  *
- *     sock.shutdown();
+ * 	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.protocol;
+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)
 {
 }
 else version (linux)
 {
-    import tanya.async.event.epoll;
-    version = Epoll;
+	import tanya.async.event.epoll;
+	version = Epoll;
 }
 else version (Windows)
 {
-    import tanya.async.event.iocp;
-    version = IOCP;
+	import tanya.async.event.iocp;
+	version = IOCP;
 }
 else version (OSX)
 {
-    version = Kqueue;
+	version = Kqueue;
 }
 else version (iOS)
 {
-    version = Kqueue;
+	version = Kqueue;
 }
 else version (FreeBSD)
 {
-    version = Kqueue;
+	version = Kqueue;
 }
 else version (OpenBSD)
 {
-    version = Kqueue;
+	version = Kqueue;
 }
 else version (DragonFlyBSD)
 {
-    version = Kqueue;
+	version = Kqueue;
 }
 
 /**
@@ -111,11 +116,11 @@ else version (DragonFlyBSD)
  */
 enum Event : uint
 {
-    none   = 0x00,       /// No events.
-    read   = 0x01,       /// Non-blocking read call.
-    write  = 0x02,       /// Non-blocking write call.
-    accept = 0x04,       /// Connection made.
-    error  = 0x80000000, /// Sent when an error occurs.
+	none   = 0x00,       /// No events.
+	read   = 0x01,       /// Non-blocking read call.
+	write  = 0x02,       /// Non-blocking write call.
+	accept = 0x04,       /// Connection made.
+	error  = 0x80000000, /// Sent when an error occurs.
 }
 
 alias EventMask = BitFlags!Event;
@@ -125,161 +130,172 @@ alias EventMask = BitFlags!Event;
  */
 abstract class Loop
 {
-    /// Pending watchers.
-    protected PendingQueue!Watcher pendings;
+	/// Pending watchers.
+	protected Queue!Watcher* pendings;
 
-    protected PendingQueue!Watcher swapPendings;
+	/// Ditto.
+	protected Queue!Watcher* swapPendings;
 
-    /**
-     * Returns: Maximal event count can be got at a time
-     *          (should be supported by the backend).
-     */
-    protected @property inout(uint) maxEvents() inout const pure nothrow @safe @nogc
-    {
-        return 128U;
-    }
+	/**
+	 * 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
+	{
+		return 128U;
+	}
 
-    /**
-     * Initializes the loop.
-     */
-    this()
-    {
-        pendings = MmapPool.instance.make!(PendingQueue!Watcher);
-        swapPendings = MmapPool.instance.make!(PendingQueue!Watcher);
-    }
+	/**
+	 * Initializes the loop.
+	 */
+	this() @nogc
+	{
+		pendings = MmapPool.instance.make!(Queue!Watcher)(MmapPool.instance);
+		swapPendings = MmapPool.instance.make!(Queue!Watcher)(MmapPool.instance);
+	}
 
-    /**
-     * Frees loop internals.
-     */
-    ~this()
-    {
-        MmapPool.instance.dispose(pendings);
-        MmapPool.instance.dispose(swapPendings);
-    }
+	/**
+	 * Frees loop internals.
+	 */
+	~this() @nogc
+	{
+		foreach (w; *pendings)
+		{
+			MmapPool.instance.dispose(w);
+		}
+		MmapPool.instance.dispose(pendings);
 
-    /**
-     * Starts the loop.
-     */
-    void run()
-    {
-        done_ = false;
-        do
-        {
-            poll();
+		foreach (w; *swapPendings)
+		{
+			MmapPool.instance.dispose(w);
+		}
+		MmapPool.instance.dispose(swapPendings);
+	}
 
-            // Invoke pendings
-            swapPendings.each!((ref p) => p.invoke());
+	/**
+	 * Starts the loop.
+	 */
+	void run() @nogc
+	{
+		done_ = false;
+		do
+		{
+			poll();
 
-            swap(pendings, swapPendings);
-        }
-        while (!done_);
-    }
+			// Invoke pendings
+			swapPendings.each!((ref p) @nogc => p.invoke());
 
-    /**
-     * Break out of the loop.
-     */
-    void unloop() @safe pure nothrow
-    {
-        done_ = true;
-    }
+			swap(pendings, swapPendings);
+		}
+		while (!done_);
+	}
 
-    /**
-     * Start watching.
-     *
-     * Params:
-     *     watcher = Watcher.
-     */
-    void start(ConnectionWatcher watcher)
-    {
-        if (watcher.active)
-        {
-            return;
-        }
-        watcher.active = true;
-        reify(watcher, EventMask(Event.none), EventMask(Event.accept));
-    }
+	/**
+	 * Break out of the loop.
+	 */
+	void unloop() @safe pure nothrow @nogc
+	{
+		done_ = true;
+	}
 
-    /**
-     * Stop watching.
-     *
-     * Params:
-     *     watcher = Watcher.
-     */
-    void stop(ConnectionWatcher watcher)
-    {
-        if (!watcher.active)
-        {
-            return;
-        }
-        watcher.active = false;
+	/**
+	 * Start watching.
+	 *
+	 * Params:
+	 * 	watcher = Watcher.
+	 */
+	void start(ConnectionWatcher watcher) @nogc
+	{
+		if (watcher.active)
+		{
+			return;
+		}
+		watcher.active = true;
+		reify(watcher, EventMask(Event.none), EventMask(Event.accept));
+	}
 
-        reify(watcher, EventMask(Event.accept), EventMask(Event.none));
-    }
+	/**
+	 * Stop watching.
+	 *
+	 * Params:
+	 * 	watcher = Watcher.
+	 */
+	void stop(ConnectionWatcher watcher) @nogc
+	{
+		if (!watcher.active)
+		{
+			return;
+		}
+		watcher.active = false;
 
-    /**
-     * 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.
-     */
-    abstract protected bool reify(ConnectionWatcher watcher,
-                                  EventMask oldEvents,
-                                  EventMask events);
+		reify(watcher, EventMask(Event.accept), EventMask(Event.none));
+	}
 
-    /**
-     * Returns: The blocking time.
-     */
-    protected @property inout(Duration) blockTime()
-    inout @safe pure nothrow
-    {
-        // Don't block if we have to do.
-        return swapPendings.empty ? blockTime_ : Duration.zero;
-    }
+	/**
+	 * 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.
+	 */
+	abstract protected bool reify(ConnectionWatcher watcher,
+								  EventMask oldEvents,
+								  EventMask events) @nogc;
 
-    /**
-     * Sets the blocking time for IO watchers.
-     *
-     * Params:
-     *     blockTime = The blocking time. Cannot be larger than
-     *                 $(D_PSYMBOL maxBlockTime).
-     */
-    protected @property void blockTime(in Duration blockTime) @safe pure nothrow
-    in
-    {
-        assert(blockTime <= 1.dur!"hours", "Too long to wait.");
-        assert(!blockTime.isNegative);
-    }
-    body
-    {
-        blockTime_ = blockTime;
-    }
+	/**
+	 * Returns: The blocking time.
+	 */
+	protected @property inout(Duration) blockTime()
+	inout @safe pure nothrow @nogc
+	{
+		// Don't block if we have to do.
+		return swapPendings.empty ? blockTime_ : Duration.zero;
+	}
 
-    /**
-     * Kills the watcher and closes the connection.
-     */
-    protected void kill(IOWatcher watcher, SocketException exception)
-    {
-        watcher.socket.shutdown();
-        theAllocator.dispose(watcher.socket);
-        MmapPool.instance.dispose(watcher.transport);
-        watcher.exception = exception;
-        swapPendings.insertBack(watcher);
-    }
+	/**
+	 * Sets the blocking time for IO watchers.
+	 *
+	 * Params:
+	 * 	blockTime = The blocking time. Cannot be larger than
+	 * 	            $(D_PSYMBOL maxBlockTime).
+	 */
+	protected @property void blockTime(in Duration blockTime) @safe pure nothrow @nogc
+	in
+	{
+		assert(blockTime <= 1.dur!"hours", "Too long to wait.");
+		assert(!blockTime.isNegative);
+	}
+	body
+	{
+		blockTime_ = blockTime;
+	}
 
-    /**
-     * Does the actual polling.
-     */
-    abstract protected void poll();
+	/**
+	 * Kills the watcher and closes the connection.
+	 */
+	protected void kill(IOWatcher watcher, SocketException exception) @nogc
+	{
+		watcher.socket.shutdown();
+		defaultAllocator.dispose(watcher.socket);
+		MmapPool.instance.dispose(watcher.transport);
+		watcher.exception = exception;
+		swapPendings.insertBack(watcher);
+	}
 
-    /// Whether the event loop should be stopped.
-    private bool done_;
+	/**
+	 * Does the actual polling.
+	 */
+	abstract protected void poll() @nogc;
 
-    /// Maximal block time.
-    protected Duration blockTime_ = 1.dur!"minutes";
+	/// Whether the event loop should be stopped.
+	private bool done_;
+
+	/// Maximal block time.
+	protected Duration blockTime_ = 1.dur!"minutes";
 }
 
 /**
@@ -287,18 +303,17 @@ abstract class Loop
  */
 class BadLoopException : Exception
 {
-@nogc:
-    /**
-     * Params:
-     *     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 file = __FILE__, size_t line = __LINE__, Throwable next = null)
-    pure @safe nothrow const
-    {
-        super("Event loop cannot be initialized.", file, line, next);
-    }
+	/**
+	 * Params:
+	 * 	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 file = __FILE__, size_t line = __LINE__, Throwable next = null)
+	pure nothrow const @safe @nogc
+	{
+		super("Event loop cannot be initialized.", file, line, next);
+	}
 }
 
 /**
@@ -308,26 +323,26 @@ class BadLoopException : Exception
  *
  * Returns: The default event loop.
  */
-@property Loop defaultLoop()
+@property Loop defaultLoop() @nogc
 {
-    if (defaultLoop_ !is null)
-    {
-        return defaultLoop_;
-    }
-    version (Epoll)
-    {
-        defaultLoop_ = MmapPool.instance.make!EpollLoop;
-    }
-    else version (IOCP)
-    {
-        defaultLoop_ = MmapPool.instance.make!IOCPLoop;
-    }
-    else version (Kqueue)
-    {
-        import tanya.async.event.kqueue;
-        defaultLoop_ = MmapPool.instance.make!KqueueLoop;
-    }
-    return defaultLoop_;
+	if (defaultLoop_ !is null)
+	{
+		return defaultLoop_;
+	}
+	version (Epoll)
+	{
+		defaultLoop_ = MmapPool.instance.make!EpollLoop;
+	}
+	else version (IOCP)
+	{
+		defaultLoop_ = MmapPool.instance.make!IOCPLoop;
+	}
+	else version (Kqueue)
+	{
+		import tanya.async.event.kqueue;
+		defaultLoop_ = MmapPool.instance.make!KqueueLoop;
+	}
+	return defaultLoop_;
 }
 
 /**
@@ -339,145 +354,16 @@ class BadLoopException : Exception
  * your implementation to this property.
  *
  * Params:
- *     loop = The event loop.
+ * 	loop = The event loop.
  */
-@property void defaultLoop(Loop loop)
+@property void defaultLoop(Loop loop) @nogc
 in
 {
-    assert(loop !is null);
+	assert(loop !is null);
 }
 body
 {
-    defaultLoop_ = loop;
+	defaultLoop_ = loop;
 }
 
 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/protocol.d

@@ -18,28 +18,28 @@ import tanya.async.transport;
  */
 interface Protocol
 {
-    /**
-     * Params:
-     *     data = Read data.
-     */
-    void received(ubyte[] data);
+	/**
+	 * Params:
+	 * 	data = Read data.
+	 */
+	void received(ubyte[] data) @nogc;
 
-    /**
-     * Called when a connection is made.
-     *
-     * Params:
-     *     transport = Protocol transport.
-     */
-    void connected(DuplexTransport transport);
+	/**
+	 * Called when a connection is made.
+	 *
+	 * Params:
+	 * 	transport = Protocol transport.
+	 */
+	void connected(DuplexTransport transport) @nogc;
 
-    /**
-     * Called when a connection is lost.
-     *
-     * Params:
-     *     exception = $(D_PSYMBOL Exception) if an error caused
-     *                 the disconnect, $(D_KEYWORD null) otherwise.
-     */
-    void disconnected(SocketException exception = null);
+	/**
+	 * Called when a connection is lost.
+	 *
+	 * Params:
+	 * 	exception = $(D_PSYMBOL Exception) if an error caused
+	 * 	            the disconnect, $(D_KEYWORD null) otherwise.
+	 */
+	void disconnected(SocketException exception = null) @nogc;
 }
 
 /**

source/tanya/async/transport.d

@@ -31,13 +31,13 @@ interface ReadTransport : Transport
  */
 interface WriteTransport : Transport
 {
-    /**
-     * Write some data to the transport.
-     *
-     * Params:
-     *     data = Data to send.
-     */
-    void write(ubyte[] data);
+	/**
+	 * Write some data to the transport.
+	 *
+	 * Params:
+	 * 	data = Data to send.
+	 */
+	void write(ubyte[] data) @nogc;
 }
 
 /**
@@ -52,7 +52,7 @@ interface DuplexTransport : ReadTransport, WriteTransport
  */
 interface SocketTransport : Transport
 {
-    @property inout(Socket) socket() inout pure nothrow @safe @nogc;
+	@property inout(Socket) socket() inout pure nothrow @safe @nogc;
 }
 
 /**

source/tanya/async/watcher.d

@@ -10,23 +10,24 @@
  */
 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;
+	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;
 }
 
 /**
@@ -35,85 +36,87 @@ version (Windows)
  */
 abstract class Watcher
 {
-    /// Whether the watcher is active.
-    bool active;
+	/// Whether the watcher is active.
+	bool active;
 
-    /**
-     * Invoke some action on event.
-     */
-    void invoke();
+	/**
+	 * Invoke some action on event.
+	 */
+	void invoke() @nogc;
 }
 
 class ConnectionWatcher : Watcher
 {
-    /// Watched socket.
-    private Socket socket_;
+	/// Watched socket.
+	private Socket socket_;
 
-    /// Protocol factory.
-    protected Protocol delegate() protocolFactory;
+	/// Protocol factory.
+	protected Protocol delegate() @nogc protocolFactory;
 
-    package PendingQueue!IOWatcher incoming;
+	package Queue!IOWatcher incoming;
 
-    /**
-     * Params:
-     *     socket = Socket.
-     */
-    this(Socket socket)
-    {
-        socket_ = socket;
-        incoming = MmapPool.instance.make!(PendingQueue!IOWatcher);
-    }
+	/**
+	 * Params:
+	 * 	socket = Socket.
+	 */
+	this(Socket socket) @nogc
+	{
+		socket_ = socket;
+	}
 
-    /// Ditto.
-    protected this()
-    {
-    }
+	/// Ditto.
+	protected this() pure nothrow @safe @nogc
+	{
+	}
 
-    ~this()
-    {
-        MmapPool.instance.dispose(incoming);
-    }
+	~this() @nogc
+	{
+		foreach (w; incoming)
+		{
+			MmapPool.instance.dispose(w);
+		}
+	}
 
-    /*
-     * Params:
-     *     P = Protocol should be used.
-     */
-    void setProtocol(P : Protocol)()
-    {
-        this.protocolFactory = () => cast(Protocol) MmapPool.instance.make!P;
-    }
+	/**
+	 * Params:
+	 * 	P = Protocol should be used.
+	 */
+	void setProtocol(P : Protocol)() @nogc
+	{
+		this.protocolFactory = () @nogc => cast(Protocol) MmapPool.instance.make!P;
+	}
 
-    /**
-     * Returns: Socket.
-     */
-    @property inout(Socket) socket() inout pure nothrow @nogc
-    {
-        return socket_;
-    }
+	/**
+	 * Returns: Socket.
+	 */
+	@property inout(Socket) socket() inout pure nothrow @nogc
+	{
+		return socket_;
+	}
 
-    /**
-     * Returns: New protocol instance.
-     */
-    @property Protocol protocol()
-    in
-    {
-        assert(protocolFactory !is null, "Protocol isn't set.");
-    }
-    body
-    {
-        return protocolFactory();
-    }
+	/**
+	 * Returns: New protocol instance.
+	 */
+	@property Protocol protocol() @nogc
+	in
+	{
+		assert(protocolFactory !is null, "Protocol isn't set.");
+	}
+	body
+	{
+		return protocolFactory();
+	}
 
-    /**
-     * Invokes new connection callback.
-     */
-    override void invoke()
-    {
-        foreach (io; incoming)
-        {
-            io.protocol.connected(cast(DuplexTransport) io.transport);
-        }
-    }
+	/**
+	 * Invokes new connection callback.
+	 */
+	override void invoke() @nogc
+	{
+		foreach (io; incoming)
+		{
+			io.protocol.connected(cast(DuplexTransport) io.transport);
+		}
+	}
 }
 
 /**
@@ -122,121 +125,121 @@ class ConnectionWatcher : Watcher
  */
 class IOWatcher : ConnectionWatcher
 {
-    /// If an exception was thrown the transport should be already invalid.
-    private union
-    {
-        StreamTransport transport_;
-        SocketException exception_;
-    }
+	/// If an exception was thrown the transport should be already invalid.
+	private union
+	{
+		StreamTransport transport_;
+		SocketException exception_;
+	}
 
-    private Protocol protocol_;
+	private Protocol protocol_;
 
-    /**
-     * Returns: Underlying output buffer.
-     */
-    package ReadBuffer output;
+	/**
+	 * Returns: Underlying output buffer.
+	 */
+	package ReadBuffer!ubyte 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;
-    }
+	/**
+	 * Params:
+	 * 	transport = Transport.
+	 * 	protocol  = New instance of the application protocol.
+	 */
+	this(StreamTransport transport, Protocol protocol) @nogc
+	in
+	{
+		assert(transport !is null);
+		assert(protocol !is null);
+	}
+	body
+	{
+		super();
+		transport_ = transport;
+		protocol_ = protocol;
+		output = ReadBuffer!ubyte(8192, 1024, MmapPool.instance);
+		active = true;
+	}
 
-    /**
-     * Destroys the watcher.
-     */
-    protected ~this()
-    {
-        MmapPool.instance.dispose(output);
-        MmapPool.instance.dispose(protocol_);
-    }
+	/**
+	 * Destroys the watcher.
+	 */
+	~this() @nogc
+	{
+		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 @nogc
-    in
-    {
-        assert(transport !is null);
-        assert(protocol !is null);
-    }
-    body
-    {
-        transport_ = transport;
-        protocol_ = protocol;
-        active = true;
-        return this;
-    }
+	/**
+	 * Assigns a transport.
+	 *
+	 * Params:
+	 * 	transport = Transport.
+	 * 	protocol  = Application protocol.
+	 *
+	 * Returns: $(D_KEYWORD this).
+	 */
+	IOWatcher opCall(StreamTransport transport, Protocol protocol)
+	pure nothrow @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_;
-    }
+	/**
+	 * 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;
-    }
+	/**
+	 * 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: 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;
-    }
+	/**
+	 * 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;
-        }
-    }
+	/**
+	 * Invokes the watcher callback.
+	 */
+	override void invoke() @nogc
+	{
+		if (output.length)
+		{
+			protocol.received(output[0..$]);
+			output.clear();
+		}
+		else
+		{
+			protocol.disconnected(exception_);
+			active = false;
+		}
+	}
 }

source/tanya/container/entry.d

@@ -0,0 +1,45 @@
+/* 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.
+ * 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;
+
+version (unittest)
+{
+	package struct ConstEqualsStruct
+	{
+		int opEquals(typeof(this) that) const
+		{
+			return true;
+		}
+	}
+
+	package struct MutableEqualsStruct
+	{
+		int opEquals(typeof(this) that)
+		{
+			return true;
+		}
+	}
+
+	package struct NoEqualsStruct
+	{
+	}
+}
+
+package struct Entry(T)
+{
+	/// Item content.
+	T content;
+
+	/// Next item.
+	Entry* next;
+}

source/tanya/container/list.d

@@ -10,28 +10,17 @@
  */  
 module tanya.container.list;
 
+import tanya.container.entry;
 import tanya.memory;
 
 /**
- * Singly linked list.
+ * Singly-linked list.
  *
  * Params:
  * 	T = Content type.
  */
-class SList(T)
+struct SList(T)
 {
-	/**
-	 * Creates a new $(D_PSYMBOL SList).
-	 *
-	 * Params:
-	 * 	allocator = The allocator should be used for the element
-	 * 	            allocations.
-	 */
-	this(IAllocator allocator = theAllocator)
-	{
-		this.allocator = allocator;
-	}
-
 	/**
 	 * Removes all elements from the list.
 	 */
@@ -41,7 +30,7 @@ class SList(T)
 	}
 
 	/**
-	 * Remove all contents from the $(D_PSYMBOL SList).
+	 * Removes all contents from the list.
 	 */
 	void clear()
 	{
@@ -54,14 +43,12 @@ class SList(T)
 	///
 	unittest
 	{
-		auto l = make!(SList!int)(theAllocator);
+		SList!int l;
 
 		l.insertFront(8);
 		l.insertFront(5);
 		l.clear();
 		assert(l.empty);
-
-		dispose(theAllocator, l);
 	}
 
 	/**
@@ -83,35 +70,39 @@ class SList(T)
 	 * Params:
 	 * 	x = New element.
 	 */
-	void insertFront(T x)
+	void insertFront(ref T x)
 	{
-		Entry* temp = make!Entry(allocator);
+		auto temp = allocator.make!(Entry!T);
 		
 		temp.content = x;
 		temp.next = first.next;
 		first.next = temp;
 	}
 
+	/// Ditto.
+	void insertFront(T x)
+	{
+		insertFront(x);
+	}
+
 	/// Ditto.
 	alias insert = insertFront;
 
 	///
 	unittest
 	{
-		auto l = make!(SList!int)(theAllocator);
+		SList!int l;
 
 		l.insertFront(8);
 		assert(l.front == 8);
 		l.insertFront(9);
 		assert(l.front == 9);
-
-		dispose(theAllocator, l);
 	}
 
 	/**
 	 * Returns: $(D_KEYWORD true) if the list is empty.
 	 */
-	@property bool empty() inout const
+	@property bool empty() const
 	{
 		return first.next is null;
 	}
@@ -121,7 +112,7 @@ class SList(T)
 	 *
 	 * Returns: The first element.
 	 */
-	T popFront()
+	void popFront()
 	in
 	{
 		assert(!empty);
@@ -129,26 +120,21 @@ class SList(T)
 	body
 	{
 		auto n = first.next.next;
-		auto content = first.next.content;
 
-		dispose(allocator, first.next);
+		allocator.dispose(first.next);
 		first.next = n;
-
-		return content;
 	}
 
 	///
 	unittest
 	{
-		auto l = make!(SList!int)(theAllocator);
+		SList!int l;
 
 		l.insertFront(8);
 		l.insertFront(9);
 		assert(l.front == 9);
 		l.popFront();
 		assert(l.front == 8);
-
-		dispose(theAllocator, l);
 	}
 
 	/**
@@ -179,7 +165,7 @@ class SList(T)
 	///
 	unittest
 	{
-		auto l = make!(SList!int)(theAllocator);
+		SList!int l;
 
 		l.insertFront(8);
 		l.insertFront(5);
@@ -188,8 +174,6 @@ class SList(T)
 		assert(l.removeFront(2) == 2);
 		assert(l.removeFront(3) == 1);
 		assert(l.removeFront(3) == 0);
-
-		dispose(theAllocator, l);
 	}
 
 	/**
@@ -235,7 +219,7 @@ class SList(T)
 	///
 	unittest
 	{
-		auto l = make!(SList!int)(theAllocator);
+		SList!int l;
 
 		l.insertFront(5);
 		l.insertFront(4);
@@ -246,32 +230,18 @@ class SList(T)
 			assert(i != 1 || e == 4);
 			assert(i != 2 || e == 5);
 		}
-		dispose(theAllocator, l);
-	}
-
-	/**
-	 * List entry.
-	 */
-	protected struct Entry
-	{
-		/// List item content.
-		T content;
-
-		/// Next list item.
-		Entry* next;
 	}
 
 	/// 0th element of the list.
-	protected Entry first;
+	private Entry!T first;
 
-	/// Allocator.
-	protected IAllocator allocator;
+	mixin DefaultAllocator;
 }
 
 ///
 unittest
 {
-	auto l = make!(SList!int)(theAllocator);
+	SList!int l;
 	size_t i;
 
 	l.insertFront(5);
@@ -285,8 +255,6 @@ unittest
 		++i;
 	}
 	assert(i == 3);
-
-	dispose(theAllocator, l);
 }
 
 private unittest
@@ -294,8 +262,5 @@ private unittest
 	interface Stuff
 	{
 	}
-
-	auto l = make!(SList!Stuff)(theAllocator);
-
-	dispose(theAllocator, l);
+	static assert(is(SList!Stuff));
 }

source/tanya/container/package.d

@@ -10,7 +10,6 @@
  */  
 module tanya.container;
 
-public import tanya.container.bit;
 public import tanya.container.buffer;
 public import tanya.container.list;
 public import tanya.container.vector;

source/tanya/container/queue.d

@@ -6,32 +6,22 @@
  * 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)
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
  */  
 module tanya.container.queue;
 
+import tanya.container.entry;
+import std.traits;
 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(IAllocator allocator = theAllocator)
-	{
-		this.allocator = allocator;
-	}
-
 	/**
 	 * Removes all elements from the queue.
 	 */
@@ -54,15 +44,147 @@ class Queue(T)
 	///
 	unittest
 	{
-		auto q = theAllocator.make!(Queue!int);
+		Queue!int q;
 
 		assert(q.empty);
 		q.insertBack(8);
 		q.insertBack(9);
 		q.clear();
 		assert(q.empty);
+	}
 
-		theAllocator.dispose(q);
+	/**
+	 * 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.
+	 */
+	size_t length() const
+	{
+		size_t len;
+		for (const(Entry!T)* i = first.next; i !is null; i = i.next)
+		{
+			++len;
+		}
+		return len;
+	}
+
+	///
+	unittest
+	{
+		Queue!int q;
+
+		assert(q.length == 0);
+		q.insertBack(5);
+		assert(q.length == 1);
+		q.insertBack(4);
+		assert(q.length == 2);
+		q.insertBack(9);
+		assert(q.length == 3);
+
+		q.popFront();
+		assert(q.length == 2);
+		q.popFront();
+		assert(q.length == 1);
+		q.popFront();
+		assert(q.length == 0);
+	}
+
+	version (D_Ddoc)
+	{
+		/**
+		 * Compares two queues. Checks if all elements of the both queues are equal.
+		 *
+		 * Returns: Whether $(D_KEYWORD this) and $(D_PARAM that) are equal.
+		 */
+		int opEquals(ref typeof(this) that);
+
+		/// Ditto.
+		int opEquals(typeof(this) that);
+	}
+	else static if (!hasMember!(T, "opEquals")
+	             || (functionAttributes!(T.opEquals) & FunctionAttribute.const_))
+	{
+		bool opEquals(in ref typeof(this) that) const
+		{
+			const(Entry!T)* i = first.next;
+			const(Entry!T)* j = that.first.next;
+			while (i !is null && j !is null)
+			{
+				if (i.content != j.content)
+				{
+					return false;
+				}
+				i = i.next;
+				j = j.next;
+			}
+			return i is null && j is null;
+		}
+
+		/// Ditto.
+		bool opEquals(in typeof(this) that) const
+		{
+			return opEquals(that);
+		}
+	}
+	else
+	{
+		/**
+		 * Compares two queues. Checks if all elements of the both queues are equal.
+		 *
+		 * Returns: How many elements are in the queue.
+		 */
+		bool opEquals(ref typeof(this) that)
+		{
+			Entry!T* i = first.next;
+			Entry!T* j = that.first.next;
+			while (i !is null && j !is null)
+			{
+				if (i.content != j.content)
+				{
+					return false;
+				}
+				i = i.next;
+				j = j.next;
+			}
+			return i is null && j is null;
+		}
+
+		/// Ditto.
+		bool opEquals(typeof(this) that)
+		{
+			return opEquals(that);
+		}
+	}
+
+	///
+	unittest
+	{
+		Queue!int q1, q2;
+
+		q1.insertBack(5);
+		q1.insertBack(4);
+		q2.insertBack(5);
+		assert(q1 != q2);
+		q2.insertBack(4);
+		assert(q1 == q2);
+
+		q2.popFront();
+		assert(q1 != q2);
+
+		q1.popFront();
+		assert(q1 == q2);
+
+		q1.popFront();
+		q2.popFront();
+		assert(q1 == q2);
+	}
+
+	private unittest
+	{
+		static assert(is(Queue!ConstEqualsStruct));
+		static assert(is(Queue!MutableEqualsStruct));
+		static assert(is(Queue!NoEqualsStruct));
 	}
 
 	/**
@@ -84,9 +206,9 @@ class Queue(T)
 	 * Params:
 	 * 	x = New element.
 	 */
-	void insertBack(T x)
+	void insertBack(ref T x)
 	{
-		Entry* temp = make!Entry(allocator);
+		auto temp = allocator.make!(Entry!T);
 		
 		temp.content = x;
 
@@ -101,27 +223,31 @@ class Queue(T)
 		}
 	}
 
+	/// Ditto.
+	void insertBack(T x)
+	{
+		insertBack(x);
+	}
+
 	/// Ditto.
 	alias insert = insertBack;
 
 	///
 	unittest
 	{
-		auto q = make!(Queue!int)(theAllocator);
+		Queue!int q;
 
 		assert(q.empty);
 		q.insertBack(8);
 		assert(q.front == 8);
 		q.insertBack(9);
 		assert(q.front == 8);
-
-		dispose(theAllocator, q);
 	}
 
 	/**
 	 * Returns: $(D_KEYWORD true) if the queue is empty.
 	 */
-	@property bool empty() inout const
+	@property bool empty() const
 	{
 		return first.next is null;
 	}
@@ -129,14 +255,12 @@ class Queue(T)
 	///
 	unittest
 	{
-		auto q = make!(Queue!int)(theAllocator);
+		Queue!int q;
 		int value = 7;
 
 		assert(q.empty);
 		q.insertBack(value);
 		assert(!q.empty);
-
-		dispose(theAllocator, q);
 	}
 
 	/**
@@ -146,6 +270,7 @@ class Queue(T)
 	in
 	{
 		assert(!empty);
+		assert(allocator !is null);
 	}
 	body
 	{
@@ -158,24 +283,23 @@ class Queue(T)
 	///
 	unittest
 	{
-		auto q = make!(Queue!int)(theAllocator);
+		Queue!int q;
 
 		q.insertBack(8);
 		q.insertBack(9);
 		assert(q.front == 8);
 		q.popFront();
 		assert(q.front == 9);
-
-		dispose(theAllocator, q);
 	}
 
 	/**
-	 * $(D_KEYWORD foreach) iteration.
+	 * $(D_KEYWORD foreach) iteration. The elements will be automatically
+	 * dequeued.
 	 *
 	 * Params:
 	 * 	dg = $(D_KEYWORD foreach) body.
 	 */
-	int opApply(scope int delegate(ref size_t i, ref T) dg)
+	int opApply(scope int delegate(ref size_t i, ref T) @nogc dg)
 	{
 		int result;
 
@@ -191,7 +315,7 @@ class Queue(T)
 	}
 
 	/// Ditto.
-	int opApply(scope int delegate(ref T) dg)
+	int opApply(scope int delegate(ref T) @nogc dg)
 	{
 		int result;
 
@@ -209,7 +333,7 @@ class Queue(T)
 	///
 	unittest
 	{
-		auto q = theAllocator.make!(Queue!int);
+		Queue!int q;
 
 		size_t j;
 		q.insertBack(5);
@@ -238,36 +362,21 @@ class Queue(T)
 		}
 		assert(j == 3);
 		assert(q.empty);
-
-		dispose(theAllocator, q);
-	}
-
-	/**
-	 * Queue entry.
-	 */
-	protected struct Entry
-	{
-		/// Queue item content.
-		T content;
-
-		/// Next list item.
-		Entry* next;
 	}
 
 	/// The first element of the list.
-	protected Entry first;
+	private Entry!T first;
 
 	/// The last element of the list.
-	protected Entry* rear;
+	private Entry!T* rear;
 
-	/// The allocator.
-	protected IAllocator allocator;
+	mixin DefaultAllocator;
 }
 
 ///
 unittest
 {
-	auto q = theAllocator.make!(Queue!int);
+	Queue!int q;
 
 	q.insertBack(5);
 	assert(!q.empty);
@@ -287,6 +396,4 @@ unittest
 		assert(i != 1 || e == 9);
 	}
 	assert(q.empty);
-
-	theAllocator.dispose(q);
 }

source/tanya/crypto/bit.d

@@ -8,7 +8,7 @@
  *                  Mozilla Public License, v. 2.0).
  * Authors: $(LINK2 mailto:belka@caraus.de, Eugene Wissner)
  */
-module tanya.container.bit;
+module tanya.crypto.bit;
 
 /**
  * Wrapper that allows bit manipulation on $(D_KEYWORD ubyte[]) array.

source/tanya/crypto/des.d

@@ -10,7 +10,7 @@
  */
 module tanya.crypto.des;
 
-import tanya.container.bit;
+import tanya.crypto.bit;
 import tanya.crypto.symmetric;
 
 /// Initial permutation table.

source/tanya/crypto/mode.d

@@ -20,260 +20,260 @@ import std.typecons;
  * Supported padding mode.
  *
  * See_Also:
- *     $(D_PSYMBOL pad)
+ * 	$(D_PSYMBOL pad)
  */
 enum PaddingMode
 {
-    zero,
-    pkcs7,
-    ansiX923,
+	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).
+ * 	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)
+ * 	$(D_PSYMBOL PaddingMode)
  */
 ubyte[] pad(ref ubyte[] input,
             in PaddingMode mode,
             in ushort blockSize,
-            IAllocator allocator = theAllocator)
+            shared Allocator allocator = defaultAllocator)
 in
 {
-    assert(blockSize > 0 && blockSize <= 256);
-    assert(blockSize % 64 == 0);
-    assert(input.length > 0);
+	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);
+	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;
-    }
+	final switch (mode) with (PaddingMode)
+	{
+		case zero:
+			allocator.resizeArray(input, input.length + needed);
+			break;
+		case pkcs7:
+			if (needed)
+			{
+				allocator.resizeArray(input, input.length + needed);
+				input[input.length - needed ..$].each!((ref e) => e = needed);
+			}
+			else
+			{
+				allocator.resizeArray(input, input.length + blockSize);
+			}
+			break;
+		case ansiX923:
+			allocator.resizeArray(input, input.length + (needed ? needed : blockSize));
+			input[$ - 1] = needed;
+			break;
+	}
 
-    return input;
+	return input;
 }
 
 ///
 unittest
 {
-    { // Zeros
-        auto input = theAllocator.makeArray!ubyte(50);
+	{ // 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);
 
-        pad(input, PaddingMode.zero, 64);
-        assert(input.length == 64);
-        assert(input[63] == 0);
+		pad(input, PaddingMode.zero, 64);
+		assert(input.length == 64);
+		assert(input[63] == 0);
 
-        theAllocator.dispose(input);
-    }
-    { // PKCS#7
-        auto input = theAllocator.makeArray!ubyte(50);
-        for (ubyte i; i < 40; ++i)
-        {
-            input[i] = i;
-        }
+		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 == 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);
-            }
-        }
+		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);
+			}
+		}
 
-        theAllocator.dispose(input);
-    }
-    { // ANSI X.923
-        auto input = theAllocator.makeArray!ubyte(50);
-        for (ubyte i; i < 40; ++i)
-        {
-            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.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);
-            }
-        }
+		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);
+			}
+		}
 
-        theAllocator.dispose(input);
-    }
+		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).
+ * 	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)
+ * 	$(D_PSYMBOL pad)
  */
 ref ubyte[] unpad(ref ubyte[] input,
                   in PaddingMode mode,
                   in ushort blockSize,
-                  IAllocator allocator = theAllocator)
+                  shared Allocator allocator = defaultAllocator)
 in
 {
-    assert(input.length != 0);
-    assert(input.length % 64 == 0);
+	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];
+	final switch (mode) with (PaddingMode)
+	{
+		case zero:
+			break;
+		case pkcs7:
+		case ansiX923:
+			immutable last = input[$ - 1];
 
-            allocator.shrinkArray(input, last ? last : blockSize);
-            break;
-    }
+			allocator.resizeArray(input, input.length - (last ? last : blockSize));
+			break;
+	}
 
-    return input;
+	return input;
 }
 
 ///
 unittest
 {
-    { // Zeros
-        auto input = theAllocator.makeArray!ubyte(50);
-        auto inputDup = theAllocator.makeArray!ubyte(50);
+	{ // Zeros
+		auto input = defaultAllocator.makeArray!ubyte(50);
+		auto inputDup = defaultAllocator.makeArray!ubyte(50);
 
-        pad(input, PaddingMode.zero, 64);
-        pad(inputDup, PaddingMode.zero, 64);
+		pad(input, PaddingMode.zero, 64);
+		pad(inputDup, PaddingMode.zero, 64);
 
-        unpad(input, PaddingMode.zero, 64);
-        assert(input == inputDup);
+		unpad(input, PaddingMode.zero, 64);
+		assert(input == inputDup);
 
-        theAllocator.dispose(input);
-        theAllocator.dispose(inputDup);
+		defaultAllocator.dispose(input);
+		defaultAllocator.dispose(inputDup);
 
-    }
-    { // PKCS#7
-        auto input = theAllocator.makeArray!ubyte(50);
-        auto inputDup = theAllocator.makeArray!ubyte(50);
-        for (ubyte i; i < 40; ++i)
-        {
-            input[i] = i;
-            inputDup[i] = i;
-        }
+	}
+	{ // 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);
+		pad(input, PaddingMode.pkcs7, 64);
+		unpad(input, PaddingMode.pkcs7, 64);
+		assert(input == inputDup);
 
-        theAllocator.dispose(input);
-        theAllocator.dispose(inputDup);
-    }
-    { // ANSI X.923
-        auto input = theAllocator.makeArray!ubyte(50);
-        auto inputDup = theAllocator.makeArray!ubyte(50);
-        for (ubyte i; i < 40; ++i)
-        {
-            input[i] = i;
-            inputDup[i] = i;
-        }
+		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);
+		pad(input, PaddingMode.pkcs7, 64);
+		unpad(input, PaddingMode.pkcs7, 64);
+		assert(input == inputDup);
 
-        theAllocator.dispose(input);
-        theAllocator.dispose(inputDup);
-    }
+		defaultAllocator.dispose(input);
+		defaultAllocator.dispose(inputDup);
+	}
 }

source/tanya/crypto/package.d

@@ -10,9 +10,7 @@
  */
 module tanya.crypto;
 
-public
-{
-    import tanya.crypto.des;
-    import tanya.crypto.mode;
-    import tanya.crypto.symmetric;
-}
+public import tanya.crypto.bit;
+public import tanya.crypto.des;
+public import tanya.crypto.mode;
+public import tanya.crypto.symmetric;

source/tanya/enums.d

@@ -0,0 +1,49 @@
+/* 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/. */
+
+/**
+ * Generic enum templates.
+ *
+ * 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.enums;
+
+import std.traits;
+
+/**
+ * Initializer list.
+ *
+ * Generates a static array with elements from $(D_PARAM args). All elements
+ * should have the same type. It can be used in constructors which accept a
+ * list of the elements of the same type in the situations where variadic
+ * functions and templates can't be used.
+ *
+ * Params:
+ * 	Args = Argument type.
+ * 	args = Arguments.
+ */
+enum IL(Args...)(Args args)
+	if (Args.length > 0)
+{
+	alias BaseType = typeof(args[0]);
+
+	BaseType[args.length] result;
+
+	foreach (i, a; args)
+	{
+		static assert(isImplicitlyConvertible!(typeof(a), BaseType));
+		result[i] = a;
+	}
+	return result;
+}
+
+///
+unittest
+{
+	static assert(IL(1, 5, 8).length == 3);
+	static assert(IL(1, 5, 8).sizeof == 3 * int.sizeof);
+}

source/tanya/math/package.d

@@ -10,7 +10,9 @@
  */  
 module tanya.math;
 
+import std.traits;
 public import tanya.math.mp;
+public import tanya.math.random;
 
 version (unittest)
 {
@@ -20,26 +22,32 @@ version (unittest)
 /**
  * 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)
  */
-ulong pow(ulong x, ulong y, ulong z) nothrow pure @safe @nogc
+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);
-}
-out (result)
-{
-	assert(result >= 0);
+	assert(z > 0, "Division by zero.");
 }
 body
 {
-    ulong mask = ulong.max / 2 + 1, result;
+	G mask = G.max / 2 + 1;
+	H result;
 
 	if (y == 0)
 	{
@@ -49,40 +57,92 @@ body
 	{
 		return x % z;
 	}
-    do
-    {
-        auto bit = y & mask;
-        if (!result && bit)
-        {
-            result = x;
-            continue;
-        }
+	do
+	{
+		immutable bit = y & mask;
+		if (!result && bit)
+		{
+			result = x;
+			continue;
+		}
 
-        result *= result;
-        if (bit)
-        {
-            result *= x;
-        }
-        result %= z;
-
-    }
-    while (mask >>= 1);
+		result *= result;
+		if (bit)
+		{
+			result *= x;
+		}
+		result %= z;
+	}
+	while (mask >>= 1);
 
 	return result;
 }
 
+/// Ditto.
+I pow(I)(in auto ref I x, in auto ref I y, in auto ref I z)
+	if (is(I == Integer))
+in
+{
+	assert(z.length > 0, "Division by zero.");
+}
+body
+{
+	size_t i = y.length;
+	auto tmp2 = Integer(x.allocator), tmp1 = Integer(x, x.allocator);
+	Integer result = Integer(x.allocator);
+
+	if (x.length == 0 && i != 0)
+	{
+		i = 0;
+	}
+	else
+	{
+		result = 1;
+	}
+	while (i)
+	{
+		--i;
+		for (ubyte mask = 0x01; mask; mask <<= 1)
+		{
+			if (y.rep[i] & mask)
+			{
+				result *= tmp1;
+				result %= z;
+			}
+			tmp2 = tmp1;
+			tmp1 *= tmp2;
+			tmp1 %= z;
+		}
+	}
+	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(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);
+	assert(cast(long) pow(Integer(3), Integer(5), Integer(7)) == 5);
+	assert(cast(long) pow(Integer(2), Integer(2), Integer(1)) == 0);
+	assert(cast(long) pow(Integer(3), Integer(3), Integer(3)) == 0);
+	assert(cast(long) pow(Integer(7), Integer(4), Integer(2)) == 1);
+	assert(cast(long) pow(Integer(53), Integer(0), Integer(2)) == 1);
+	assert(cast(long) pow(Integer(53), Integer(1), Integer(3)) == 2);
+	assert(cast(long) pow(Integer(53), Integer(2), Integer(5)) == 4);
+	assert(cast(long) pow(Integer(0), Integer(0), Integer(5)) == 1);
+	assert(cast(long) pow(Integer(0), Integer(5), Integer(5)) == 0);
 }
 
 /**
@@ -103,7 +163,7 @@ bool isPseudoprime(ulong x) nothrow pure @safe @nogc
 unittest
 {
 	uint[30] known = [74623, 74653, 74687, 74699, 74707, 74713, 74717, 74719,
-                      74843, 74747, 74759, 74761, 74771, 74779, 74797, 74821,
+	                  74843, 74747, 74759, 74761, 74771, 74779, 74797, 74821,
 	                  74827, 9973, 104729, 15485867, 49979693, 104395303,
 	                  593441861, 104729, 15485867, 49979693, 104395303,
 	                  593441861, 899809363, 982451653];

source/tanya/math/random.d

@@ -3,16 +3,18 @@
  * 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:belka@caraus.de, Eugene Wissner)
  */  
-module tanya.random;
+module tanya.math.random;
 
-import tanya.memory;
 import std.digest.sha;
 import std.typecons;
+import tanya.memory;
 
 /// Block size of entropy accumulator (SHA-512).
 enum blockSize = 64;
@@ -148,13 +150,13 @@ version (linux)
 /**
  * Pseudorandom number generator.
  * ---
- * auto entropy = theAllocator.make!Entropy;
+ * auto entropy = defaultAllocator.make!Entropy();
  *
  * ubyte[blockSize] output;
  *
  * output = entropy.random;
  *
- * theAllocator.finalize(entropy);
+ * defaultAllocator.finalize(entropy);
  * ---
  */
 class Entropy
@@ -164,7 +166,7 @@ class Entropy
 
 	private ubyte sourceCount_;
 
-	private IAllocator allocator;
+	private shared Allocator allocator;
 
 	/// Entropy accumulator.
 	protected SHA!(maxGather * 8, 512) accumulator;
@@ -175,7 +177,7 @@ class Entropy
 	 * 	allocator  = Allocator to allocate entropy sources available on the
 	 * 	             system.
 	 */
-	this(size_t maxSources = 20, IAllocator allocator = theAllocator)
+	this(size_t maxSources = 20, shared Allocator allocator = defaultAllocator)
 	in
 	{
 		assert(maxSources > 0 && maxSources <= ubyte.max);

source/tanya/memory/allocator.d

@@ -10,173 +10,107 @@
  */
 module tanya.memory.allocator;
 
-import std.experimental.allocator;
-import std.traits;
-import std.typecons;
-
 /**
  * Abstract class implementing a basic allocator.
  */
-abstract class Allocator : IAllocator
+interface Allocator
 {
-    /**
-     * Not supported.
-     *
-     * Returns: $(D_KEYWORD false).
-     */
-    bool deallocateAll() const @nogc @safe pure nothrow
-    {
-        return false;
-    }
+	/**
+	 * Returns: Alignment.
+	 */
+	@property uint alignment() const shared pure nothrow @safe @nogc;
 
-    /**
-     * Not supported.
-     *
-     * Returns $(D_PSYMBOL Ternary.unknown).
-     */
-    Ternary empty() const @nogc @safe pure nothrow
-    {
-        return Ternary.unknown;
-    }
+	/**
+	 * Allocates $(D_PARAM size) bytes of memory.
+	 *
+	 * Params:
+	 * 	size = Amount of memory to allocate.
+	 *
+	 * Returns: Pointer to the new allocated memory.
+	 */
+	void[] allocate(size_t size) shared nothrow @nogc;
 
-    /**
-     * Not supported.
-     *
-     * Params:
-     *     b = Memory block.
-     * 
-     * Returns: $(D_PSYMBOL Ternary.unknown).
-     */
-    Ternary owns(void[] b) const @nogc @safe pure nothrow
-    {
-        return Ternary.unknown;
-    }
+	/**
+	 * Deallocates a memory block.
+	 *
+	 * Params:
+	 * 	p = A pointer to the memory block to be freed.
+	 *
+	 * Returns: Whether the deallocation was successful.
+	 */
+	bool deallocate(void[] p) shared nothrow @nogc;
 
-    /**
-     * Not supported.
-     *
-     * Params:
-     *     p      = Pointer to a memory block.
-     *     result = Full block allocated.
-     *
-     * Returns: $(D_PSYMBOL Ternary.unknown).
-     */
-    Ternary resolveInternalPointer(void* p, ref void[] result)
-    const @nogc @safe pure nothrow
-    {
-        return Ternary.unknown;
-    }
-
-    /**
-     * Params:
-     *     size = Amount of memory to allocate.
-     *
-     * Returns: The good allocation size that guarantees zero internal
-     *          fragmentation.
-     */
-    size_t goodAllocSize(size_t s)
-    {
-        auto rem = s % alignment;
-        return rem ? s + alignment - rem : s;
-    }
-
-    /**
-     * Not supported.
-     * 
-     * Returns: $(D_KEYWORD null).
-     *
-     */
-    void[] allocateAll() const @nogc @safe pure nothrow
-    {
-        return null;
-    }
-
-    /**
-     * Not supported.
-     * 
-     * Params:
-     *     b = Block to be expanded.
-     *     s = New size.
-     *
-     * Returns: $(D_KEYWORD false).
-     */
-    bool expand(ref void[] b, size_t s) const @nogc @safe pure nothrow
-    {
-        return false;
-    }
-
-    /**
-     * Not supported.
-     *
-     * Params:
-     *     n = Amount of memory to allocate.
-     *     a = Alignment.
-     *
-     * Returns: $(D_KEYWORD null).
-     */
-    void[] alignedAllocate(size_t n, uint a) const @nogc @safe pure nothrow
-    {
-        return null;
-    }
-
-    /**
-     * Not supported.
-     *
-     * Params:
-     *     n = Amount of memory to allocate.
-     *     a = Alignment.
-     *
-     * Returns: $(D_KEYWORD false).
-     */
-    bool alignedReallocate(ref void[] b, size_t size, uint alignment)
-    const @nogc @safe pure nothrow
-    {
-        return false;
-    }
+	/**
+	 * Increases or decreases the size of a memory block.
+	 *
+	 * Params:
+	 * 	p    = A pointer to the memory block.
+	 * 	size = Size of the reallocated block.
+	 *
+	 * Returns: Pointer to the allocated memory.
+	 */
+	bool reallocate(ref void[] p, size_t size) shared nothrow @nogc;
 }
 
 /**
- * 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_KEYWORD true) upon success, $(D_KEYWORD false) if memory could
- *          not be reallocated. In the latter
+ * 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).
  */
-bool resizeArray(T)(IAllocator allocator,
-                    ref T[] array,
-                    in size_t length)
+mixin template DefaultAllocator()
 {
-    void[] buf = array;
+	/// Allocator.
+	protected shared Allocator allocator_;
 
-    if (!allocator.reallocate(buf, length * T.sizeof))
-    {
-        return false;
-    }
-    array = cast(T[]) buf;
+	/**
+	 * Params:
+	 * 	allocator = The allocator should be used.
+	 */
+	this(shared Allocator allocator)
+	in
+	{
+		assert(allocator !is null);
+	}
+	body
+	{
+		this.allocator_ = allocator;
+	}
 
-    return true;
+	/**
+	 * 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_;
+	}
 }
-
-///
-unittest
-{
-    int[] p;
-
-    theAllocator.resizeArray(p, 20);
-    assert(p.length == 20);
-
-    theAllocator.resizeArray(p, 30);
-    assert(p.length == 30);
-
-    theAllocator.resizeArray(p, 10);
-    assert(p.length == 10);
-
-    theAllocator.resizeArray(p, 0);
-    assert(p is null);
-}
-
-enum bool isFinalizable(T) = is(T == class) || is(T == interface)
-                           || hasElaborateDestructor!T || isDynamicArray!T;

source/tanya/memory/mmappool.d

@@ -16,14 +16,14 @@ import core.exception;
 
 version (Posix)
 {
-    import core.stdc.errno;
-    import core.sys.posix.sys.mman;
-    import core.sys.posix.unistd;
+	import core.stdc.errno;
+	import core.sys.posix.sys.mman;
+	import core.sys.posix.unistd;
 }
 else version (Windows)
 {
-    import core.sys.windows.winbase;
-    import core.sys.windows.windows;
+	import core.sys.windows.winbase;
+	import core.sys.windows.windows;
 }
 
 /**
@@ -47,439 +47,429 @@ else version (Windows)
  * |  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();
+@nogc:
+	shared static this()
+	{
+		version (Posix)
+		{
+			pageSize = sysconf(_SC_PAGE_SIZE);
+		}
+		else version (Windows)
+		{
+			SYSTEM_INFO si;
+			GetSystemInfo(&si);
+			pageSize = si.dwPageSize;
+		}
+	}
 
-    shared static this()
-    {
-        version (Posix)
-        {
-            pageSize = sysconf(_SC_PAGE_SIZE);
-        }
-        else version (Windows)
-        {
-            SYSTEM_INFO si;
-            GetSystemInfo(&si);
-            pageSize = si.dwPageSize;
-        }
-    }
+	/**
+	 * Allocates $(D_PARAM size) bytes of memory.
+	 *
+	 * Params:
+	 * 	size = Amount of memory to allocate.
+	 *
+	 * Returns: Pointer to the new allocated memory.
+	 */
+	void[] allocate(size_t size) shared nothrow
+	{
+		if (!size)
+		{
+			return null;
+		}
+		immutable dataSize = addAlignment(size);
 
-    /**
-     * Allocates $(D_PARAM size) bytes of memory.
-     *
-     * Params:
-     *     size = Amount of memory to allocate.
-     *
-     * Returns: The pointer to the new allocated memory.
-     */
-    void[] allocate(size_t size, TypeInfo ti = null) @nogc @trusted nothrow
-    {
-        if (!size)
-        {
-            return null;
-        }
-        immutable dataSize = addAlignment(size);
+		void* data = findBlock(dataSize);
+		if (data is null)
+		{
+			data = initializeRegion(dataSize);
+		}
 
-        void* data = findBlock(dataSize);
-        if (data is null)
-        {
-            data = initializeRegion(dataSize);
-        }
+		return data is null ? null : data[0..size];
+	}
 
-        return data is null ? null : data[0..size];
-    }
+	///
+	nothrow unittest
+	{
+		auto p = MmapPool.instance.allocate(20);
 
-    ///
-    @nogc @safe nothrow unittest
-    {
-        auto p = MmapPool.instance.allocate(20);
+		assert(p);
 
-        assert(p);
+		MmapPool.instance.deallocate(p);
+	}
 
-        MmapPool.instance.deallocate(p);
-    }
+	/**
+	 * Search for a block large enough to keep $(D_PARAM size) and split it
+	 * into two blocks if the block is too large.
+	 *
+	 * Params:
+	 * 	size = Minimum size the block should have.
+	 *
+	 * Returns: Data the block points to or $(D_KEYWORD null).
+	 */
+	private void* findBlock(size_t size) shared nothrow
+	{
+		Block block1;
+		RegionLoop: for (auto r = head; r !is null; r = r.next)
+		{
+			block1 = cast(Block) (cast(void*) r + regionEntrySize);
+			do
+			{
+				if (block1.free && block1.size >= size)
+				{
+					break RegionLoop;
+				}
+			}
+			while ((block1 = block1.next) !is null);
+		}
+		if (block1 is null)
+		{
+			return null;
+		}
+		else if (block1.size >= size + alignment + blockEntrySize)
+		{ // Split the block if needed
+			Block block2 = cast(Block) (cast(void*) block1 + blockEntrySize + size);
+			block2.prev = block1;
+			if (block1.next is null)
+			{
+				block2.next = null;
+			}
+			else
+			{
+				block2.next = block1.next.next;
+			}
+			block1.next = block2;
 
-    /**
-     * Search for a block large enough to keep $(D_PARAM size) and split it
-     * into two blocks if the block is too large.
-     *
-     * Params:
-     *     size = Minimum size the block should have.
-     *
-     * Returns: Data the block points to or $(D_KEYWORD null).
-     */
-    private void* findBlock(size_t size) @nogc nothrow
-    {
-        Block block1;
-        RegionLoop: for (auto r = head; r !is null; r = r.next)
-        {
-            block1 = cast(Block) (cast(void*) r + regionEntrySize);
-            do
-            {
-                if (block1.free && block1.size >= size)
-                {
-                    break RegionLoop;
-                }
-            }
-            while ((block1 = block1.next) !is null);
-        }
-        if (block1 is null)
-        {
-            return null;
-        }
-        else if (block1.size >= size + alignment + blockEntrySize)
-        { // Split the block if needed
-            Block block2 = cast(Block) (cast(void*) block1 + blockEntrySize + size);
-            block2.prev = block1;
-            if (block1.next is null)
-            {
-                block2.next = null;
-            }
-            else
-            {
-                block2.next = block1.next.next;
-            }
-            block1.next = block2;
+			block1.free = false;
+			block2.free = true;
 
-            block1.free = false;
-            block2.free = true;
+			block2.size = block1.size - blockEntrySize - size;
+			block1.size = size;
 
-            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);
+		}
+		return cast(void*) block1 + blockEntrySize;
+	}
 
-            block2.region = block1.region;
-            atomicOp!"+="(block1.region.blocks, 1);
-        }
-        else
-        {
-            block1.free = false;
-            atomicOp!"+="(block1.region.blocks, 1);
-        }
-        return cast(void*) block1 + blockEntrySize;
-    }
+	/**
+	 * Deallocates a memory block.
+	 *
+	 * Params:
+	 * 	p = A pointer to the memory block to be freed.
+	 *
+	 * Returns: Whether the deallocation was successful.
+	 */
+	bool deallocate(void[] p) shared nothrow
+	{
+		if (p is null)
+		{
+			return true;
+		}
 
-    /**
-     * Deallocates a memory block.
-     *
-     * Params:
-     *     p = A pointer to the memory block to be freed.
-     *
-     * Returns: Whether the deallocation was successful.
-     */
-    bool deallocate(void[] p) @nogc @trusted nothrow
-    {
-        if (p is null)
-        {
-            return true;
-        }
+		Block block = cast(Block) (p.ptr - blockEntrySize);
+		if (block.region.blocks <= 1)
+		{
+			if (block.region.prev !is null)
+			{
+				block.region.prev.next = block.region.next;
+			}
+			else // Replace the list head. It is being deallocated
+			{
+				head = block.region.next;
+			}
+			if (block.region.next !is null)
+			{
+				block.region.next.prev = block.region.prev;
+			}
+			version (Posix)
+			{
+				return munmap(cast(void*) block.region, block.region.size) == 0;
+			}
+			version (Windows)
+			{
+				return VirtualFree(cast(void*) block.region, 0, MEM_RELEASE) == 0;
+			}
+		}
+		else
+		{
+			block.free = true;
+			atomicOp!"-="(block.region.blocks, 1);
+			return true;
+		}
+	}
 
-        Block block = cast(Block) (p.ptr - blockEntrySize);
-        if (block.region.blocks <= 1)
-        {
-            if (block.region.prev !is null)
-            {
-                block.region.prev.next = block.region.next;
-            }
-            else // Replace the list head. It is being deallocated
-            {
-                head = block.region.next;
-            }
-            if (block.region.next !is null)
-            {
-                block.region.next.prev = block.region.prev;
-            }
-            version (Posix)
-            {
-                return munmap(cast(void*) block.region, block.region.size) == 0;
-            }
-            version (Windows)
-            {
-                return VirtualFree(cast(void*) block.region, 0, MEM_RELEASE) == 0;
-            }
-        }
-        else
-        {
-            block.free = true;
-            atomicOp!"-="(block.region.blocks, 1);
-            return true;
-        }
-    }
+	///
+	nothrow unittest
+	{
+		auto p = MmapPool.instance.allocate(20);
 
-    ///
-    @nogc @safe nothrow unittest
-    {
-        auto p = MmapPool.instance.allocate(20);
+		assert(MmapPool.instance.deallocate(p));
+	}
 
-        assert(MmapPool.instance.deallocate(p));
-    }
+	/**
+	 * Increases or decreases the size of a memory block.
+	 *
+	 * Params:
+	 * 	p    = A pointer to the memory block.
+	 * 	size = Size of the reallocated block.
+	 *
+	 * Returns: Whether the reallocation was successful.
+	 */
+	bool reallocate(ref void[] p, size_t size) shared nothrow
+	{
+		void[] reallocP;
 
-    /**
-     * Increases or decreases the size of a memory block.
-     *
-     * Params:
-     *     p    = A pointer to the memory block.
-     *     size = Size of the reallocated block.
-     *
-     * Returns: Whether the reallocation was successful.
-     */
-    bool reallocate(ref void[] p, size_t size) @nogc @trusted nothrow
-    {
-        void[] reallocP;
+		if (size == p.length)
+		{
+			return true;
+		}
+		else if (size > 0)
+		{
+			reallocP = allocate(size);
+			if (reallocP is null)
+			{
+				return false;
+			}
+		}
 
-        if (size == p.length)
-        {
-            return true;
-        }
-        else if (size > 0)
-        {
-            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];
+			}
+			deallocate(p);
+		}
+		p = reallocP;
 
-        if (p !is null)
-        {
-            if (size > p.length)
-            {
-                reallocP[0..p.length] = p[0..$];
-            }
-            else if (size > 0)
-            {
-                reallocP[0..size] = p[0..size];
-            }
-            deallocate(p);
-        }
-        p = reallocP;
+		return true;
+	}
 
-        return true;
-    }
+	///
+	nothrow unittest
+	{
+		void[] p;
+		MmapPool.instance.reallocate(p, 10 * int.sizeof);
+		(cast(int[]) p)[7] = 123;
 
-    ///
-    @nogc nothrow unittest
-    {
-        void[] p;
-        MmapPool.instance.reallocate(p, 10 * int.sizeof);
-        (cast(int[]) p)[7] = 123;
+		assert(p.length == 40);
 
-        assert(p.length == 40);
+		MmapPool.instance.reallocate(p, 8 * int.sizeof);
 
-        MmapPool.instance.reallocate(p, 8 * int.sizeof);
+		assert(p.length == 32);
+		assert((cast(int[]) p)[7] == 123);
 
-        assert(p.length == 32);
-        assert((cast(int[]) p)[7] == 123);
+		MmapPool.instance.reallocate(p, 20 * int.sizeof);
+		(cast(int[]) p)[15] = 8;
 
-        MmapPool.instance.reallocate(p, 20 * int.sizeof);
-        (cast(int[]) p)[15] = 8;
+		assert(p.length == 80);
+		assert((cast(int[]) p)[15] == 8);
+		assert((cast(int[]) p)[7] == 123);
 
-        assert(p.length == 80);
-        assert((cast(int[]) p)[15] == 8);
-        assert((cast(int[]) p)[7] == 123);
+		MmapPool.instance.reallocate(p, 8 * int.sizeof);
 
-        MmapPool.instance.reallocate(p, 8 * int.sizeof);
+		assert(p.length == 32);
+		assert((cast(int[]) p)[7] == 123);
 
-        assert(p.length == 32);
-        assert((cast(int[]) p)[7] == 123);
+		MmapPool.instance.deallocate(p);
+	}
 
-        MmapPool.instance.deallocate(p);
-    }
+	/**
+	 * Static allocator instance and initializer.
+	 *
+	 * Returns: Global $(D_PSYMBOL MmapPool) instance.
+	 */
+	static @property ref shared(MmapPool) instance() nothrow
+	{
+		if (instance_ is null)
+		{
+			immutable instanceSize = addAlignment(__traits(classInstanceSize, MmapPool));
 
-    /**
-     * Static allocator instance and initializer.
-     *
-     * Returns: Global $(D_PSYMBOL MmapPool) instance.
-     */
-    static @property ref MmapPool instance() @nogc @trusted nothrow
-    {
-        if (instance_ is null)
-        {
-            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[];
+				instance_ = cast(shared MmapPool) data;
+				instance_.head = head;
+			}
+		}
+		return instance_;
+	}
 
-            Region head; // Will become soon our region list head
-            void* data = initializeRegion(instanceSize, head);
-            if (data !is null)
-            {
-                data[0..instanceSize] = typeid(MmapPool).initializer[];
-                instance_ = cast(MmapPool) data;
-                instance_.head = head;
-            }
-        }
-        return instance_;
-    }
+	///
+	nothrow unittest
+	{
+		assert(instance is instance);
+	}
 
-    ///
-    @nogc @safe nothrow unittest
-    {
-        assert(instance is instance);
-    }
+	/**
+	 * Initializes a region for one element.
+	 *
+	 * Params:
+	 * 	size = Aligned size of the first data block in the region.
+	 * 	head = Region list head.
+	 *
+	 * Returns: A pointer to the data.
+	 */
+	private static void* initializeRegion(size_t size,
+										  ref Region head) nothrow
+	{
+		immutable regionSize = calculateRegionSize(size);
+		
+		version (Posix)
+		{
+			void* p = mmap(null,
+						   regionSize,
+						   PROT_READ | PROT_WRITE,
+						   MAP_PRIVATE | MAP_ANON,
+						   -1,
+						   0);
+			if (p is MAP_FAILED)
+			{
+				if (errno == ENOMEM)
+				{
+					onOutOfMemoryError();
+				}
+				return null;
+			}
+		}
+		else version (Windows)
+		{
+			void* p = VirtualAlloc(null,
+								   regionSize,
+								   MEM_COMMIT,
+								   PAGE_READWRITE);
+			if (p is null)
+			{
+				if (GetLastError() == ERROR_NOT_ENOUGH_MEMORY)
+				{
+					onOutOfMemoryError();
+				}
+				return null;
+			}
+		}
 
-    /**
-     * Initializes a region for one element.
-     *
-     * Params:
-     *     size = Aligned size of the first data block in the region.
-     *     head = Region list head.
-     *
-     * Returns: A pointer to the data.
-     */
-    private static void* initializeRegion(size_t size,
-                                          ref Region head) @nogc nothrow
-    {
-        immutable regionSize = calculateRegionSize(size);
-        
-        version (Posix)
-        {
-            void* p = mmap(null,
-                           regionSize,
-                           PROT_READ | PROT_WRITE,
-                           MAP_PRIVATE | MAP_ANON,
-                           -1,
-                           0);
-            if (p is MAP_FAILED)
-            {
-                if (errno == ENOMEM)
-                {
-                    onOutOfMemoryError();
-                }
-                return null;
-            }
-        }
-        else version (Windows)
-        {
-            void* p = VirtualAlloc(null,
-                                   regionSize,
-                                   MEM_COMMIT,
-                                   PAGE_READWRITE);
-            if (p is null)
-            {
-                if (GetLastError() == ERROR_NOT_ENOUGH_MEMORY)
-                {
-                    onOutOfMemoryError();
-                }
-                return null;
-            }
-        }
+		Region region = cast(Region) p;
+		region.blocks = 1;
+		region.size = regionSize;
 
-        Region region = cast(Region) p;
-        region.blocks = 1;
-        region.size = regionSize;
+		// Set the pointer to the head of the region list
+		if (head !is null)
+		{
+			head.prev = region;
+		}
+		region.next = head;
+		region.prev = null;
+		head = region;
 
-        // Set the pointer to the head of the region list
-        if (head !is null)
-        {
-            head.prev = region;
-        }
-        region.next = head;
-        region.prev = null;
-        head = region;
+		// Initialize the data block
+		void* memoryPointer = p + regionEntrySize;
+		Block block1 = cast(Block) memoryPointer;
+		block1.size = size;
+		block1.free = false;
 
-        // Initialize the data block
-        void* memoryPointer = p + regionEntrySize;
-        Block block1 = cast(Block) memoryPointer;
-        block1.size = size;
-        block1.free = false;
+		// It is what we want to return
+		void* data = memoryPointer + blockEntrySize;
 
-        // It is what we want to return
-        void* data = memoryPointer + blockEntrySize;
+		// Free block after data
+		memoryPointer = data + size;
+		Block block2 = cast(Block) memoryPointer;
+		block1.prev = block2.next = null;
+		block1.next = block2;
+		block2.prev = block1;
+		block2.size = regionSize - size - regionEntrySize - blockEntrySize * 2;
+		block2.free = true;
+		block1.region = block2.region = region;
 
-        // Free block after data
-        memoryPointer = data + size;
-        Block block2 = cast(Block) memoryPointer;
-        block1.prev = block2.next = null;
-        block1.next = block2;
-        block2.prev = block1;
-        block2.size = regionSize - size - regionEntrySize - blockEntrySize * 2;
-        block2.free = true;
-        block1.region = block2.region = region;
+		return data;
+	}
 
-        return data;
-    }
+	/// Ditto.
+	private void* initializeRegion(size_t size) shared nothrow
+	{
+		return initializeRegion(size, head);
+	}
 
-    /// Ditto.
-    private void* initializeRegion(size_t size) @nogc nothrow
-    {
-        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)
+	@safe pure nothrow
+	out (result)
+	{
+		assert(result > 0);
+	}
+	body
+	{
+		return (x - 1) / alignment_ * alignment_ + alignment_;
+	}
 
-    /**
-     * 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
-    out (result)
-    {
-        assert(result > 0);
-    }
-    body
-    {
-        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)
+	@safe pure nothrow
+	out (result)
+	{
+		assert(result > 0);
+	}
+	body
+	{
+		x += regionEntrySize + blockEntrySize * 2;
+		return x / pageSize * pageSize + pageSize;
+	}
 
-    /**
-     * 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
-    out (result)
-    {
-        assert(result > 0);
-    }
-    body
-    {
-        x += regionEntrySize + blockEntrySize * 2;
-        return x / pageSize * pageSize + pageSize;
-    }
+	@property uint alignment() shared const pure nothrow @safe
+	{
+		return alignment_;
+	}
+	private enum alignment_ = 8;
 
-    @property uint alignment() const @nogc @safe pure nothrow
-    {
-        return alignment_;
-    }
-    private enum alignment_ = 8;
+	private static shared MmapPool instance_;
 
-    private static MmapPool instance_;
+	private shared static immutable size_t pageSize;
 
-    private shared static immutable size_t pageSize;
+	private shared struct RegionEntry
+	{
+		Region prev;
+		Region next;
+		uint blocks;
+		size_t size;
+	}
+	private alias Region = shared RegionEntry*;
+	private enum regionEntrySize = 32;
 
-    private shared struct RegionEntry
-    {
-        Region prev;
-        Region next;
-        uint blocks;
-        size_t size;
-    }
-    private alias Region = shared RegionEntry*;
-    private enum regionEntrySize = 32;
+	private shared Region head;
 
-    private shared Region head;
-
-    private shared struct BlockEntry
-    {
-        Block prev;
-        Block next;
-        bool free;
-        size_t size;
-        Region region;
-    }
-    private alias Block = shared BlockEntry*;
-    private enum blockEntrySize = 40;
+	private shared struct BlockEntry
+	{
+		Block prev;
+		Block next;
+		bool free;
+		size_t size;
+		Region region;
+	}
+	private alias Block = shared BlockEntry*;
+	private enum blockEntrySize = 40;
 }

source/tanya/memory/package.d

@@ -10,5 +10,225 @@
  */
 module tanya.memory;
 
+import core.exception;
+public import std.experimental.allocator : make, makeArray;
+import std.traits;
 public import tanya.memory.allocator;
-public import std.experimental.allocator;
+public import tanya.memory.types;
+
+// From druntime
+private extern (C) void _d_monitordelete(Object h, bool det) nothrow @nogc;
+
+shared Allocator allocator;
+
+shared static this() nothrow @trusted @nogc
+{
+	import tanya.memory.mmappool;
+	allocator = MmapPool.instance;
+}
+
+@property ref shared(Allocator) defaultAllocator() nothrow @safe @nogc
+{
+	return allocator;
+}
+
+@property void defaultAllocator(shared(Allocator) allocator) nothrow @safe @nogc
+{
+	.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(in size_t size, in 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
+ * throws $(D_PSYMBOL OutOfMemoryError) if $(D_PARAM Throws) is set. The new
+ * allocated part of the array is initialized only if $(D_PARAM Init) 
+ * is set. 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.
+ *      Init      = If should be initialized.
+ *      Throws    = If $(D_PSYMBOL OutOfMemoryError) should be throwsn.
+ * 	allocator = The allocator used for getting memory.
+ * 	array     = A reference to the array being changed.
+ * 	length    = New array length.
+ *
+ * Returns: $(D_KEYWORD true) upon success, $(D_KEYWORD false) if memory could
+ *          not be reallocated. In the latter
+ */
+package(tanya) bool resize(T,
+                           bool Init = true,
+                           bool Throws = true)
+                          (shared Allocator allocator,
+                           ref T[] array,
+                           in size_t length) @trusted
+{
+	void[] buf = array;
+	static if (Init)
+	{
+		immutable oldLength = array.length;
+	}
+	if (!allocator.reallocate(buf, length * T.sizeof))
+	{
+		static if (Throws)
+		{
+			onOutOfMemoryError;
+		}
+		return false;
+	}
+	// Casting from void[] is unsafe, but we know we cast to the original type.
+	array = cast(T[]) buf;
+
+	static if (Init)
+	{
+		if (oldLength < length)
+		{
+			array[oldLength .. $] = T.init;
+		}
+	}
+	return true;
+}
+package(tanya) alias resizeArray = resize;
+
+///
+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);
+}
+
+/**
+ * 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)
+{
+	static if (hasElaborateDestructor!T)
+	{
+		destroy(*p);
+	}
+	() @trusted { allocator.deallocate((cast(void*) p)[0 .. T.sizeof]); }();
+	p = null;
+}
+
+/// Ditto.
+void dispose(T)(shared Allocator allocator, auto ref T p)
+	if (is(T == class) || is(T == interface))
+{
+	if (p is null)
+	{
+		return;
+	}
+	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];
+	scope (success)
+	{
+		() @trusted { allocator.deallocate(support); }();
+		p = null;
+	}
+
+	auto ppv = cast(void**) ptr;
+	if (!*ppv)
+	{
+		return;
+	}
+	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);
+	}
+}
+
+/// Ditto.
+void dispose(T)(shared Allocator allocator, auto ref T[] array)
+{
+	static if (hasElaborateDestructor!(typeof(array[0])))
+	{
+	foreach (ref e; array)
+	{
+	    destroy(e);
+	}
+	}
+	() @trusted { allocator.deallocate(array); }();
+	array = null;
+}

source/tanya/memory/types.d

@@ -0,0 +1,457 @@
+/* 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.memory.types;
+
+import core.exception;
+import std.algorithm.comparison;
+import std.algorithm.mutation;
+import std.conv;
+import std.traits;
+import tanya.memory;
+
+/**
+ * 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))
+	{
+		private alias Payload = T;
+	}
+	else
+	{
+		private alias Payload = T*;
+	}
+
+	private class Storage
+	{
+		private Payload payload;
+		private size_t counter = 1;
+
+		private final size_t opUnary(string op)() pure nothrow @safe @nogc
+			if (op == "--" || op == "++")
+		in
+		{
+			assert(counter > 0);
+		}
+		body
+		{
+			mixin("return " ~ op ~ "counter;");
+		}
+
+		private final int opCmp(size_t counter) const pure nothrow @safe @nogc
+		{
+			if (this.counter > counter)
+			{
+				return 1;
+			}
+			else if (this.counter < counter)
+			{
+				return -1;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+
+		private final int opEquals(size_t counter) const pure nothrow @safe @nogc
+		{
+			return this.counter == counter;
+		}
+	}
+
+	private final class RefCountedStorage : Storage
+	{
+		private shared Allocator allocator;
+
+		this(shared Allocator allocator) pure nothrow @safe @nogc
+		in
+		{
+			assert(allocator !is null);
+		}
+		body
+		{
+			this.allocator = allocator;
+		}
+
+		~this() nothrow @nogc
+		{
+			allocator.dispose(payload);
+		}
+	}
+
+	private Storage storage;
+
+	invariant
+	{
+		assert(storage is null || allocator_ !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(Payload value, shared Allocator allocator = defaultAllocator)
+	{
+		this(allocator);
+		storage = allocator.make!RefCountedStorage(allocator);
+		move(value, 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 (storage !is null && !(storage.counter && --storage))
+		{
+			allocator_.dispose(storage);
+		}
+	}
+
+	/**
+	 * 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(Payload rhs)
+	{
+		if (storage is null)
+		{
+			storage = allocator.make!RefCountedStorage(allocator);
+		}
+		else if (storage > 1)
+		{
+			--storage;
+			storage = allocator.make!RefCountedStorage(allocator);
+		}
+		else if (cast(RefCountedStorage) storage is null)
+		{
+			// Created with refCounted. Always destroyed togethter with the pointer.
+			assert(storage.counter != 0);
+			allocator.dispose(storage);
+			storage = allocator.make!RefCountedStorage(allocator);
+		}
+		else
+		{
+			allocator.dispose(storage.payload);
+		}
+		move(rhs, storage.payload);
+		return this;
+	}
+
+	/// Ditto.
+	ref typeof(this) opAssign(typeof(null))
+	{
+		if (storage is null)
+		{
+			return this;
+		}
+		else if (storage > 1)
+		{
+			--storage;
+			storage = null;
+		}
+		else if (cast(RefCountedStorage) storage is null)
+		{
+			// Created with refCounted. Always destroyed togethter with the pointer.
+			assert(storage.counter != 0);
+			allocator.dispose(storage);
+			return this;
+		}
+		else
+		{
+			allocator.dispose(storage.payload);
+		}
+		return this;
+	}
+
+	/// Ditto.
+	ref typeof(this) opAssign(typeof(this) rhs)
+	{
+		swap(allocator_, rhs.allocator_);
+		swap(storage, rhs.storage);
+		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)
+{
+	class A
+	{
+		uint *destroyed;
+
+		this(ref uint destroyed) @nogc
+		{
+			this.destroyed = &destroyed;
+		}
+
+		~this() @nogc
+		{
+			++(*destroyed);
+		}
+	}
+
+	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).
+ * 	args = Constructor arguments of $(D_PARAM T).
+ * 
+ * Returns: Newly created $(D_PSYMBOL RefCounted!T).
+ */
+RefCounted!T refCounted(T, A...)(shared Allocator allocator, auto ref A args)
+	if (!is(T == interface) && !isAbstractClass!T
+         && !isArray!T && !isAssociativeArray!T)
+{
+	auto rc = typeof(return)(allocator);
+
+	immutable storageSize = alignedSize(stateSize!(RefCounted!T.Storage));
+	immutable 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);
+	}
+	return rc;
+}
+
+///
+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);
+	}
+}