From 0fe7308a229cfa9227ce372b57da3d046cce316e Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Wed, 20 Mar 2019 07:30:47 +0100 Subject: algorithm: import searching publically --- source/tanya/async/loop.d | 83 +------------------------------------------- source/tanya/async/watcher.d | 13 ------- 2 files changed, 1 insertion(+), 95 deletions(-) (limited to 'source/tanya/async') diff --git a/source/tanya/async/loop.d b/source/tanya/async/loop.d index b706ff3..3fba090 100644 --- a/source/tanya/async/loop.d +++ b/source/tanya/async/loop.d @@ -116,30 +116,6 @@ else version (DragonFlyBSD) { version = Kqueue; } -version (unittest) -{ - final class TestLoop : Loop - { - override protected bool reify(SocketWatcher watcher, - EventMask oldEvents, - EventMask events) @nogc - { - return true; - } - - override protected void poll() @nogc - { - assert(!this.done); - unloop(); - } - - override protected @property uint maxEvents() - const pure nothrow @safe @nogc - { - return 64U; - } - } -} /** * Events. @@ -160,7 +136,7 @@ alias EventMask = BitFlags!Event; */ abstract class Loop { - private bool done = true; + protected bool done = true; /// Pending watchers. protected DList!Watcher pendings; @@ -175,14 +151,6 @@ abstract class Loop return 128U; } - @nogc @system unittest - { - auto loop = defaultAllocator.make!TestLoop; - assert(loop.maxEvents == 64); - - defaultAllocator.dispose(loop); - } - /** * Initializes the loop. */ @@ -228,31 +196,6 @@ abstract class Loop this.done = true; } - @nogc @system unittest - { - auto loop = defaultAllocator.make!TestLoop; - assert(loop.done); - - loop.run(); - assert(loop.done); - - defaultAllocator.dispose(loop); - } - - @nogc @system unittest - { - auto loop = defaultAllocator.make!TestLoop; - auto watcher = defaultAllocator.make!DummyWatcher; - loop.pendings.insertBack(watcher); - - assert(!watcher.invoked); - loop.run(); - assert(watcher.invoked); - - defaultAllocator.dispose(loop); - defaultAllocator.dispose(watcher); - } - /** * Start watching. * @@ -329,17 +272,6 @@ abstract class Loop blockTime_ = blockTime; } - @nogc @system unittest - { - auto loop = defaultAllocator.make!TestLoop; - assert(loop.blockTime == 1.dur!"minutes"); - - loop.blockTime = 2.dur!"minutes"; - assert(loop.blockTime == 2.dur!"minutes"); - - defaultAllocator.dispose(loop); - } - /** * Does the actual polling. */ @@ -418,16 +350,3 @@ do } private Loop defaultLoop_; - -@nogc @system unittest -{ - auto oldLoop = defaultLoop_; - auto loop = defaultAllocator.make!TestLoop; - - defaultLoop = loop; - assert(defaultLoop_ is loop); - assert(defaultLoop is loop); - - defaultLoop_ = oldLoop; - defaultAllocator.dispose(loop); -} diff --git a/source/tanya/async/watcher.d b/source/tanya/async/watcher.d index 9ecb300..b257b5b 100644 --- a/source/tanya/async/watcher.d +++ b/source/tanya/async/watcher.d @@ -37,19 +37,6 @@ abstract class Watcher void invoke() @nogc; } -version (unittest) -{ - final class DummyWatcher : Watcher - { - bool invoked; - - override void invoke() @nogc - { - this.invoked = true; - } - } -} - /** * Socket watcher. */ -- cgit v1.2.3