#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"
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)
-{ }
-
-int Application::run(int argc, char **argv, void *data)
{
- static bool called = false;
- if(called)
- {
- IO::cerr.write("Trying to call Application::run_app twice!\n");
- return 125;
- }
- called = true;
+ if(app_)
+ throw logic_error("instance already exists");
+ if(!n.empty())
+ name_ = n;
+ else
+ name_ = FS::basename(argv0_);
+}
+
+int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *))
+{
if(!starter_)
{
- IO::cerr.write("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
{
return 1;
}
+ if(created_callback)
+ created_callback(data);
+
int result = app_->main();
Application *a = app_;
app_ = 0;
}
delete app_;
+ app_ = 0;
return 124;
}
}
+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;