Assimilate exceptions and RefPtr from mspmisc

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

diff --git a/source/core/application.h b/source/core/application.h
index 5f3968ac4018faa2c6f3f8b1e3e3fb8f77f1ef64..81569ad45a965ad85c165a7eb5914f360be3f9a7 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -1,14 +1,13 @@
-/*
-This file is part of libmspframework
+/* $Id$
+
+This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_FRAMEWORK_APPLICATION_H_
-#define MSP_FRAMEWORK_APPLICATION_H_
+#ifndef MSP_CORE_APPLICATION_H_
+#define MSP_CORE_APPLICATION_H_
 
-#include "event.h"
-#include "poller.h"
-#include "types.h"
+#include "semaphore.h"
 
 namespace Msp {
 
@@ -19,25 +18,24 @@ member of type RegApp<MainClass>.
 class Application
 {
 public:
-       Poller::Slot &add_pollable(Pollable *, short);
-       EventManager::Event &create_event();
-       virtual ~Application();
+       virtual ~Application() { }
 
        static int run(int, char **);
-       static void usage(const char *, bool);
+       static void usage(const char *, const char *, bool);
 protected:
-       enum TickMode
+       enum LoopMode
        {
-               NONE,       /// No ticks
-               AFTER_POLL, /// One tick after each poll
-               IDLE        /// Constant torrent of ticks
+               NONE,       /// No main loop - main() will just return
+               SLEEP,      /// Only sleep in the main loop - useful for servers
+               TICK_SLEEP, /// Call tick every iteration, with a short sleep in between
+               TICK_YIELD  /// Call tick every iteration, with sched_yield in between
        };
-       
+
        class RegBase
        {
        public:
                virtual Application *create_app(int, char **)=0;
-               virtual void usage(const char *, bool)=0;
+               virtual void usage(const char *, const char *, bool)=0;
                virtual ~RegBase() { }
        protected:
                RegBase();
@@ -48,7 +46,7 @@ protected:
        {
        public:
                Application *create_app(int argc, char **argv) { return new T(argc, argv); }
-               void usage(const char *a, bool b) { T::usage(a,b); }
+               void usage(const char *r, const char *a, bool b) { T::usage(r, a, b); }
        };
 
        bool done;
@@ -57,20 +55,19 @@ protected:
        Application();
        virtual int main();
        void catch_signal(int);
-       void set_tick_mode(TickMode);
+       void set_loop_mode(LoopMode);
+       void induce_tick();
        void exit(int);
        virtual void tick() { }
        virtual void sighandler(int) { }
 private:
-       TickMode     tick_mode_;
-       Poller       *poller_;
-       EventManager *ev_mgr_;
-       ThreadHandle main_tid;
+       LoopMode     loop_mode_;
+       Semaphore    sleep_sem_;
 
        Application(const Application &);
        Application &operator=(const Application &);
 
-       static RegBase *reg_app_;
+       static RegBase     *reg_app_;
        static Application *app_;
 
        static void sighandler_(int);