Fix a sign error in ProfilingScope

Add TICK_BUSY mode to Application

diff --git a/source/core/application.cpp b/source/core/application.cpp
index e1a93141480c9cf3459c483d5b66c5440529703b..c93475fea972e84985f82acfb08fb030018407bd 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -133,6 +133,8 @@ int Application::main()
                        sched_yield();
 #endif
                }
+               else if(loop_mode_==TICK_BUSY)
+                       tick();
        }
 
        return exit_code;

diff --git a/source/core/application.h b/source/core/application.h
index 81569ad45a965ad85c165a7eb5914f360be3f9a7..bd433aafcc3fb16dfd0e0d1bc51c435f6bf5adab 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -28,7 +28,8 @@ protected:
                NONE,       /// No main loop - main() will just return
                SLEEP,      /// Only sleep in the main loop - useful for servers
                TICK_SLEEP, /// Call tick every iteration, with a short sleep in between
-               TICK_YIELD  /// Call tick every iteration, with sched_yield in between
+               TICK_YIELD, /// Call tick every iteration, with sched_yield in between
+               TICK_BUSY   /// Call tick every iteration
        };
 
        class RegBase

diff --git a/source/debug/profilingscope.cpp b/source/debug/profilingscope.cpp
index f92749b214f588357c38baa22f53960973aa9fdd..edf1aa3de975ed0361333d448723fe24ce9e07bb 100644 (file)
--- a/source/debug/profilingscope.cpp
+++ b/source/debug/profilingscope.cpp
@@ -15,7 +15,7 @@ ProfilingScope::ProfilingScope(Profiler &p, const string &n):
 
 ProfilingScope::~ProfilingScope()
 {
-       const Time::TimeDelta dt=start_t-Time::now();
+       const Time::TimeDelta dt=Time::now()-start_t;
        if(parent)
        {
                parent->child_t+=dt;