X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=5acae82242b0a6d4106c7d647460934fd6acae12;hp=0ef3443e8eac4fab7173b15df42c9cd1360b4e88;hb=516755dde30a4820495580d1b52a5b992f800461;hpb=015d9ccbae576049e392b4dbc3017e00d8df3c49

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0ef3443..5acae82 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;
 
@@ -22,7 +24,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,18 +40,20 @@ int Application::run(int argc, char **argv)
 		return 126;
 	}
 
-	try
-	{
-		app_=reg_app_->create_app(argc, argv);
-	}
-	catch(const UsageError &e)
-	{
-		reg_app_->usage(e.what(), argv[0], e.get_brief());
-		return 1;
-	}
+	data_=data;
 
 	try
 	{
+		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;
@@ -57,10 +61,25 @@ int Application::run(int argc, char **argv)
 	catch(const exception &e)
 	{
 		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';
+
+		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_;
-		throw;
+		return 124;
 	}
 }
 
@@ -116,6 +135,8 @@ int Application::main()
 			sched_yield();
 #endif
 		}
+		else if(loop_mode_==TICK_BUSY)
+			tick();
 	}
 
 	return exit_code;
@@ -182,5 +203,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp