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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0e93a9c..c93475f 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -6,10 +6,12 @@ Distributed under the LGPL
 */
 #include <signal.h>
 #include <iostream>
+#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;
 
@@ -40,17 +42,43 @@ int Application::run(int argc, char **argv)
 
 	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;
+	}
 }
 
 /**
@@ -105,6 +133,8 @@ int Application::main()
 			sched_yield();
 #endif
 		}
+		else if(loop_mode_==TICK_BUSY)
+			tick();
 	}
 
 	return exit_code;