X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=f64f350e83e362b1d0cde831a7f0f542e52388b2;hb=e38f9affa8a5d32168276b49535b560b1d7a907c;hp=0e93a9c653064ec4aeccbd39d358a80e74fb7be9;hpb=521cf1db00f8ce2d9f9494dca503d6c17d89ac2f;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0e93a9c..f64f350 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -4,17 +4,26 @@ 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;
 
 namespace Msp {
 
+Application::Application():
+	exit_code(0),
+	loop_mode_(TICK_SLEEP)
+{ }
+
 /**
 Constructs an instance of the registered application class and runs it.  If the
 application throws a UsageError, the static usage() function is called.
@@ -22,7 +31,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)
@@ -38,19 +47,48 @@ int Application::run(int argc, char **argv)
 		return 126;
 	}
 
+	data_=data;
+
 	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;
-	}
+		delete app_;
+
+#ifdef WIN32
+		string msg=Debug::demangle(typeid(e).name())+":\n"+e.what();
+		MessageBoxA(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
+#else
+		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 list<Debug::Backtrace::StackFrame> &frames=exc->get_backtrace().get_frames();
+			for(list<Debug::Backtrace::StackFrame>::const_iterator i=frames.begin(); i!=frames.end(); ++i)
+				cerr<<"    "<<*i<<'\n';
+		}
+#endif
+
+		return 124;
+	}
 }
 
 /**
@@ -68,11 +106,6 @@ void Application::usage(const char *reason, const char *, bool)
 	cerr<<"The programmer was lazy and didn't write a usage() function for this application.\n";
 }
 
-Application::Application():
-	exit_code(0),
-	loop_mode_(TICK_SLEEP)
-{ }
-
 /**
 Default main loop.  Behavior depends on loop_mode_.  A custom main loop should
 monitor the done member variable and return exit_code.
@@ -105,6 +138,8 @@ int Application::main()
 			sched_yield();
 #endif
 		}
+		else if(loop_mode_==TICK_BUSY)
+			tick();
 	}
 
 	return exit_code;
@@ -158,6 +193,7 @@ void Application::sighandler_(int s)
 	app_->sighandler(s);
 }
 
+
 Application::RegBase::RegBase()
 {
 	if(reg_app_)
@@ -171,5 +207,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp