libcore: Running a function right after starting event loop

skyjake · Sep 1, 2019 · f4da4e7 · f4da4e7
1 parent 1462eb0
commit f4da4e7
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 47 deletions.
diff --git a/doomsday/libs/core/include/de/core/app.h b/doomsday/libs/core/include/de/core/app.h
@@ -379,20 +379,6 @@ class DE_PUBLIC App : DE_OBSERVES(Clock, TimeChange)
      */
     static UnixInfo &unixInfo();
 
-    /**
-     * Starts the application's main loop.
-     *
-     * @return Return code after the loop exits.
-     */
-    virtual int execLoop() = 0;
-
-    /**
-     * Stops the application's main loop.
-     *
-     * @param code  Return code from the loop.
-     */
-    virtual void stopLoop(int code) = 0;
-
     /**
      * Requests engine shutdown by calling the specified termination callback
      * (see setTerminateFunc()). Called when an exception is caught at the
@@ -405,7 +391,7 @@ class DE_PUBLIC App : DE_OBSERVES(Clock, TimeChange)
      *
      * @param message  Error message to be shown to the user.
      */
-    void handleUncaughtException(String message);
+    void handleUncaughtException(const String& message);
 
     /**
      * Events received from the operating system should be passed here; the

diff --git a/doomsday/libs/core/include/de/core/eventloop.h b/doomsday/libs/core/include/de/core/eventloop.h
@@ -54,7 +54,7 @@ class DE_PUBLIC EventLoop
 
     virtual ~EventLoop();
 
-    int exec();
+    int exec(const std::function<void ()> &postExec = {});
 
     void quit(int exitCode);
 

diff --git a/doomsday/libs/core/include/de/core/textapp.h b/doomsday/libs/core/include/de/core/textapp.h
@@ -42,13 +42,14 @@ class DE_PUBLIC TextApp : public App
 public:
     TextApp(const StringList &args);
 
-/*    void setMetadata(String const &orgName, String const &orgDomain,
-                     String const &appName, String const &appVersion);
-*/
-//    bool notify(QObject *receiver, QEvent *event);
+    /**
+     * Start the application event loop.
+     *
+     * @param postExec  Function to call immediately after starting the event loop.
+     */
+    int exec(const std::function<void()> &postExec = {});
 
-    int  execLoop();
-    void stopLoop(int code);
+    void quit(int code);
 
     Loop &loop();
 

diff --git a/doomsday/libs/core/src/core/app.cpp b/doomsday/libs/core/src/core/app.cpp
@@ -486,18 +486,6 @@ void App::addInitPackage(String const &identifier)
     d->packagesToLoadAtInit << identifier;
 }
 
-/*void App::setConfigScript(Path const &path)
-{
-    d->configPath = path;
-}*/
-
-/*
-void App::setName(String const &appName)
-{
-    d->appName = appName;
-}
-*/
-
 void App::setUnixHomeFolderName(String const &name)
 {
     d->metadata.set(UNIX_HOME, name);
@@ -526,7 +514,7 @@ void App::setTerminateFunc(void (*func)(char const *))
     d->terminateFunc = func;
 }
 
-void App::handleUncaughtException(String message)
+void App::handleUncaughtException(const String& message)
 {
     LOG_CRITICAL(message);
 
@@ -672,7 +660,7 @@ Archive &App::mutablePersistentData()
 
 bool App::hasPersistentData()
 {
-    return DE_APP->d->persistentData != 0;
+    return DE_APP->d->persistentData != nullptr;
 }
 
 ArchiveFolder &App::persistPackFolder()

diff --git a/doomsday/libs/core/src/core/config.cpp b/doomsday/libs/core/src/core/config.cpp
@@ -74,7 +74,9 @@ DE_PIMPL_NOREF(Config)
     }
 };
 
-Config::Config(Path const &path) : RecordAccessor(0), d(new Impl(path))
+Config::Config(Path const &path)
+    : RecordAccessor(nullptr)
+    , d(new Impl(path))
 {
     setAccessedRecord(objectNamespace());
 }

diff --git a/doomsday/libs/core/src/core/eventloop.cpp b/doomsday/libs/core/src/core/eventloop.cpp
@@ -19,10 +19,11 @@
 #include "de/EventLoop"
 
 #include "de/CoreEvent"
+#include "de/Garbage"
+#include "de/Log"
 #include "de/NumberValue"
 #include "de/ThreadLocal"
 #include "de/WaitableFIFO"
-#include "de/Garbage"
 
 namespace de {
 namespace internal {
@@ -49,11 +50,12 @@ EventLoop::EventLoop() : d(new Impl)
 EventLoop::~EventLoop()
 {}
 
-int EventLoop::exec()
+int EventLoop::exec(const std::function<void ()> &postExec)
 {
     try
     {
         internal::StackPusher sp(this);
+        postExec();
         for (;;)
         {
             // Wait until an event is posted.
@@ -77,6 +79,7 @@ int EventLoop::exec()
     {
         warning("[EventLoop] Event loop terminating due to an uncaught exception");
         er.warnPlainText();
+        LOG_WARNING("Event loop stopped: %s") << er.asText();
         return 0;
     }
 }

diff --git a/doomsday/libs/core/src/core/textapp.cpp b/doomsday/libs/core/src/core/textapp.cpp
@@ -81,18 +81,20 @@ bool TextApp::notify(QObject *receiver, QEvent *event)
 }
 */
 
-int TextApp::execLoop()
+int TextApp::exec(const std::function<void()> &postExec)
 {
     LOGDEV_NOTE("Starting TextApp event loop...");
 
-    d->loop.start();
-    int code = d->eventLoop.exec();
+    int code = d->eventLoop.exec([this, postExec]() {
+        d->loop.start();
+        postExec();
+    });
 
     LOGDEV_NOTE("TextApp event loop exited with code %i") << code;
     return code;
 }
 
-void TextApp::stopLoop(int code)
+void TextApp::quit(int code)
 {
     d->loop.stop();
     d->eventLoop.quit(code);

diff --git a/doomsday/libs/core/src/core/timer.cpp b/doomsday/libs/core/src/core/timer.cpp
@@ -86,10 +86,12 @@ struct TimerScheduler : public Thread, public Lockable
                         // Schedule the next trigger.
                         if (pt.repeatDuration > 0.0)
                         {
-                            pending.push(
-                                Pending{pt.nextAt + sc::microseconds(dint64(pt.repeatDuration * 1.0e6)),
-                                        pt.timer,
-                                        pt.repeatDuration});
+                            TimePoint nextAt = pt.nextAt + sc::microseconds(dint64(pt.repeatDuration * 1.0e6));
+#if defined (DE_DEBUG)
+                            // Debugger may halt the process, don't bother spamming with timer events.
+                            nextAt = de::max(nextAt, sc::system_clock::now());
+#endif
+                            pending.push(Pending{nextAt, pt.timer, pt.repeatDuration});
                         }
                     }
                     else