libcore|App|Loop: Improvements

Version number parsing is more tolerant. LoopCallbacks calls are made after the LoopCallback lock has been released, so that the callbacks don't get stuck.
skyjake · Jan 24, 2016 · 52be20e · 52be20e
1 parent debc02a
commit 52be20e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/doomsday/sdk/libcore/include/de/core/app.h b/doomsday/sdk/libcore/include/de/core/app.h
@@ -177,6 +177,8 @@ class DENG2_PUBLIC App : DENG2_OBSERVES(Clock, TimeChange)
      */
     void removeSystem(System &system);
 
+    void notifyStartupComplete();
+
     /**
      * Determines if an instance of App currently exists.
      */

diff --git a/doomsday/sdk/libcore/src/core/app.cpp b/doomsday/sdk/libcore/src/core/app.cpp
@@ -674,7 +674,7 @@ void App::initSubsystems(SubsystemInitFlags flags)
 #endif
     }
 
-    LOG_VERBOSE("libcore::App %s subsystems initialized.") << Version().asText();
+    LOG_VERBOSE("libcore::App %s subsystems initialized") << Version().asText();
 }
 
 void App::addSystem(System &system)
@@ -688,6 +688,14 @@ void App::removeSystem(System &system)
     d->systems.removeAll(&system);
 }
 
+void App::notifyStartupComplete()
+{
+    DENG2_FOR_AUDIENCE2(StartupComplete, i)
+    {
+        i->appStartupCompleted();
+    }
+}
+
 bool App::appExists()
 {
     return singletonApp != 0;

diff --git a/doomsday/sdk/libcore/src/core/loop.cpp b/doomsday/sdk/libcore/src/core/loop.cpp
@@ -142,13 +142,18 @@ void LoopCallback::enqueue(Callback func)
 
 void LoopCallback::loopIteration()
 {
-    DENG2_GUARD(this);
+    QList<Callback> funcs;
 
-    Loop::get().audienceForIteration() -= this;
+    // Lock while modifying but not during the callbacks themselves.
+    {
+        DENG2_GUARD(this);
+        Loop::get().audienceForIteration() -= this;
+
+        // Make a copy of the list if new callbacks get enqueued in the callback.
+        funcs = _funcs;
+        _funcs.clear();
+    }
 
-    // Make a copy of the list if new callbacks get enqueued in the callback.
-    QList<Callback> const funcs = _funcs;
-    _funcs.clear();
     for(Callback const &cb : funcs)
     {
         cb();

diff --git a/doomsday/sdk/libcore/src/version.cpp b/doomsday/sdk/libcore/src/version.cpp
@@ -74,9 +74,9 @@ void Version::parseVersionString(String const &version)
     int dashPos = version.indexOf('-');
 
     QStringList parts = version.left(dashPos).split('.');
-    if(parts.size() >= 1) major = parts[0].toInt();
-    if(parts.size() >= 2) minor = parts[1].toInt();
-    if(parts.size() >= 3) patch = parts[2].toInt();
+    if(parts.size() >= 1) major = String(parts[0]).toInt();
+    if(parts.size() >= 2) minor = String(parts[1]).toInt();
+    if(parts.size() >= 3) patch = String(parts[2]).toInt();
 
     if(dashPos >= 0 && dashPos < version.size() - 1)
     {