git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small text change
[enigma2.git]
/
lib
/
base
/
ebase.h
diff --git
a/lib/base/ebase.h
b/lib/base/ebase.h
index a399667e5417f71c866675baeb5c59bdd65dfc34..4378711a9a0126bf555c9cea31c8185d012a5f85 100644
(file)
--- a/
lib/base/ebase.h
+++ b/
lib/base/ebase.h
@@
-1,6
+1,7
@@
#ifndef __ebase_h
#define __ebase_h
#ifndef __ebase_h
#define __ebase_h
+#ifndef SWIG
#include <vector>
#include <map>
#include <sys/poll.h>
#include <vector>
#include <map>
#include <sys/poll.h>
@@
-9,8
+10,10
@@
#include <time.h>
#include <lib/base/eptrlist.h>
#include <time.h>
#include <lib/base/eptrlist.h>
-#include <lib/python/connections.h>
#include <libsig_comp.h>
#include <libsig_comp.h>
+#endif
+
+#include <lib/python/connections.h>
class eApplication;
class eApplication;
@@
-120,10
+123,15
@@
static inline timeval operator-=( timeval &t1, const long msek )
return t1;
}
return t1;
}
-static inline
int timeval_to_usec(const timeval &t1
)
+static inline
long timeout_usec ( const timeval & orig
)
{
{
- return t1.tv_sec*1000000 + t1.tv_usec;
+ timeval now;
+ gettimeofday(&now,0);
+ if ( (orig-now).tv_sec > 2000 )
+ return 2000*1000*1000;
+ return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
}
}
+
#endif
class eMainloop;
#endif
class eMainloop;
@@
-138,6
+146,7
@@
class eMainloop;
*/
class eSocketNotifier
{
*/
class eSocketNotifier
{
+ friend class eMainloop;
public:
enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
private:
public:
enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
private:
@@
-181,33
+190,35
@@
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;
pthread_mutex_t recalcLock;
pthread_mutex_t recalcLock;
- int m_now_is_invalid;
int m_interrupt_requested;
int m_interrupt_requested;
- void addSocketNotifier(eSocketNotifier *sn);
+ timeval m_twisted_timer; // twisted timer
+
+ void addSocketNotifier(eSocketNotifier *sn);
void removeSocketNotifier(eSocketNotifier *sn);
void addTimer(eTimer* e);
void removeTimer(eTimer* e);
void removeSocketNotifier(eSocketNotifier *sn);
void addTimer(eTimer* e);
void removeTimer(eTimer* e);
+ void applyTimeOffset();
public:
static void addTimeOffset(int offset);
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_interrupt_requested(0)
+ :app_quit_now(0),loop_level(0),retval(0), m_i
s_idle(0), m_i
nterrupt_requested(0)
{
{
- m_now_is_invalid = 0;
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
@@
-229,6
+240,9
@@
public:
PyObject *poll(SWIG_PYOBJECT(ePyObject) dict, SWIG_PYOBJECT(ePyObject) timeout);
void interruptPoll();
void reset();
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; }
};
/**
};
/**