Add missing includes

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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 7e92dbdf3d552574fbb279b17abc7bf56edfbec2..bcb7e3de49e2cb0b3058844f2559f336cfdc5a50 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,13 +1,19 @@
-/*
+/* $Id$
+

 This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */

+

 #include <signal.h>
 #include <iostream>
 #include <signal.h>
 #include <iostream>

+#include <typeinfo>
+#include "../debug/backtrace.h"
+#include "../debug/demangle.h"

 #include "../time/units.h"
 #include "../time/units.h"

+#include "../time/utils.h"

 #include "application.h"
 #include "application.h"

-#include "error.h"
+#include "except.h"

 
 using namespace std;
 
 
 using namespace std;
 


@@ -20,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.
 */
 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)
 {
        static bool called=false;
        if(called)


@@ -36,19 +42,47 @@ int Application::run(int argc, char **argv)
                return 126;
        }
 
                return 126;
        }
 

+       data_=data;
+

        try
        {
        try
        {

-               app_=reg_app_->create_app(argc, argv);
+               try
+               {
+                       app_=reg_app_->create_app(argc, argv);
+               }
+               catch(const UsageError &e)
+               {
+                       reg_app_->usage(e.what(), argv[0], e.get_brief());
+                       return 1;
+               }
+
+               int result=app_->main();
+               delete app_;
+               return result;

        }
        }

-       catch(const UsageError &e)
+       catch(const exception &e)

        {
        {

-               reg_app_->usage(e.what(), argv[0], e.get_brief());
-               return 1;
-       }
+               cerr<<"An uncaught exception occurred.\n";
+               cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
+               cerr<<"  what(): "<<e.what()<<'\n';

 
 

-       int result=app_->main();
-       delete app_;
-       return result;
+               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;
+       }

 }
 
 /**
 }
 
 /**


@@ -62,7 +96,7 @@ will blame the programmer for being lazy.
 void Application::usage(const char *reason, const char *, bool)
 {
        if(reason)
 void Application::usage(const char *reason, const char *, bool)
 {
        if(reason)

-               cerr<<reason<<'\n';
+               cerr<<"UsageError: "<<reason<<'\n';

        cerr<<"The programmer was lazy and didn't write a usage() function for this application.\n";
 }
 
        cerr<<"The programmer was lazy and didn't write a usage() function for this application.\n";
 }
 


@@ -92,7 +126,7 @@ int Application::main()
                else if(loop_mode_==TICK_SLEEP)
                {
                        tick();
                else if(loop_mode_==TICK_SLEEP)
                {
                        tick();

-                       sleep(Time::msec);
+                       Time::sleep(Time::msec);

                }
                else if(loop_mode_==TICK_YIELD)
                {
                }
                else if(loop_mode_==TICK_YIELD)
                {


@@ -103,6 +137,8 @@ int Application::main()
                        sched_yield();
 #endif
                }
                        sched_yield();
 #endif
                }

+               else if(loop_mode_==TICK_BUSY)
+                       tick();

        }
 
        return exit_code;
        }
 
        return exit_code;


@@ -169,5 +205,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;

+void *Application::data_=0;

 
 } // namespace Msp
 
 } // namespace Msp