Add missing includes

[libs/core.git] / source / core / application.cpp

diff --git a/source/core/application.cpp b/source/core/application.cpp
index a49802350f2f7d655125d8ab0480d9e41370c72a..bcb7e3de49e2cb0b3058844f2559f336cfdc5a50 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -4,13 +4,16 @@ This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #include <signal.h>
 #include <iostream>
+#include <typeinfo>
+#include "../debug/backtrace.h"
 #include "../debug/demangle.h"
 #include "../time/units.h"
 #include "../time/utils.h"
 #include "application.h"
-#include "error.h"
+#include "except.h"
 
 using namespace std;
 
@@ -23,7 +26,7 @@ application throws a UsageError, the static usage() function is called.
 This function can only be called once.  The global main() function provided by
 the library normally does it automatically at program startup.
 */
-int Application::run(int argc, char **argv)
+int Application::run(int argc, char **argv, void *data)
 {
        static bool called=false;
        if(called)
@@ -39,6 +42,8 @@ int Application::run(int argc, char **argv)
                return 126;
        }
 
+       data_=data;
+
        try
        {
                try
@@ -60,6 +65,21 @@ int Application::run(int argc, char **argv)
                cerr<<"An uncaught exception occurred.\n";
                cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
                cerr<<"  what(): "<<e.what()<<'\n';
+
+               const Exception *exc=dynamic_cast<const Exception *>(&e);
+               if(exc && !exc->get_backtrace().get_frames().empty())
+               {
+                       cerr<<"  backtrace:\n";
+                       const Debug::Backtrace::FrameSeq &frames=exc->get_backtrace().get_frames();
+                       for(Debug::Backtrace::FrameSeq::const_iterator i=frames.begin(); i!=frames.end(); ++i)
+                       {
+                               cerr<<"    "<<i->address;
+                               if(!i->symbol.empty())
+                                       cerr<<" in "<<i->symbol;
+                               cerr<<" from "<<i->file<<'\n';
+                       }
+               }
+
                delete app_;
                return 124;
        }
@@ -117,6 +137,8 @@ int Application::main()
                        sched_yield();
 #endif
                }
+               else if(loop_mode_==TICK_BUSY)
+                       tick();
        }
 
        return exit_code;
@@ -183,5 +205,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp