Use vectors for storage in Poller

[libs/core.git] / source / core / application.h

diff --git a/source/core/application.h b/source/core/application.h
index 1384085ef58c3b134b9aa0abecbc68fcbd9d7e9e..59d5bf110e9706425f113dd43d1d7d0ef2ca1019 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -2,13 +2,15 @@
 #define MSP_CORE_APPLICATION_H_
 
 #include <stdexcept>
+#include <string>
+#include "noncopyable.h"
 
 namespace Msp {
 
 /**
 Base class for applications.  See also RegisteredApplication.
 */
-class Application
+class Application: private NonCopyable
 {
 protected:
        class Starter
@@ -27,12 +29,14 @@ protected:
 private:
        static Starter *starter_;
        static Application *app_;
+       static const char *argv0_;
+       static std::string name_;
        static void *data_;
 
        Application(const Application &);
        Application &operator=(const Application &);
 protected:
-       Application();
+       Application(const std::string & = std::string());
 public:
        virtual ~Application() { }
 
@@ -42,9 +46,18 @@ public:
 
        This function can only be called once.  The global main() function provided
        by the library normally does it automatically at program startup. */
-       static int run(int, char **, void * =0);
+       static int run(int, char **, void * =0, void (*)(void *) = 0);
+
+       /** Sets application startup info, including argv[0] value and platform-
+       specific data.
+
+       This function can only be called once, and is normally called by
+       Application::run(). */
+       static void set_startup_info(const char *, void *);
 
        static void *get_data() { return data_; }
+       static const char *get_argv0() { return argv0_; }
+       static const std::string &get_name() { return name_; }
 
 protected:
        /** Default main loop.  Calls tick() repeatedly until exit() is called.  A
@@ -66,8 +79,6 @@ private:
        /** Static wrapper function to call a member function of the Application
        instance. */
        static void sighandler_(int);
-
-       static void display_exception(const std::exception &);
 };
 
 
@@ -88,8 +99,9 @@ private:
        static Starter starter_;
 
 protected:
-       // Force the starter into existence
-       RegisteredApplication() { (void)starter_; }
+       RegisteredApplication(const std::string &n = std::string()):
+               Application(n)
+       { (void)starter_; }  // Force the starter into existence
 };
 
 template<typename T>