add support for cyclic garbage collection to eTimer and eSocketNotifier

[vuplus_dvbapp] / lib / base / ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index 27e4ec8..c4dab62 100644 (file)
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -132,8 +132,6 @@ static inline long timeout_usec ( const timeval & orig )
        return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
 }
 
        return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
 }
 

-#endif
-

 class eMainloop;
 
                                        // die beiden signalquellen: SocketNotifier...
 class eMainloop;
 
                                        // die beiden signalquellen: SocketNotifier...


@@ -154,6 +152,7 @@ private:
        int fd;
        int state;
        int requested;          // requested events (POLLIN, ...)
        int fd;
        int state;
        int requested;          // requested events (POLLIN, ...)

+       void activate(int what) { /*emit*/ activated(what); }

 public:
        /**
         * \brief Constructs a eSocketNotifier.
 public:
        /**
         * \brief Constructs a eSocketNotifier.


@@ -166,7 +165,6 @@ public:
        ~eSocketNotifier();
 
        PSignal1<void, int> activated;
        ~eSocketNotifier();
 
        PSignal1<void, int> activated;

-       void activate(int what) { /*emit*/ activated(what); }

 
        void start();
        void stop();
 
        void start();
        void stop();


@@ -177,6 +175,8 @@ public:
        void setRequested(int req) { requested=req; }
 };
 
        void setRequested(int req) { requested=req; }
 };
 

+#endif
+

 class eTimer;
 
                        // werden in einer mainloop verarbeitet
 class eTimer;
 
                        // werden in einer mainloop verarbeitet


@@ -217,11 +217,8 @@ public:
                existing_loops.push_back(this);
                pthread_mutex_init(&recalcLock, 0);
        }
                existing_loops.push_back(this);
                pthread_mutex_init(&recalcLock, 0);
        }

-       ~eMainloop()
-       {
-               existing_loops.remove(this);
-               pthread_mutex_destroy(&recalcLock);
-       }
+       virtual ~eMainloop();
+

        int looplevel() { return loop_level; }
 
 #ifndef SWIG
        int looplevel() { return loop_level; }
 
 #ifndef SWIG


@@ -268,6 +265,7 @@ public:
        }
 };
 
        }
 };
 

+#ifndef SWIG

                                // ... und Timer
 /**
  * \brief Gives a callback after a specified timeout.
                                // ... und Timer
 /**
  * \brief Gives a callback after a specified timeout.


@@ -283,6 +281,7 @@ class eTimer
        bool bSingleShot;
        bool bActive;
        void addTimeOffset(int);
        bool bSingleShot;
        bool bActive;
        void addTimeOffset(int);

+       void activate();

 public:
        /**
         * \brief Constructs a timer.
 public:
        /**
         * \brief Constructs a timer.


@@ -294,17 +293,17 @@ public:
        ~eTimer() { if (bActive) stop(); }
 
        PSignal0<void> timeout;
        ~eTimer() { if (bActive) stop(); }
 
        PSignal0<void> timeout;

-       void activate();

 
        bool isActive() { return bActive; }
 
        bool isActive() { return bActive; }

+

        timeval &getNextActivation() { return nextActivation; }
 
        void start(long msec, bool b=false);
        void stop();
        void changeInterval(long msek);
        timeval &getNextActivation() { return nextActivation; }
 
        void start(long msec, bool b=false);
        void stop();
        void changeInterval(long msek);

-#ifndef SWIG
-       bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
-#endif

        void startLongTimer( int seconds );
        void startLongTimer( int seconds );

+       bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }

 };
 };

+#endif  // SWIG
+

 #endif
 #endif