X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=139f94f2d88054d745ad9119b562dd7ec174d596;hb=d5dd704b2576f878809e87dbb8ff8591b9bdbce4;hp=7e92dbdf3d552574fbb279b17abc7bf56edfbec2;hpb=fe77fc6b869a71bf94d501a0762579f4ddbc5094;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 7e92dbd..139f94f 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,18 +1,32 @@
-/*
+/* $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::app_ = 0;
+Application::Starter *Application::starter_ = 0;
+void *Application::data_ = 0;
+
+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.
@@ -20,35 +34,66 @@ 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;
+	static bool called = false;
 	if(called)
 	{
 		cerr<<"Trying to call Application::run_app twice!\n";
 		return 125;
 	}
-	called=true;
+	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
 	{
-		app_=reg_app_->create_app(argc, argv);
+		try
+		{
+			app_ = starter_->create_app(argc, argv);
+		}
+		catch(const UsageError &e)
+		{
+			starter_->usage(e.what(), argv[0], e.get_brief());
+			return 1;
+		}
+
+		int result = app_->main();
+		Application *a = app_;
+		app_ = 0;
+		delete a;
+		return result;
 	}
-	catch(const UsageError &e)
+	catch(const exception &e)
 	{
-		reg_app_->usage(e.what(), argv[0], e.get_brief());
-		return 1;
-	}
+		delete app_;
 
-	int result=app_->main();
-	delete app_;
-	return result;
+#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';
+
+		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;
+	}
 }
 
 /**
@@ -62,48 +107,19 @@ will blame the programmer for being lazy.
 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";
 }
 
-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();
-			sleep(Time::msec);
-		}
-		else if(loop_mode_==TICK_YIELD)
-		{
-			tick();
-#ifdef WIN32
-			Sleep(0);
-#else
-			sched_yield();
-#endif
-		}
-	}
+		tick();
 
 	return exit_code;
 }
@@ -116,36 +132,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;
 }
 
 /**
@@ -156,18 +149,13 @@ 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;
-
 } // namespace Msp