X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=daeb1300d16602fcd1ff3c9f3ca82952a2b2a50a;hb=cd89068b8ebafdc0f888c1aa21498bb93b55d814;hp=0e0b69f28af4aa9686ff4e30fb593f8ea58ea635;hpb=779974641eb8b16309ed670fdc3ceb760d05b6fc;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0e0b69f..daeb130 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -4,12 +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;
 
@@ -22,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)
@@ -38,6 +42,8 @@ int Application::run(int argc, char **argv)
 		return 126;
 	}
 
+	data_=data;
+
 	try
 	{
 		try
@@ -56,11 +62,27 @@ int Application::run(int argc, char **argv)
 	}
 	catch(const exception &e)
 	{
+		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:   "<<typeid(e).name()<<'\n';
+		cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
 		cerr<<"  what(): "<<e.what()<<'\n';
-		delete app_;
-		terminate();
+
+		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<<'\n';
+		}
+#endif
+
+		return 124;
 	}
 }
 
@@ -116,6 +138,8 @@ int Application::main()
 			sched_yield();
 #endif
 		}
+		else if(loop_mode_==TICK_BUSY)
+			tick();
 	}
 
 	return exit_code;
@@ -182,5 +206,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp