X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=0ef9507a14275af33fadbd1a73f190528e8f1601;hp=6bfa6289f1174b604293c09464bd9746d783e46e;hb=ce0b610396aa8f760462fa4d7a6bb207a43994d2;hpb=fc1475d88018934a61df890c192a404a105308fd

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 6bfa628..0ef9507 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,10 +1,9 @@
-#ifdef WIN32
-#include <windows.h>
-#endif
-#include <signal.h>
-#include <iostream>
 #include <typeinfo>
+#include <signal.h>
 #include <msp/debug/demangle.h>
+#include <msp/debug/errorreporter.h>
+#include <msp/fs/utils.h>
+#include <msp/io/print.h>
 #include "application.h"
 #include "getopt.h"
 
@@ -14,37 +13,31 @@ namespace Msp {
 
 Application *Application::app_ = 0;
 Application::Starter *Application::starter_ = 0;
+const char *Application::argv0_ = 0;
+string Application::name_;
 void *Application::data_ = 0;
 
-Application::Application():
+Application::Application(const string &n):
 	exit_code(0)
-{ }
+{
+	if(app_)
+		throw logic_error("instance already exists");
 
-/**
-Constructs an instance of the registered application class and runs it.  If the
-application throws a usage_error, a help message is printed.  The GetOpt class
-will throw such exceptions automatically in error conditions.
+	if(!n.empty())
+		name_ = n;
+	else
+		name_ = FS::basename(argv0_);
+}
 
-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, void *data)
+int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *))
 {
-	static bool called = false;
-	if(called)
-	{
-		cerr<<"Trying to call Application::run_app twice!\n";
-		return 125;
-	}
-	called = true;
-
 	if(!starter_)
 	{
-		cerr<<"Trying to run with no RegisteredApplication class!\n";
+		IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
 		return 126;
 	}
 
-	data_ = data;
+	set_startup_info(argv[0], data);
 
 	try
 	{
@@ -54,11 +47,13 @@ int Application::run(int argc, char **argv, void *data)
 		}
 		catch(const usage_error &e)
 		{
-			cerr<<e.what()<<'\n';
-			cerr<<e.help()<<'\n';
+			IO::print(IO::cerr, "%s\n%s\n", e.what(), e.help());
 			return 1;
 		}
 
+		if(created_callback)
+			created_callback(data);
+
 		int result = app_->main();
 		Application *a = app_;
 		app_ = 0;
@@ -67,25 +62,33 @@ int Application::run(int argc, char **argv, void *data)
 	}
 	catch(const exception &e)
 	{
-		delete app_;
+		bool handled = false;
+		if(const Debug::ErrorReporter *er = Debug::ErrorReporter::get_current())
+			handled = er->report_uncaught_exception(e);
 
-#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';
-#endif
+		if(!handled)
+		{
+			IO::print(IO::cerr, "An uncaught exception occurred.\n");
+			IO::print(IO::cerr, "  type:   %s\n", Debug::demangle(typeid(e).name()));
+			IO::print(IO::cerr, "  what(): %s\n", e.what());
+		}
+
+		delete app_;
+		app_ = 0;
 
 		return 124;
 	}
 }
 
-/**
-Default main loop.  Calls tick() repeatedly until exit() is called.  A custom
-main loop should monitor the done member variable and return exit_code.
-*/
+void Application::set_startup_info(const char *argv0, void *data)
+{
+	if(argv0_)
+		throw logic_error("startup info already set");
+
+	argv0_ = argv0;
+	data_ = data;
+}
+
 int Application::main()
 {
 	done = false;
@@ -95,26 +98,17 @@ int Application::main()
 	return exit_code;
 }
 
-/**
-Sets the specified signal to be delivered to the sighandler member function.
-*/
 void Application::catch_signal(int s)
 {
 	signal(s, &sighandler_);
 }
 
-/**
-Causes the application to exit gracefully with the given exit code.
-*/
 void Application::exit(int c)
 {
 	done = true;
 	exit_code = c;
 }
 
-/**
-Static wrapper function to call a member function of the Application instance.
-*/
 void Application::sighandler_(int s)
 {
 	app_->sighandler(s);