X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=a588e9dbb7900cff2b3d15a200f41a9be2382d8f;hb=1876f64c4ec1bcba8de57b8b5f63e250187b4ad1;hp=47c176bd8a882a6869df467e7330f2274bfcc5e4;hpb=f6147f00575bdf6e6b53c2ab81161f5f73d0ab84;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 47c176b..a588e9d 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,20 +1,28 @@
 /* $Id$
 
 This file is part of libmspcore
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2008, 2011  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)
+{ }
+
 /**
 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 +30,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)
@@ -32,21 +40,23 @@ int Application::run(int argc, char **argv)
 	}
 	called=true;
 
-	if(!reg_app_)
+	if(!starter_)
 	{
-		cerr<<"Trying to run with no application class registered!\n";
+		cerr<<"Trying to run with no RegisteredApplication class!\n";
 		return 126;
 	}
 
+	data_=data;
+
 	try
 	{
 		try
 		{
-			app_=reg_app_->create_app(argc, argv);
+			app_=starter_->create_app(argc, argv);
 		}
 		catch(const UsageError &e)
 		{
-			reg_app_->usage(e.what(), argv[0], e.get_brief());
+			starter_->usage(e.what(), argv[0], e.get_brief());
 			return 1;
 		}
 
@@ -56,11 +66,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_;
-		throw;
+
+		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;
 	}
 }
 
@@ -79,44 +105,15 @@ 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.
+Default main loop.  Calls tick() repeatedly until exit() is called.  A custom
+main loop should monitor the done member variable and return exit_code.
 */
 int Application::main()
 {
-	if(loop_mode_==NONE)
-		return 0;
-
-	done=false;
+	done = false;
 	while(!done)
-	{
-		if(loop_mode_==SLEEP)
-		{
-			sleep_sem_.wait();
-			if(!done)
-				tick();
-		}
-		else if(loop_mode_==TICK_SLEEP)
-		{
-			tick();
-			Time::sleep(Time::msec);
-		}
-		else if(loop_mode_==TICK_YIELD)
-		{
-			tick();
-#ifdef WIN32
-			Sleep(0);
-#else
-			sched_yield();
-#endif
-		}
-	}
+		tick();
 
 	return exit_code;
 }
@@ -129,36 +126,13 @@ void Application::catch_signal(int s)
 	signal(s, &sighandler_);
 }
 
-/**
-Changes the main loop mode.
-*/
-void Application::set_loop_mode(LoopMode l)
-{
-	LoopMode old_mode=loop_mode_;
-	loop_mode_=l;
-	if(old_mode==SLEEP)
-		sleep_sem_.signal();
-}
-
-/**
-Causes the tick() function to be executed once if loop mode is SLEEP.  Has no
-effect with other loop modes.
-*/
-void Application::induce_tick()
-{
-	if(loop_mode_==SLEEP)
-		sleep_sem_.signal();
-}
-
 /**
 Causes the application to exit gracefully with the given exit code.
 */
 void Application::exit(int c)
 {
-	done=true;
-	exit_code=c;
-	if(loop_mode_==SLEEP)
-		sleep_sem_.signal();
+	done = true;
+	exit_code = c;
 }
 
 /**
@@ -169,18 +143,17 @@ void Application::sighandler_(int s)
 	app_->sighandler(s);
 }
 
-Application::RegBase::RegBase()
+
+Application::Starter::Starter()
 {
-	if(reg_app_)
-	{
-		cerr<<"Warning: registering the application twice\n";
-		delete reg_app_;
-	}
+	if(starter_)
+		throw InvalidState("Can't create more than one Starter instance");
 
-	reg_app_=this;
+	starter_=this;
 }
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp