Merge c5c01c3 into 42c6b11

source/tristanable/package.d

@@ -11,8 +11,9 @@ public import tristanable.manager;
 
 /**
  * A queue of queue items all of the same tag
+ * and queue-related facilities
  */
-public import tristanable.queue : Queue;
+public import tristanable.queue;
 
 /**
  * Error handling type definitions

source/tristanable/queue/listener.d

@@ -0,0 +1,12 @@
+module tristanable.queue.listener;
+
+// TODO: Implement me
+
+import tristanable.queue;
+import tristanable.encoding;
+
+public interface TListener
+{
+    // TODO: See if this is all we need / what we want
+    public void onQueueReceive(Queue queue, TaggedMessage message);
+}

source/tristanable/queue/package.d

@@ -0,0 +1,16 @@
+/**
+ * Queue type and related facilities
+ */
+module tristanable.queue;
+
+
+/**
+ * The Queue type for enqueueing and dequeueing messages
+ */
+public import tristanable.queue.queue : Queue;
+
+/**
+ * Interface type for definining listeners which can be hooked
+ * to queue actions
+ */
+public import tristanable.queue.listener : TListener;

source/tristanable/queue.d → source/tristanable/queue/queue.d

@@ -1,7 +1,9 @@
 /**
  * A queue of queue items all of the same tag
  */
-module tristanable.queue;
+module tristanable.queue.queue;
+
+import tristanable.queue.listener : TListener;
 
 import core.sync.mutex : Mutex;
 import core.sync.condition : Condition;
@@ -25,6 +27,13 @@ version(unittest)
 public class Queue
 {
     /** 
+     * This queue's unique ID
+     */
+    private ulong queueID;
+
+    /** 
+     * The libsnooze event used to sleep/wake
+     * on queue events
      * Mutex for the condition variable
      */
     private Mutex mutex;
@@ -44,13 +53,20 @@ public class Queue
      * The lock for the message queue
      */
     private Mutex queueLock;
-    
+
     /** 
-     * This queue's unique ID
+     * Attached queue listeners
      */
-    private ulong queueID;
+    private SList!(TListener) listeners;
 
     /** 
+     * Lock for the listeners queue
+     */
+    private Mutex listenersLock;
+
+    // TODO: Add listener add/remove methods
+    // TODO: On queue actions add a notificaiton call to the listeners
+    /**
      * If a message is enqueued prior
      * to us sleeping then we won't
      * wake up and return for it.