libdoomsday|Busy Mode: Busy tasks support C++ lambda functions

skyjake · Jul 22, 2015 · 853dff4 · 853dff4
1 parent 09a5e46
commit 853dff4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/doomsday/apps/libdoomsday/include/doomsday/busymode.h b/doomsday/apps/libdoomsday/include/doomsday/busymode.h
@@ -24,14 +24,16 @@
 #include "libdoomsday.h"
 #include <de/Observers>
 #include <de/Time>
+#include <de/String>
+#include <functional>
 
 /// Busy mode worker function.
 typedef int (*busyworkerfunc_t) (void *parm);
 
 /// POD structure for defining a task processable in busy mode.
 struct LIBDOOMSDAY_PUBLIC BusyTask
 {
-    busyworkerfunc_t worker; ///< Worker thread that does processing while in busy mode.
+    std::function<int (void *)> worker; ///< Worker thread that does processing while in busy mode.
     void *workerData; ///< Data context for the worker thread.
 
     int mode; ///< Busy mode flags @ref busyModeFlags
@@ -123,6 +125,17 @@ class LIBDOOMSDAY_PUBLIC BusyMode
      */
     int runNewTaskWithName(int mode, busyworkerfunc_t worker, void *workerData, de::String const &taskName);
 
+    /**
+     * Run a single task with a std::function callback.
+     *
+     * @param mode      Busy mode flags.
+     * @param worker    Worker callback.
+     * @param taskName  Task name (drawn next to the progress bar).
+     *
+     * @return  Return value from the worker.
+     */
+    int runNewTaskWithName(int mode, de::String const &taskName, std::function<int (void *)> worker);
+
     /**
      * Abnormally aborts the currently running task. Call this when the task encounters
      * an unrecoverable error. Calling this causes the Abort audience to be notified.

diff --git a/doomsday/apps/libdoomsday/src/busymode.cpp b/doomsday/apps/libdoomsday/src/busymode.cpp
@@ -149,7 +149,7 @@ void BusyMode::abort(String const &message)
  * @param workerData    Data context for the worker thread.
  * @param taskName      Optional task name (drawn with the progress bar).
  */
-static BusyTask *newTask(int mode, busyworkerfunc_t worker, void* workerData,
+static BusyTask *newTask(int mode, std::function<int (void *)> worker, void* workerData,
                          String const &taskName)
 {
     BusyTask *task = new BusyTask;
@@ -176,6 +176,14 @@ static void deleteTask(BusyTask *task)
     delete task;
 }
 
+int BusyMode::runNewTaskWithName(int mode, String const &taskName, std::function<int (void *)> worker)
+{
+    BusyTask *task = newTask(mode, worker, nullptr, taskName);
+    int result = runTask(task);
+    deleteTask(task);
+    return result;
+}
+
 int BusyMode::runNewTaskWithName(int mode, busyworkerfunc_t worker, void *workerData,
                                  String const &taskName)
 {