git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
base
/
ebase.h
diff --git
a/lib/base/ebase.h
b/lib/base/ebase.h
index 27e4ec843f253f03de3ea9729831649fcbecae47..524052bda4f9b723ec4208b342d98b29ae0f6605 100644
(file)
--- a/
lib/base/ebase.h
+++ b/
lib/base/ebase.h
@@
-21,119
+21,117
@@
extern eApplication* eApp;
#ifndef SWIG
/* TODO: remove these inlines. */
#ifndef SWIG
/* TODO: remove these inlines. */
-static inline bool operator<( const time
val &t1, const timeval
&t2 )
+static inline bool operator<( const time
spec &t1, const timespec
&t2 )
{
{
- return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_
usec < t2.tv_u
sec);
+ return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_
nsec < t2.tv_n
sec);
}
}
-static inline bool operator<=( const time
val &t1, const timeval
&t2 )
+static inline bool operator<=( const time
spec &t1, const timespec
&t2 )
{
{
- return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_
usec <= t2.tv_u
sec);
+ return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_
nsec <= t2.tv_n
sec);
}
}
-static inline time
val &operator+=( timeval &t1, const timeval
&t2 )
+static inline time
spec &operator+=( timespec &t1, const timespec
&t2 )
{
t1.tv_sec += t2.tv_sec;
{
t1.tv_sec += t2.tv_sec;
- if ( (t1.tv_
usec += t2.tv_usec) >= 1
000000 )
+ if ( (t1.tv_
nsec += t2.tv_nsec) >= 1000
000000 )
{
t1.tv_sec++;
{
t1.tv_sec++;
- t1.tv_
usec -= 1
000000;
+ t1.tv_
nsec -= 1000
000000;
}
return t1;
}
}
return t1;
}
-static inline time
val operator+( const timeval &t1, const timeval
&t2 )
+static inline time
spec operator+( const timespec &t1, const timespec
&t2 )
{
{
- time
val
tmp;
+ time
spec
tmp;
tmp.tv_sec = t1.tv_sec + t2.tv_sec;
tmp.tv_sec = t1.tv_sec + t2.tv_sec;
- if ( (tmp.tv_
usec = t1.tv_usec + t2.tv_usec) >= 1
000000 )
+ if ( (tmp.tv_
nsec = t1.tv_nsec + t2.tv_nsec) >= 1000
000000 )
{
tmp.tv_sec++;
{
tmp.tv_sec++;
- tmp.tv_
usec -= 1
000000;
+ tmp.tv_
nsec -= 1000
000000;
}
return tmp;
}
}
return tmp;
}
-static inline time
val operator-( const timeval &t1, const timeval
&t2 )
+static inline time
spec operator-( const timespec &t1, const timespec
&t2 )
{
{
- time
val
tmp;
+ time
spec
tmp;
tmp.tv_sec = t1.tv_sec - t2.tv_sec;
tmp.tv_sec = t1.tv_sec - t2.tv_sec;
- if ( (tmp.tv_
usec = t1.tv_usec - t2.tv_u
sec) < 0 )
+ if ( (tmp.tv_
nsec = t1.tv_nsec - t2.tv_n
sec) < 0 )
{
tmp.tv_sec--;
{
tmp.tv_sec--;
- tmp.tv_
usec += 1
000000;
+ tmp.tv_
nsec += 1000
000000;
}
return tmp;
}
}
return tmp;
}
-static inline time
val operator-=( timeval &t1, const timeval
&t2 )
+static inline time
spec operator-=( timespec &t1, const timespec
&t2 )
{
t1.tv_sec -= t2.tv_sec;
{
t1.tv_sec -= t2.tv_sec;
- if ( (t1.tv_
usec -= t2.tv_u
sec) < 0 )
+ if ( (t1.tv_
nsec -= t2.tv_n
sec) < 0 )
{
t1.tv_sec--;
{
t1.tv_sec--;
- t1.tv_
usec += 1
000000;
+ t1.tv_
nsec += 1000
000000;
}
return t1;
}
}
return t1;
}
-static inline time
val &operator+=( timeval
&t1, const long msek )
+static inline time
spec &operator+=( timespec
&t1, const long msek )
{
t1.tv_sec += msek / 1000;
{
t1.tv_sec += msek / 1000;
- if ( (t1.tv_
usec += (msek % 1000) * 1000) >= 1
000000 )
+ if ( (t1.tv_
nsec += (msek % 1000) * 1000000) >= 1000
000000 )
{
t1.tv_sec++;
{
t1.tv_sec++;
- t1.tv_
usec -= 1
000000;
+ t1.tv_
nsec -= 1000
000000;
}
return t1;
}
}
return t1;
}
-static inline time
val operator+( const timeval
&t1, const long msek )
+static inline time
spec operator+( const timespec
&t1, const long msek )
{
{
- time
val
tmp;
+ time
spec
tmp;
tmp.tv_sec = t1.tv_sec + msek / 1000;
tmp.tv_sec = t1.tv_sec + msek / 1000;
- if ( (tmp.tv_
usec = t1.tv_usec + (msek % 1000) * 1000) >= 1
000000 )
+ if ( (tmp.tv_
nsec = t1.tv_nsec + (msek % 1000) * 1000000) >= 1000
000000 )
{
tmp.tv_sec++;
{
tmp.tv_sec++;
- tmp.tv_
u
sec -= 1000000;
+ tmp.tv_
n
sec -= 1000000;
}
return tmp;
}
}
return tmp;
}
-static inline time
val operator-( const timeval
&t1, const long msek )
+static inline time
spec operator-( const timespec
&t1, const long msek )
{
{
- time
val
tmp;
+ time
spec
tmp;
tmp.tv_sec = t1.tv_sec - msek / 1000;
tmp.tv_sec = t1.tv_sec - msek / 1000;
- if ( (tmp.tv_
usec = t1.tv_usec - (msek % 1000)*1
000) < 0 )
+ if ( (tmp.tv_
nsec = t1.tv_nsec - (msek % 1000)*1000
000) < 0 )
{
tmp.tv_sec--;
{
tmp.tv_sec--;
- tmp.tv_
usec += 1
000000;
+ tmp.tv_
nsec += 1000
000000;
}
return tmp;
}
}
return tmp;
}
-static inline time
val operator-=( timeval
&t1, const long msek )
+static inline time
spec operator-=( timespec
&t1, const long msek )
{
t1.tv_sec -= msek / 1000;
{
t1.tv_sec -= msek / 1000;
- if ( (t1.tv_
usec -= (msek % 1000) * 1
000) < 0 )
+ if ( (t1.tv_
nsec -= (msek % 1000) * 1000
000) < 0 )
{
t1.tv_sec--;
{
t1.tv_sec--;
- t1.tv_
usec += 1
000000;
+ t1.tv_
nsec += 1000
000000;
}
return t1;
}
}
return t1;
}
-static inline long timeout_usec ( const time
val
& orig )
+static inline long timeout_usec ( const time
spec
& orig )
{
{
- time
val
now;
-
gettimeofday(&now,0
);
+ time
spec
now;
+
clock_gettime(CLOCK_MONOTONIC, &now
);
if ( (orig-now).tv_sec > 2000 )
return 2000*1000*1000;
if ( (orig-now).tv_sec > 2000 )
return 2000*1000*1000;
- return (orig-now).tv_sec*1000000 + (orig-now).tv_
usec
;
+ return (orig-now).tv_sec*1000000 + (orig-now).tv_
nsec/1000
;
}
}
-#endif
-
class eMainloop;
// die beiden signalquellen: SocketNotifier...
class eMainloop;
// die beiden signalquellen: SocketNotifier...
@@
-144,8
+142,9
@@
class eMainloop;
* This class emits the signal \c eSocketNotifier::activate whenever the
* event specified by \c req is available.
*/
* This class emits the signal \c eSocketNotifier::activate whenever the
* event specified by \c req is available.
*/
-class eSocketNotifier
+class eSocketNotifier
: iObject
{
{
+ DECLARE_REF(eSocketNotifier);
friend class eMainloop;
public:
enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
friend class eMainloop;
public:
enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
@@
-154,6
+153,8
@@
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); }
+ eSocketNotifier(eMainloop *context, int fd, int req, bool startnow);
public:
/**
* \brief Constructs a eSocketNotifier.
public:
/**
* \brief Constructs a eSocketNotifier.
@@
-162,11
+163,10
@@
public:
* \param req The events to watch to, normally either \c Read or \c Write. You can specify any events that \c poll supports.
* \param startnow Specifies if the socketnotifier should start immediately.
*/
* \param req The events to watch to, normally either \c Read or \c Write. You can specify any events that \c poll supports.
* \param startnow Specifies if the socketnotifier should start immediately.
*/
- eSocketNotifier(eMainloop *context, int fd, int req, bool startnow=true);
+ static eSocketNotifier* create(eMainloop *context, int fd, int req, bool startnow=true) { return new eSocketNotifier(context, fd, req, startnow); }
~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();
@@
-175,8
+175,12
@@
public:
int getFD() { return fd; }
int getRequested() { return requested; }
void setRequested(int req) { requested=req; }
int getFD() { return fd; }
int getRequested() { return requested; }
void setRequested(int req) { requested=req; }
+
+ eSmartPtrList<iObject> m_clients;
};
};
+#endif
+
class eTimer;
// werden in einer mainloop verarbeitet
class eTimer;
// werden in einer mainloop verarbeitet
@@
-190,38
+194,28
@@
class eMainloop
int loop_level;
int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
int retval;
int loop_level;
int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
int retval;
- int time_offset;
int m_is_idle;
int m_is_idle;
-
pthread_mutex_t recalcLock
;
-
+
eSocketNotifier *m_inActivate
;
+
int m_interrupt_requested;
int m_interrupt_requested;
- time
val
m_twisted_timer; // twisted timer
-
+ time
spec
m_twisted_timer; // twisted timer
+
void addSocketNotifier(eSocketNotifier *sn);
void removeSocketNotifier(eSocketNotifier *sn);
void addTimer(eTimer* e);
void removeTimer(eTimer* e);
void addSocketNotifier(eSocketNotifier *sn);
void removeSocketNotifier(eSocketNotifier *sn);
void addTimer(eTimer* e);
void removeTimer(eTimer* e);
- void applyTimeOffset();
public:
public:
- static void addTimeOffset(int offset);
- void addInstanceTimeOffset(int offset);
- int getTimeOffset() { return time_offset; }
-
#ifndef SWIG
static ePtrList<eMainloop> existing_loops;
#endif
eMainloop()
#ifndef SWIG
static ePtrList<eMainloop> existing_loops;
#endif
eMainloop()
- :app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_interrupt_requested(0)
+ :app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_in
Activate(0), m_in
terrupt_requested(0)
{
existing_loops.push_back(this);
{
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
@@
-238,12
+232,12
@@
public:
/* run will iterate endlessly until the app is quit, and return
the exit code */
int runLoop();
/* run will iterate endlessly until the app is quit, and return
the exit code */
int runLoop();
-
+
/* our new shared polling interface. */
PyObject *poll(SWIG_PYOBJECT(ePyObject) dict, SWIG_PYOBJECT(ePyObject) timeout);
void interruptPoll();
void reset();
/* our new shared polling interface. */
PyObject *poll(SWIG_PYOBJECT(ePyObject) dict, SWIG_PYOBJECT(ePyObject) timeout);
void interruptPoll();
void reset();
-
+
/* m_is_idle needs to be atomic, but it doesn't really matter much, as it's read-only from outside */
int isIdle() { return m_is_idle; }
};
/* m_is_idle needs to be atomic, but it doesn't really matter much, as it's read-only from outside */
int isIdle() { return m_is_idle; }
};
@@
-268,21
+262,25
@@
public:
}
};
}
};
+#ifndef SWIG
// ... und Timer
/**
* \brief Gives a callback after a specified timeout.
*
* This class emits the signal \c eTimer::timeout after the specified timeout.
*/
// ... und Timer
/**
* \brief Gives a callback after a specified timeout.
*
* This class emits the signal \c eTimer::timeout after the specified timeout.
*/
-class eTimer
+class eTimer
: iObject
{
{
+ DECLARE_REF(eTimer);
friend class eMainloop;
eMainloop &context;
friend class eMainloop;
eMainloop &context;
- time
val
nextActivation;
+ time
spec
nextActivation;
long interval;
bool bSingleShot;
bool bActive;
long interval;
bool bSingleShot;
bool bActive;
- void addTimeOffset(int);
+ void activate();
+
+ eTimer(eMainloop *context): context(*context), bActive(false) { }
public:
/**
* \brief Constructs a timer.
public:
/**
* \brief Constructs a timer.
@@
-290,21
+288,22
@@
public:
* The timer is not yet active, it has to be started with \c start.
* \param context The thread from which the signal should be emitted.
*/
* The timer is not yet active, it has to be started with \c start.
* \param context The thread from which the signal should be emitted.
*/
-
eTimer(eMainloop *context=eApp): context(*context), bActive(false) {
}
+
static eTimer *create(eMainloop *context=eApp) { return new eTimer(context);
}
~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; }
+
+ timespec &getNextActivation() { return nextActivation; }
void start(long msec, bool b=false);
void stop();
void changeInterval(long msek);
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; }
+ eSmartPtrList<iObject> m_clients;
};
};
+#endif // SWIG
+
#endif
#endif