nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*fix* make timer non-blocking to fix freezing when a timer is resetted in a callback function

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@282 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85 2009-11-30 15:36:06 +00:00
parent cb9f2f7517
commit 6c40536d1a
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/tint.c
View file

@ -709,6 +709,19 @@ int main (int argc, char *argv[])
// Wait for X Event or a Timer
if (pselect(max_fd+1, &fdset, 0, 0, 0, &empty_mask) > 0) {
// we need to iterate over the whole timer list, since fd_set can only be checked with the
// brute force method FD_ISSET for every possible timer
timer_iter = timer_list;
while (timer_iter) {
timer = timer_iter->data;
if (FD_ISSET(timer->id, &fdset)) {
uint64_t dummy;
if ( -1 != read(timer->id, &dummy, sizeof(uint64_t)) )
timer->_callback();
}
timer_iter = timer_iter->next;
}
while (XPending (server.dsp)) {
XNextEvent(server.dsp, &e);
@ -786,22 +799,6 @@ int main (int argc, char *argv[])
break;
}
}
// we need to iterate over the whole timer list, since fd_set can only be checked with the
// brute force method FD_ISSET for every possible timer
timer_iter = timer_list;
while (timer_iter) {
timer = timer_iter->data;
if (FD_ISSET(timer->id, &fdset)) {
uint64_t dummy;
//printf("reading from timer->id=%d\n", timer->id);
read(timer->id, &dummy, sizeof(uint64_t));
//printf("Callback timer->_callback\n");
timer->_callback();
//printf("Timer callback finished\n");
}
timer_iter = timer_iter->next;
}
}
switch (signal_pending) {

6
src/util/timer.c
View file

@ -18,6 +18,7 @@
#include <sys/timerfd.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include "timer.h"
@ -38,6 +39,11 @@ int install_timer(int value_sec, int value_nsec, int interval_sec, int interval_
t->id=timer_fd;
t->_callback = _callback;
timer_list = g_slist_prepend(timer_list, t);
int flags = fcntl( timer_fd, F_GETFL, 0 );
if( flags != -1 )
fcntl( timer_fd, F_SETFL, flags | O_NONBLOCK );
return timer_fd;
}