Make allocators shared

source/tanya/container/buffer.d

@@ -12,8 +12,6 @@ module tanya.container.buffer;
 
 import tanya.memory;
 
-@nogc:
-
 version (unittest)
 {
 	private int fillBuffer(void* buffer,
@@ -42,7 +40,6 @@ version (unittest)
  */
 interface Buffer
 {
-@nogc:
 	/**
 	 * Returns: The size of the internal buffer.
 	 */
@@ -74,7 +71,6 @@ interface Buffer
  */
 class ReadBuffer : Buffer
 {
-@nogc:
 	/// Internal buffer.
 	protected ubyte[] _buffer;
 
@@ -87,7 +83,7 @@ class ReadBuffer : Buffer
 	/// Size by which the buffer will grow.
 	protected immutable size_t blockSize;
 
-	private Allocator allocator;
+	private shared Allocator allocator;
 
 	invariant
 	{
@@ -107,7 +103,7 @@ class ReadBuffer : Buffer
 	 */
 	this(size_t size = 8192,
 	     size_t minAvailable = 1024,
-	     Allocator allocator = defaultAllocator)
+	     shared Allocator allocator = defaultAllocator)
 	{
 		this.allocator = allocator;
 		this.minAvailable = minAvailable;
@@ -294,7 +290,6 @@ class ReadBuffer : Buffer
  */
 class WriteBuffer : Buffer
 {
-@nogc:
 	/// Internal buffer.
 	protected ubyte[] _buffer;
 
@@ -310,7 +305,7 @@ class WriteBuffer : Buffer
 	/// The position of the free area in the buffer.
 	protected size_t position;
 
-	private Allocator allocator;
+	private shared Allocator allocator;
 
 	invariant
 	{
@@ -325,7 +320,7 @@ class WriteBuffer : Buffer
 	 * 	       will grow.
 	 */
 	this(size_t size = 8192,
-	     Allocator allocator = defaultAllocator)
+	     shared Allocator allocator = defaultAllocator)
 	{
 		this.allocator = allocator;
 		blockSize = size;

source/tanya/container/list.d

@@ -20,7 +20,6 @@ import tanya.memory;
  */
 class SList(T)
 {
-@nogc:
 	/**
 	 * Creates a new $(D_PSYMBOL SList).
 	 *
@@ -28,7 +27,7 @@ class SList(T)
 	 * 	allocator = The allocator should be used for the element
 	 * 	            allocations.
 	 */
-	this(Allocator allocator = defaultAllocator)
+	this(shared Allocator allocator = defaultAllocator)
 	{
 		this.allocator = allocator;
         reset();
@@ -241,7 +240,7 @@ class SList(T)
 	 * Params:
 	 * 	dg = $(D_KEYWORD foreach) body.
 	 */
-	int opApply(int delegate(ref size_t i, ref T) @nogc dg)
+	int opApply(int delegate(ref size_t i, ref T) dg)
 	{
 		int result;
 		size_t i;
@@ -280,7 +279,7 @@ class SList(T)
 	}
 
 	/// Ditto.
-	int opApply(int delegate(ref T) @nogc dg)
+	int opApply(int delegate(ref T) dg)
 	{
 		int result;
 
@@ -389,7 +388,7 @@ class SList(T)
 	/// Current position in the list.
 	protected Entry* position;
 
-	private Allocator allocator;
+	private shared Allocator allocator;
 }
 
 interface Stuff

source/tanya/container/queue.d

@@ -20,7 +20,6 @@ import tanya.memory;
  */
 class Queue(T)
 {
-@nogc:
 	/**
 	 * Creates a new $(D_PSYMBOL Queue).
 	 *
@@ -28,7 +27,7 @@ class Queue(T)
 	 * 	allocator = The allocator should be used for the element
 	 * 	            allocations.
 	 */
-	this(Allocator allocator = defaultAllocator)
+	this(shared Allocator allocator = defaultAllocator)
 	{
 		this.allocator = allocator;
 	}
@@ -207,7 +206,7 @@ class Queue(T)
 	/// The last element of the list.
 	protected Entry* rear;
 
-	private Allocator allocator;
+	private shared Allocator allocator;
 }
 
 ///

source/tanya/container/vector.d

@@ -12,8 +12,6 @@ module tanya.container.vector;
 
 import tanya.memory;
 
-@nogc:
-
 /**
  * One dimensional array. It allocates automatically if needed.
  *
@@ -34,7 +32,6 @@ import tanya.memory;
  */
 class Vector(T)
 {
-@nogc:
 	/**
 	 * Creates a new $(D_PSYMBOL Vector).
 	 *
@@ -43,14 +40,14 @@ class Vector(T)
 	 * 	allocator = The allocator should be used for the element
 	 * 	            allocations.
 	 */
-	this(size_t length, Allocator allocator = defaultAllocator)
+	this(size_t length, shared Allocator allocator = defaultAllocator)
 	{
 		this.allocator = allocator;
 		vector = makeArray!T(allocator, length);
 	}
 
 	/// Ditto.
-	this(Allocator allocator = defaultAllocator)
+	this(shared Allocator allocator = defaultAllocator)
 	{
 		this(0, allocator);
 	}
@@ -194,7 +191,7 @@ class Vector(T)
 	 * Params:
 	 * 	dg = $(D_KEYWORD foreach) body.
 	 */
-	int opApply(int delegate(ref T) @nogc dg)
+	int opApply(int delegate(ref T) dg)
 	{
 		int result;
 
@@ -211,7 +208,7 @@ class Vector(T)
 	}
 
 	/// Ditto.
-	int opApply(int delegate(ref size_t i, ref T) @nogc dg)
+	int opApply(int delegate(ref size_t i, ref T) dg)
 	{
 		int result;
 
@@ -408,7 +405,7 @@ class Vector(T)
 	/// Container.
 	protected T[] vector;
 
-	private Allocator allocator;
+	private shared Allocator allocator;
 }
 
 ///

source/tanya/crypto/cipher.d

@@ -43,7 +43,7 @@ enum Mode
 ubyte[] applyPadding(ref ubyte[] input,
                      in Mode mode,
                      in ushort blockSize,
-                     Allocator allocator = defaultAllocator)
+                     shared Allocator allocator = defaultAllocator)
 in
 {
 	assert(blockSize > 0 && blockSize <= 256);
@@ -204,7 +204,7 @@ unittest
 ref ubyte[] removePadding(ref ubyte[] input,
                       in Mode mode,
                       in ushort blockSize,
-                      Allocator allocator = defaultAllocator)
+                      shared Allocator allocator = defaultAllocator)
 in
 {
 	assert(input.length != 0);

source/tanya/event/internal/epoll.d

@@ -28,8 +28,6 @@ import core.sys.posix.netinet.in_;
 import core.time;
 import std.algorithm.comparison;
 
-@nogc:
-
 extern (C) nothrow
 { // TODO: Make a pull request for Phobos to mark this extern functions as @nogc.
     int epoll_create1(int __flags);
@@ -42,7 +40,6 @@ private enum maxEvents = 128;
 
 class EpollLoop : Loop
 {
-@nogc:
 	/**
 	 * Initializes the loop.
 	 */
@@ -108,7 +105,7 @@ class EpollLoop : Loop
 	 * 	protocolFactory = Protocol factory.
 	 * 	socket          = Socket.
 	 */
-	protected override void acceptConnection(Protocol delegate() @nogc protocolFactory,
+	protected override void acceptConnection(Protocol delegate() protocolFactory,
 	                                         int socket)
 	{
 		sockaddr_in client_addr;

source/tanya/event/internal/selector.d

@@ -24,7 +24,6 @@ import core.sys.posix.unistd;
  */
 class SocketTransport : DuplexTransport
 {
-@nogc:
 	private int socket_ = -1;
 
 	private Protocol protocol_;

source/tanya/event/loop.d

@@ -29,8 +29,6 @@ static if (UseEpoll)
     import tanya.event.internal.epoll;
 }
 
-@nogc:
-
 /**
  * Events.
  */
@@ -49,7 +47,6 @@ alias EventMask = BitFlags!Event;
  */
 abstract class Loop
 {
-@nogc:
 	/// Pending watchers.
 	protected Queue!Watcher pendings;
 
@@ -204,7 +201,7 @@ abstract class Loop
 	 * 	protocolFactory = Protocol factory.
 	 * 	socket          = Socket.
 	 */
-	protected void acceptConnection(Protocol delegate() @nogc protocolFactory,
+	protected void acceptConnection(Protocol delegate() protocolFactory,
 	                                int socket);
 
 	/// Whether the event loop should be stopped.
@@ -219,7 +216,6 @@ abstract class Loop
  */
 class BadLoopException : Exception
 {
-@nogc:
 	/**
 	 * Params:
 	 * 	file = The file where the exception occurred.
@@ -227,7 +223,7 @@ class BadLoopException : Exception
 	 * 	next = The previous exception in the chain of exceptions, if any.
 	 */
 	this(string file = __FILE__, size_t line = __LINE__, Throwable next = null)
-	pure @safe nothrow const
+	pure @safe nothrow const @nogc
 	{
 		super("Event loop cannot be initialized.", file, line, next);
 	}

source/tanya/event/transport.d

@@ -18,7 +18,6 @@ import tanya.event.protocol;
  */
 class TransportException : Exception
 {
-@nogc:
 	/**
 	 * Params:
 	 * 	msg  = Message to output.
@@ -29,7 +28,7 @@ class TransportException : Exception
 	this(string msg,
 	     string file = __FILE__,
 	     size_t line = __LINE__,
-	     Throwable next = null) pure @safe nothrow const
+	     Throwable next = null) pure @safe nothrow const @nogc
 	{
 		super(msg, file, line, next);
 	}
@@ -40,7 +39,6 @@ class TransportException : Exception
  */
 interface Transport
 {
-@nogc:
 	/**
 	 * Returns: Protocol.
 	 */
@@ -78,7 +76,6 @@ interface Transport
  */
 interface ReadTransport : Transport
 {
-@nogc:
 	/**
 	 * Returns: Underlying output buffer.
 	 */
@@ -103,7 +100,6 @@ interface ReadTransport : Transport
  */
 interface WriteTransport : Transport
 {
-@nogc:
 	/**
 	 * Returns: Underlying input buffer.
 	 */

source/tanya/event/watcher.d

@@ -21,7 +21,6 @@ import std.functional;
  */
 abstract class Watcher
 {
-@nogc:
     /// Whether the watcher is active.
     bool active;
 
@@ -33,7 +32,6 @@ abstract class Watcher
 
 class ConnectionWatcher : Watcher
 {
-@nogc:
 	/// Watched file descriptor.
     private int socket_;
 
@@ -41,7 +39,7 @@ class ConnectionWatcher : Watcher
 	protected Protocol delegate() protocolFactory;
 
 	/// Callback.
-	package void delegate(Protocol delegate() @nogc protocolFactory,
+	package void delegate(Protocol delegate() protocolFactory,
 	                      int socket) accept;
 
 	invariant
@@ -54,27 +52,27 @@ class ConnectionWatcher : Watcher
 	 * 	protocolFactory = Function returning a new $(D_PSYMBOL Protocol) instance.
 	 * 	socket          = Socket.
 	 */
-	this(Protocol function() @nogc protocolFactory, int socket)
+	this(Protocol function() protocolFactory, int socket)
 	{
 		this.protocolFactory = toDelegate(protocolFactory);
 		socket_ = socket;
 	}
 
 	/// Ditto.
-	this(Protocol delegate() @nogc protocolFactory, int socket)
+	this(Protocol delegate() protocolFactory, int socket)
 	{
 		this.protocolFactory = protocolFactory;
 		socket_ = socket;
 	}
 
 	/// Ditto.
-	protected this(Protocol function() @nogc protocolFactory)
+	protected this(Protocol function() protocolFactory)
 	{
 		this.protocolFactory = toDelegate(protocolFactory);
 	}
 
 	/// Ditto.
-	protected this(Protocol delegate() @nogc protocolFactory)
+	protected this(Protocol delegate() protocolFactory)
 	{
 		this.protocolFactory = protocolFactory;
 	}
@@ -90,7 +88,7 @@ class ConnectionWatcher : Watcher
 	/**
 	 * Returns: Application protocol factory.
 	 */
-	@property inout(Protocol delegate() @nogc) protocol() inout
+	@property inout(Protocol delegate()) protocol() inout
 	{
 		return protocolFactory;
 	}
@@ -107,7 +105,6 @@ class ConnectionWatcher : Watcher
  */
 class IOWatcher : ConnectionWatcher
 {
-@nogc:
 	/// References a watcher or a transport.
 	DuplexTransport transport_;
 
@@ -116,7 +113,7 @@ class IOWatcher : ConnectionWatcher
 	 * 	protocolFactory = Function returning application specific protocol.
 	 * 	transport       = Transport.
 	 */
-	this(Protocol delegate() @nogc protocolFactory,
+	this(Protocol delegate() protocolFactory,
 		 DuplexTransport transport)
 	in
 	{
@@ -143,7 +140,7 @@ class IOWatcher : ConnectionWatcher
      *
 	 * Returns: $(D_KEYWORD this).
      */
-	IOWatcher opCall(Protocol delegate() @nogc protocolFactory,
+	IOWatcher opCall(Protocol delegate() protocolFactory,
 	                 DuplexTransport transport) @safe pure nothrow
 	in
 	{

source/tanya/memory/allocator.d

@@ -10,23 +10,23 @@
  */  
 module tanya.memory.allocator;
 
+import std.experimental.allocator;
+import std.traits;
+
 /**
- * This interface should be similar to $(D_PSYMBOL
+ * Allocator interface.
- * std.experimental.allocator.IAllocator), but usable in
- * $(D_KEYWORD @nogc)-code.
  */
 interface Allocator
 {
-@nogc:
     /**
-	 * Allocates $(D_PARAM s) bytes of memory.
+     * Allocates $(D_PARAM size) bytes of memory.
      *
      * Params:
-	 * 	s = Amount of memory to allocate.
+     *     size = Amount of memory to allocate.
      *
      * Returns: The pointer to the new allocated memory.
      */
-    void[] allocate(size_t s) @safe;
+    void[] allocate(size_t size) shared;
 
     /**
      * Deallocates a memory block.
@@ -36,7 +36,7 @@ interface Allocator
      *
      * Returns: Whether the deallocation was successful.
      */
-    bool deallocate(void[] p) @safe;
+    bool deallocate(void[] p) shared;
 
     /**
      * Increases or decreases the size of a memory block.
@@ -47,12 +47,38 @@ interface Allocator
      *
      * Returns: Whether the reallocation was successful.
      */
-	bool reallocate(ref void[] p, size_t s) @safe;
+    bool reallocate(ref void[] p, size_t size) shared;
 
     /**
-     * Static allocator instance and initializer.
+     * Returns: The alignment offered.
-	 *
-	 * Returns: An $(D_PSYMBOL Allocator) instance.
      */
-	static @property Allocator instance() @safe;
+    @property immutable(uint) alignment() shared const @safe pure nothrow;
 }
+
+/**
+ * Params:
+ *     T         = Element type of the array being created.
+ *     allocator = The allocator used for getting memory.
+ *     array     = A reference to the array being changed.
+ *     length    = New array length.
+ *
+ * Returns: $(D_KEYWORD true) upon success, $(D_KEYWORD false) if memory could
+ *          not be reallocated. In the latter
+ */
+bool resizeArray(T)(shared Allocator allocator,
+                    ref T[] array,
+                    in size_t length)
+{
+    void[] buf = array;
+
+    if (!allocator.reallocate(buf, length * T.sizeof))
+    {
+        return false;
+    }
+    array = cast(T[]) buf;
+
+    return true;
+}
+
+enum bool isFinalizable(T) = is(T == class) || is(T == interface)
+                           || hasElaborateDestructor!T || isDynamicArray!T;

source/tanya/memory/package.d

@@ -26,8 +26,6 @@ else version (Posix)
 	import core.sys.posix.pthread;
 }
 
-@nogc:
-
 version (Windows)
 {
 	package alias Mutex = CRITICAL_SECTION;
@@ -42,12 +40,12 @@ else version (Posix)
 	}
 }
 
-@property void defaultAllocator(Allocator allocator) @safe nothrow
+@property void defaultAllocator(shared Allocator allocator) @safe nothrow
 {
 	_defaultAllocator = allocator;
 }
 
-@property Allocator defaultAllocator() @safe nothrow
+@property shared(Allocator) defaultAllocator() @safe nothrow
 {
 	return _defaultAllocator;
 }
@@ -204,4 +202,4 @@ bool resizeArray(T, A)(auto ref A allocator, ref T[] array, in size_t length)
 enum bool isFinalizable(T) = is(T == class) || is(T == interface)
                           || hasElaborateDestructor!T || isDynamicArray!T;
 
-private Allocator _defaultAllocator;
+private shared Allocator _defaultAllocator;

source/tanya/memory/ullocator.d

@@ -11,24 +11,29 @@
 module tanya.memory.ullocator;
 
 import tanya.memory.allocator;
+import core.atomic;
+import core.exception;
 
-@nogc:
+version (Posix)
-
+{
-version (Posix):
+    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;
+}
 
 /**
- * Allocator for Posix systems with mmap/munmap support.
- *
  * This allocator allocates memory in regions (multiple of 4 KB for example).
  * Each region is then splitted in blocks. So it doesn't request the memory
  * from the operating system on each call, but only if there are no large
- * enought free blocks in the available regions.
+ * enough free blocks in the available regions.
  * Deallocation works in the same way. Deallocation doesn't immediately
  * gives the memory back to the operating system, but marks the appropriate
- * block as free and only if all blocks in the region are free, the complet
+ * block as free and only if all blocks in the region are free, the complete
  * region is deallocated.
  *
  * ----------------------------------------------------------------------------
@@ -42,16 +47,33 @@ import core.sys.posix.unistd;
  * |  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 Ullocator : Allocator
 {
-@nogc:
     @disable this();
 
-	shared static this() @safe nothrow
+    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.
@@ -61,8 +83,12 @@ class Ullocator : Allocator
      *
      * Returns: The pointer to the new allocated memory.
      */
-    void[] allocate(size_t size) @trusted nothrow
+    void[] allocate(size_t size) shared @nogc @trusted nothrow
     {
+        if (!size)
+        {
+            return null;
+        }
         immutable dataSize = addAlignment(size);
 
         void* data = findBlock(dataSize);
@@ -75,7 +101,7 @@ class Ullocator : Allocator
     }
 
     ///
-	unittest
+    @nogc @safe nothrow unittest
     {
         auto p = Ullocator.instance.allocate(20);
 
@@ -93,7 +119,7 @@ class Ullocator : Allocator
      *
      * Returns: Data the block points to or $(D_KEYWORD null).
      */
-	private void* findBlock(size_t size) nothrow
+    private void* findBlock(size_t size) shared @nogc nothrow
     {
         Block block1;
         RegionLoop: for (auto r = head; r !is null; r = r.next)
@@ -133,12 +159,12 @@ class Ullocator : Allocator
             block1.size = size;
 
             block2.region = block1.region;
-			++block1.region.blocks;
+            atomicOp!"+="(block1.region.blocks, 1);
         }
         else
         {
             block1.free = false;
-			++block1.region.blocks;
+            atomicOp!"+="(block1.region.blocks, 1);
         }
         return cast(void*) block1 + blockEntrySize;
     }
@@ -151,7 +177,7 @@ class Ullocator : Allocator
      *
      * Returns: Whether the deallocation was successful.
      */
-    bool deallocate(void[] p) @trusted nothrow
+    bool deallocate(void[] p) shared @nogc @trusted nothrow
     {
         if (p is null)
         {
@@ -173,18 +199,25 @@ class Ullocator : Allocator
             {
                 block.region.next.prev = block.region.prev;
             }
-			return munmap(block.region, block.region.size) == 0;
+            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;
-			--block.region.blocks;
+            atomicOp!"-="(block.region.blocks, 1);
             return true;
         }
     }
 
     ///
-	unittest
+    @nogc @safe nothrow unittest
     {
         auto p = Ullocator.instance.allocate(20);
 
@@ -200,18 +233,22 @@ class Ullocator : Allocator
      *
      * Returns: Whether the reallocation was successful.
      */
-	bool reallocate(ref void[] p, size_t size) @trusted nothrow
+    bool reallocate(ref void[] p, size_t size) shared @nogc @trusted nothrow
     {
+        void[] reallocP;
+
         if (size == p.length)
         {
             return true;
         }
-
+        else if (size > 0)
-		auto reallocP = allocate(size);
+        {
+            reallocP = allocate(size);
             if (reallocP is null)
             {
                 return false;
             }
+        }
 
         if (p !is null)
         {
@@ -219,7 +256,7 @@ class Ullocator : Allocator
             {
                 reallocP[0..p.length] = p[0..$];
             }
-			else
+            else if (size > 0)
             {
                 reallocP[0..size] = p[0..size];
             }
@@ -231,7 +268,7 @@ class Ullocator : Allocator
     }
 
     ///
-	unittest
+    @nogc @safe nothrow unittest
     {
         void[] p;
         Ullocator.instance.reallocate(p, 10 * int.sizeof);
@@ -262,9 +299,9 @@ class Ullocator : Allocator
     /**
      * Static allocator instance and initializer.
      *
-	 * Returns: The global $(D_PSYMBOL Allocator) instance.
+     * Returns: Global $(D_PSYMBOL Ullocator) instance.
      */
-	static @property Ullocator instance() @trusted nothrow
+    static @property ref shared(Ullocator) instance() @nogc @trusted nothrow
     {
         if (instance_ is null)
         {
@@ -272,20 +309,18 @@ class Ullocator : Allocator
 
             Region head; // Will become soon our region list head
             void* data = initializeRegion(instanceSize, head);
-
+            if (data !is null)
-			if (data is null)
             {
-				return null;
-			}
                 data[0..instanceSize] = typeid(Ullocator).initializer[];
-			instance_ = cast(Ullocator) data;
+                instance_ = cast(shared Ullocator) data;
                 instance_.head = head;
             }
+        }
         return instance_;
     }
 
     ///
-	unittest
+    @nogc @safe nothrow unittest
     {
         assert(instance is instance);
     }
@@ -301,9 +336,12 @@ class Ullocator : Allocator
      */
     pragma(inline)
     private static void* initializeRegion(size_t size,
-	                                      ref Region head) nothrow
+                                          ref Region head) @nogc nothrow
     {
         immutable regionSize = calculateRegionSize(size);
+        
+        version (Posix)
+        {
             void* p = mmap(null,
                            regionSize,
                            PROT_READ | PROT_WRITE,
@@ -312,8 +350,28 @@ class Ullocator : Allocator
                            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;
@@ -351,7 +409,7 @@ class Ullocator : Allocator
     }
 
     /// Ditto.
-	private void* initializeRegion(size_t size) nothrow
+    private void* initializeRegion(size_t size) shared @nogc nothrow
     {
         return initializeRegion(size, head);
     }
@@ -363,14 +421,15 @@ class Ullocator : Allocator
      * Returns: Aligned size of $(D_PARAM x).
      */
     pragma(inline)
-	private static immutable(size_t) addAlignment(size_t x) @safe pure nothrow
+    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;
+        return (x - 1) / alignment_ * alignment_ + alignment_;
     }
 
     /**
@@ -381,7 +440,7 @@ class Ullocator : Allocator
      */
     pragma(inline)
     private static immutable(size_t) calculateRegionSize(size_t x)
-	@safe pure nothrow
+    @nogc @safe pure nothrow
     out (result)
     {
         assert(result > 0);
@@ -392,32 +451,36 @@ class Ullocator : Allocator
         return x / pageSize * pageSize + pageSize;
     }
 
-	enum alignment = 8;
+    @property immutable(uint) alignment() shared const @nogc @safe pure nothrow
+    {
+        return alignment_;
+    }
+    private enum alignment_ = 8;
 
-	private static Ullocator instance_;
+    private shared static Ullocator instance_;
 
-	private shared static immutable long pageSize;
+    private shared static immutable size_t pageSize;
 
-	private struct RegionEntry
+    private shared struct RegionEntry
     {
         Region prev;
         Region next;
         uint blocks;
-		ulong size;
+        size_t size;
     }
-	private alias Region = RegionEntry*;
+    private alias Region = shared RegionEntry*;
     private enum regionEntrySize = 32;
 
-	private Region head;
+    private shared Region head;
 
-	private struct BlockEntry
+    private shared struct BlockEntry
     {
         Block prev;
         Block next;
         bool free;
-		ulong size;
+        size_t size;
         Region region;
     }
-	private alias Block = BlockEntry*;
+    private alias Block = shared BlockEntry*;
     private enum blockEntrySize = 40;
 }

source/tanya/random.d

@@ -14,8 +14,6 @@ import tanya.memory;
 import std.digest.sha;
 import std.typecons;
 
-@nogc:
-
 /// Block size of entropy accumulator (SHA-512).
 enum blockSize = 64;
 
@@ -27,7 +25,6 @@ enum maxGather = 128;
  */
 class EntropyException : Exception
 {
-@nogc:
 	/**
 	 * Params:
 	 * 	msg  = Message to output.
@@ -38,7 +35,7 @@ class EntropyException : Exception
 	this(string msg,
 	     string file = __FILE__,
 	     size_t line = __LINE__,
-	     Throwable next = null) pure @safe nothrow const
+	     Throwable next = null) pure @safe nothrow const @nogc
 	{
 		super(msg, file, line, next);
 	}
@@ -49,7 +46,6 @@ class EntropyException : Exception
  */
 abstract class EntropySource
 {
-@nogc:
 	/// Amount of already generated entropy.
 	protected ushort size_;
 
@@ -103,7 +99,6 @@ version (linux)
 	 */
 	class PlatformEntropySource : EntropySource
 	{
-	@nogc:
 		/**
 		 * Returns: Minimum bytes required from the entropy source.
 		 */
@@ -164,13 +159,12 @@ version (linux)
  */
 class Entropy
 {
-@nogc:
 	/// Entropy sources.
 	protected EntropySource[] sources;
 
 	private ubyte sourceCount_;
 
-	private Allocator allocator;
+	private shared Allocator allocator;
 
 	/// Entropy accumulator.
 	protected SHA!(maxGather * 8, 512) accumulator;
@@ -181,7 +175,7 @@ class Entropy
 	 * 	allocator  = Allocator to allocate entropy sources available on the
 	 * 	             system.
 	 */
-	this(size_t maxSources = 20, Allocator allocator = defaultAllocator)
+	this(size_t maxSources = 20, shared Allocator allocator = defaultAllocator)
 	in
 	{
 		assert(maxSources > 0 && maxSources <= ubyte.max);