void eMainloop::removeSocketNotifier(eSocketNotifier *sn)
{
- notifiers.erase(sn->getFD());
+ for (std::multimap<int,eSocketNotifier*>::iterator i = notifiers.find(sn->getFD());
+ i != notifiers.end();
+ ++i)
+ if (i->second == sn)
+ return notifiers.erase(i);
+ eFatal("removed socket notifier which is not present");
}
-void eMainloop::processOneEvent()
+int eMainloop::processOneEvent(unsigned int user_timeout)
{
+ int return_reason = 0;
/* get current time */
timeval now;
gettimeofday(&now, 0);
poll_timeout /= 1000;
}
+ if ((user_timeout > 0) && (poll_timeout > user_timeout))
+ {
+ poll_timeout = user_timeout;
+ return_reason = 1;
+ }
+
int ret = 0;
-
+
if (poll_timeout)
{
+
+ std::multimap<int,eSocketNotifier*>::iterator it;
+ std::map<int,int> fd_merged;
+ std::map<int,int>::const_iterator fd_merged_it;
+
+ for (it = notifiers.begin(); it != notifiers.end(); ++it)
+ fd_merged[it->first] |= it->second->getRequested();
+
+ fd_merged_it = fd_merged.begin();
+
+ int fdcount = fd_merged.size();
+
// build the poll aray
- int fdcount = notifiers.size();
pollfd* pfd = new pollfd[fdcount]; // make new pollfd array
-
- std::map<int,eSocketNotifier*>::iterator it(notifiers.begin());
- for (int i=0; i < fdcount; i++, it++)
+
+ for (int i=0; i < fdcount; i++, fd_merged_it++)
{
- pfd[i].fd = it->first;
- pfd[i].events = it->second->getRequested();
+ pfd[i].fd = fd_merged_it->first;
+ pfd[i].events = fd_merged_it->second;
}
ret = poll(pfd, fdcount, poll_timeout);
-
+
/* ret > 0 means that there are some active poll entries. */
if (ret > 0)
{
+ return_reason = 0;
for (int i=0; i < fdcount ; i++)
{
- if (notifiers.find(pfd[i].fd) == notifiers.end())
- continue;
+ it = notifiers.begin();
+
+ int handled = 0;
- int req = notifiers[pfd[i].fd]->getRequested();
+ std::multimap<int,eSocketNotifier*>::iterator
+ l = notifiers.lower_bound(pfd[i].fd),
+ u = notifiers.upper_bound(pfd[i].fd);
- if (pfd[i].revents & req)
+ ePtrList<eSocketNotifier> n;
+
+ for (; l != u; ++l)
+ n.push_back(l->second);
+
+ for (ePtrList<eSocketNotifier>::iterator li(n.begin()); li != n.end(); ++li)
{
- notifiers[pfd[i].fd]->activate(pfd[i].revents);
+ int req = li->getRequested();
+
+ handled |= req;
- if (!--ret)
- break;
- } else if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL))
- eFatal("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d) -> FIX YOUR CODE", pfd[i].fd,pfd[i].revents);
+ if (pfd[i].revents & req)
+ (*li)->activate(pfd[i].revents);
+ }
+ if ((pfd[i].revents&~handled) & (POLLERR|POLLHUP|POLLNVAL))
+ eFatal("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents);
}
ret = 1; /* poll did not timeout. */
if (errno != EINTR)
eDebug("poll made error (%m)");
else
+ {
+ return_reason = 2;
ret = -1; /* don't assume the timeout has passed when we got a signal */
+ }
}
delete [] pfd;
}
/* this will never change while we have the recalcLock */
/* we can savely return here, the timer will be re-checked soon. */
if (m_now_is_invalid)
- return;
+ return 0;
/* process all timers which are ready. first remove them out of the list. */
while ((!m_timer_list.empty()) && (m_timer_list.begin()->getNextActivation() <= now))
m_timer_list.begin()->activate();
}
+
+ return return_reason;
}
void eMainloop::addTimer(eTimer* e)
m_timer_list.remove(e);
}
-int eMainloop::exec()
+int eMainloop::iterate(unsigned int user_timeout)
{
- if (!loop_level)
- {
- app_quit_now = false;
- app_exit_loop = false;
- enter_loop();
- }
- return retval;
-}
-
-void eMainloop::enter_loop()
-{
- loop_level++;
- // Status der vorhandenen Loop merken
- bool old_exit_loop = app_exit_loop;
-
- app_exit_loop = false;
-
- while (!app_exit_loop && !app_quit_now)
- processOneEvent();
-
- // wiederherstellen der vorherigen app_exit_loop
- app_exit_loop = old_exit_loop;
-
- --loop_level;
-
- if (!loop_level)
- {
- // do something here on exit the last loop
- }
+ int ret = 0;
+
+ do
+ {
+ if (app_quit_now) break;
+ ret = processOneEvent(user_timeout);
+ } while (ret == 0);
+
+ return ret;
}
-void eMainloop::exit_loop() // call this to leave the current loop
+int eMainloop::runLoop()
{
- app_exit_loop = true;
+ while (!app_quit_now)
+ iterate();
+ return retval;
}
-void eMainloop::quit( int ret ) // call this to leave all loops
+void eMainloop::quit(int ret)
{
- retval=ret;
+ retval = ret;
app_quit_now = true;
}
extern eApplication* eApp;
+#ifndef SWIG
/* TODO: remove these inlines. */
static inline bool operator<( const timeval &t1, const timeval &t2 )
{
{
return t1.tv_sec*1000000 + t1.tv_usec;
}
+#endif
class eMainloop;
{
public:
enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
+#ifndef SWIG
private:
eMainloop &context;
int fd;
int state;
int requested; // requested events (POLLIN, ...)
+#endif
public:
/**
* \brief Constructs a eSocketNotifier.
// werden in einer mainloop verarbeitet
class eMainloop
{
+#ifndef SWIG
friend class eTimer;
friend class eSocketNotifier;
- std::map<int, eSocketNotifier*> notifiers;
+ std::multimap<int, eSocketNotifier*> notifiers;
ePtrList<eTimer> m_timer_list;
- bool app_exit_loop;
bool app_quit_now;
int loop_level;
- void processOneEvent();
+ int processOneEvent(unsigned int user_timeout);
int retval;
pthread_mutex_t recalcLock;
int m_now_is_invalid;
+#endif
public:
static void addTimeOffset(int offset);
void addSocketNotifier(eSocketNotifier *sn);
void addTimer(eTimer* e);
void removeTimer(eTimer* e);
+#ifndef SWIG
static ePtrList<eMainloop> existing_loops;
+#endif
+
eMainloop()
:app_quit_now(0),loop_level(0),retval(0)
{
}
int looplevel() { return loop_level; }
- /* OBSOLETE. DONT USE. */
- int exec(); // recursive enter the loop
+#ifndef SWIG
void quit(int ret=0); // leave all pending loops (recursive leave())
- void enter_loop();
- void exit_loop();
+#endif
+
+ /* a user supplied timeout. enter_loop will return with:
+ 0 - no timeout, no signal
+ 1 - timeout
+ 2 - signal
+ */
+ int iterate(unsigned int timeout=0);
+
+ /* run will iterate endlessly until the app is quit, and return
+ the exit code */
+ int runLoop();
};
/**
*/
class eTimer
{
+#ifndef SWIG
friend class eMainloop;
eMainloop &context;
timeval nextActivation;
long interval;
bool bSingleShot;
bool bActive;
+#endif
public:
/**
* \brief Constructs a timer.
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 addTimeOffset(int);
};
extern void quitMainloop(int exit_code);
extern void setLCD(const char *c);
extern void setLCDClock(const char *c);
+extern eApplication *getApplication();
extern PSignal1<void,int> &keyPressedSignal();
%}
%include <lib/base/object.h>
%include <lib/base/eerror.h>
%include <lib/base/econfig.h>
+
+%immutable eTimer::timeout;
+%immutable eSocketNotifier::activated;
+%include <lib/base/ebase.h>
%include <lib/base/smartptr.h>
%include <lib/service/iservice.h>
%include <lib/service/service.h>
$1 = $input->get();
}
-/************** base **************/
-
-%immutable eTimer::timeout;
-
-class eTimer
-{
-public:
- eTimer(eMainloop *context = eApp);
- PSignal0<void> timeout;
-
- void start(long msec, bool singleShot=false);
- void stop();
- void changeInterval(long msek);
-};
/************** debug **************/
void quitMainloop(int exit_code);
void setLCD(const char*);
void setLCDClock(const char*);
+eApplication *getApplication();
%immutable keyPressed;
PSignal1<void,int> &keyPressedSignal();
git.cweiske.de / enigma2.git / commitdiff