Improved WorkQueue / WorkItem.

 * make use of C++ paradigms instead of C

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

3 files changed, 35 insertions, 28 deletions

diff --git a/CRT/DriverThread.cpp b/CRT/DriverThread.cpp
index e2bb2ec..ecedc48 100644
--- a/CRT/DriverThread.cpp
+++ b/CRT/DriverThread.cpp
@@ -192,9 +192,9 @@ void DriverThread::WorkQueue::Stop(void)
     KeSetEvent(&m_wakeEvent, 0, FALSE);
 }
 
-void DriverThread::WorkQueue::Enqueue(PSLIST_ENTRY workItem)
+void DriverThread::WorkQueue::Enqueue(WorkItem * item)
 {
-    if (InterlockedPushEntrySList(&m_work, workItem) == NULL)
+    if (InterlockedPushEntrySList(&m_work, &item->QueueEntry) == NULL)
     {
         // Work queue was empty. So, signal the work queue event in case the
         // worker thread is waiting on the event for more operations.
@@ -243,7 +243,8 @@ NTSTATUS DriverThread::WorkQueue::WorkerInterceptorRoutine(PVOID workerContext)
         {
             PSLIST_ENTRY arg = listEntry;
             listEntry = listEntry->Next;
-            if (wq->m_workerRoutine(arg) != STATUS_SUCCESS)
+            DriverThread::WorkItem * wi = CONTAINING_RECORD(arg, DriverThread::WorkItem, QueueEntry);
+            if (wq->m_workerRoutine(wi) != STATUS_SUCCESS)
             {
                 wq->m_stopWorker = TRUE;
             }
diff --git a/CRT/DriverThread.hpp b/CRT/DriverThread.hpp
index 6ae9d2c..d863a66 100644
--- a/CRT/DriverThread.hpp
+++ b/CRT/DriverThread.hpp
@@ -5,11 +5,11 @@
 
 extern "C" void InterceptorThreadRoutine(PVOID threadContext);
 
-typedef NTSTATUS (*threadRoutine_t)(PVOID);
-typedef NTSTATUS (*workerRoutine_t)(PSLIST_ENTRY);
-
 namespace DriverThread
 {
+class WorkItem;
+typedef NTSTATUS (*threadRoutine_t)(PVOID);
+typedef NTSTATUS (*workerRoutine_t)(WorkItem * item);
 
 class Mutex
 {
@@ -79,6 +79,13 @@ private:
     KSEMAPHORE m_semaphore;
 };
 
+class WorkItem
+{
+public:
+    SLIST_ENTRY QueueEntry;
+    PSLIST_ENTRY WorkListEntry;
+};
+
 class WorkQueue
 {
 public:
@@ -86,7 +93,7 @@ public:
     ~WorkQueue(void);
     NTSTATUS Start(workerRoutine_t workerRoutine);
     void Stop(void);
-    void Enqueue(PSLIST_ENTRY workItem);
+    void Enqueue(WorkItem * item);
 
 private:
     Mutex m_mutex;
diff --git a/examples/dpp-example-cplusplus.cpp b/examples/dpp-example-cplusplus.cpp
index 0d04d37..cbdd7c6 100644
--- a/examples/dpp-example-cplusplus.cpp
+++ b/examples/dpp-example-cplusplus.cpp
@@ -56,12 +56,12 @@ private:
     unsigned int some_value = 0;
 };
 
-struct WorkItem
+class MyWorkItem : public DriverThread::WorkItem
 {
-    SLIST_ENTRY QueueEntry;
-
+public:
     UINT32 counter;
 };
+
 static DriverThread::WorkQueue work_queue;
 static DerivedWithCDtor some_static(0xDEADC0DE);
 
@@ -86,21 +86,6 @@ static NTSTATUS threadRoutine(PVOID threadContext)
     return STATUS_SUCCESS;
 }
 
-static NTSTATUS test_worker(PSLIST_ENTRY workItem)
-{
-    struct WorkItem * wi = CONTAINING_RECORD(workItem, struct WorkItem, QueueEntry);
-
-    while (wi->counter-- > 0)
-    {
-        DbgPrint("WorkItem Counter: %u\n", wi->counter);
-    }
-    DbgPrint("Worker finished.\n");
-
-    free(wi);
-
-    return STATUS_SUCCESS;
-}
-
 static void test_cplusplus(void)
 {
     TestSmth t;
@@ -116,10 +101,24 @@ static void test_cplusplus(void)
     ctx.dth.WaitForTermination();
     DbgPrint("MainThread EOF\n");
 
-    struct WorkItem * wi = (struct WorkItem *)calloc(1, sizeof(*wi));
+    MyWorkItem * wi = new MyWorkItem();
     wi->counter = 3;
-    work_queue.Enqueue(&wi->QueueEntry);
-    work_queue.Start(test_worker);
+    work_queue.Enqueue(wi);
+    work_queue.Start(
+        [](DriverThread::WorkItem * item)
+        {
+            MyWorkItem * wi =
+                reinterpret_cast<MyWorkItem *>(CONTAINING_RECORD(item, DriverThread::WorkItem, QueueEntry));
+
+            while (wi->counter-- > 0)
+            {
+                DbgPrint("WorkItem Counter: %u\n", wi->counter);
+            }
+            DbgPrint("Worker finished.\n");
+
+            delete item;
+            return STATUS_SUCCESS;
+        });
     work_queue.Stop();
 
     some_static.doSmth();