Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h events.c main.c timers.c
Log Message:
Another fix to avoid timer starvation by X events.
- Thanks to Mark Bowyer for help to sort this out.
Change timers to use absolute time.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -3 -r1.526 -r1.527
--- E.h 8 Jan 2006 14:27:59 -0000 1.526
+++ E.h 8 Jan 2006 16:13:19 -0000 1.527
@@ -579,12 +579,11 @@
typedef struct _qentry
{
char *name;
- double in_time;
+ double at_time;
void (*func) (int val, void *data);
struct _qentry *next;
int runtime_val;
void *runtime_data;
- char just_added;
}
Qentry;
@@ -742,7 +741,7 @@
#define EventDebugSet(type, value)
#endif
void EventsInit(void);
-void WaitEvent(void);
+void EventsMain(void);
void EventDebugInit(const char *s);
void EventShow(const XEvent * ev);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- events.c 7 Jan 2006 07:20:58 -0000 1.112
+++ events.c 8 Jan 2006 16:13:20 -0000 1.113
@@ -533,123 +533,111 @@
* events from the X server are interpreted, timer events are inserted, etc
*/
void
-WaitEvent(void)
+EventsMain(void)
{
static int evq_alloc = 0;
static int evq_fetch = 0;
static XEvent *evq_ptr = NULL;
fd_set fdset;
struct timeval tval;
- static struct timeval tval_last = { 0, 0 };
- double time1, time2;
+ double time1, time2, dt;
Qentry *qe;
- int count, pcount, pfetch;
+ int count, pfetch;
int fdsize;
int xfd, smfd;
- pcount = pfetch = 0;
+ time1 = GetTime();
+
for (;;)
{
+ pfetch = 0;
count = EventsProcess(&evq_ptr, &evq_alloc, &pfetch);
- if (count > pcount)
- pcount = count;
-
- if (XPending(disp))
- continue;
-
if (EventDebug(EDBUG_TYPE_EVENTS))
- Eprintf("WaitEvent - Idlers\n");
+ Eprintf("EventsMain - Idlers\n");
DialogsCheckUpdate(); /* FIXME - Shouldn't be here */
ModulesSignal(ESIGNAL_IDLE, NULL);
- if (!XPending(disp))
- break;
- }
-
- if (pfetch)
- {
- evq_fetch =
- (pfetch > evq_fetch) ? pfetch : (3 * evq_fetch + pfetch) / 4;
- if (EventDebug(EDBUG_TYPE_EVENTS))
- Eprintf("WaitEvent - Alloc/fetch/pfetch/peak=%d/%d/%d/%d)\n",
- evq_alloc, evq_fetch, pfetch, pcount);
- if ((evq_ptr) && ((evq_alloc - evq_fetch) > 64))
+ if (pfetch)
{
- evq_alloc = 0;
- Efree(evq_ptr);
- evq_ptr = NULL;
+ evq_fetch =
+ (pfetch > evq_fetch) ? pfetch : (3 * evq_fetch + pfetch) / 4;
+ if (EventDebug(EDBUG_TYPE_EVENTS))
+ Eprintf("EventsMain - Alloc/fetch/pfetch/peak=%d/%d/%d/%d)\n",
+ evq_alloc, evq_fetch, pfetch, count);
+ if ((evq_ptr) && ((evq_alloc - evq_fetch) > 64))
+ {
+ evq_alloc = 0;
+ Efree(evq_ptr);
+ evq_ptr = NULL;
+ }
}
- }
- FD_ZERO(&fdset);
- xfd = ConnectionNumber(disp);
- FD_SET(xfd, &fdset);
- smfd = GetSMfd();
- if (smfd >= 0)
- FD_SET(smfd, &fdset);
- fdsize = MAX(xfd, smfd) + 1;
-
- /* First time */
- if ((tval_last.tv_sec == 0) && (tval_last.tv_usec == 0))
- gettimeofday(&tval_last, NULL);
- /* time1 = time we last were here */
- time1 = ((double)tval_last.tv_sec) + (((double)tval_last.tv_usec) /
1000000);
-
- /* time2 = current time */
- gettimeofday(&tval, NULL);
- time2 = ((double)tval.tv_sec) + (((double)tval.tv_usec) / 1000000);
- time2 -= time1;
- if (time2 < 0.0)
- time2 = 0.0;
- /* time2 = time spent since we last were here */
+ FD_ZERO(&fdset);
+ xfd = ConnectionNumber(disp);
+ FD_SET(xfd, &fdset);
+ smfd = GetSMfd();
+ if (smfd >= 0)
+ FD_SET(smfd, &fdset);
+ fdsize = MAX(xfd, smfd) + 1;
+
+ /* time2 = current time */
+ time2 = GetTime();
+ dt = time2 - time1;
+ time1 = time2;
+ if (dt < 0.0)
+ dt = 0.0;
+ /* dt = time spent since we last were here */
- tval_last.tv_sec = tval.tv_sec;
- tval_last.tv_usec = tval.tv_usec;
-
- qe = GetHeadTimerQueue();
- if (qe)
- {
- if (qe->just_added)
+ qe = GetHeadTimerQueue();
+ if (qe)
{
- qe->just_added = 0;
- time1 = qe->in_time;
+ count = 0;
+ time2 = qe->at_time - time2;
+ if (time2 < 0.0)
+ time2 = 0.0;
+ if (time2 <= 0.0)
+ goto do_timer;
+ if (XPending(disp))
+ continue;
+ tval.tv_sec = (long)time2;
+ tval.tv_usec = (long)((time2 - ((double)tval.tv_sec)) * 1000000);
+ count = select(fdsize, &fdset, NULL, NULL, &tval);
}
else
{
- time1 = qe->in_time - time2;
- if (time1 < 0.0)
- time1 = 0.0;
- qe->in_time = time1;
+ if (XPending(disp))
+ continue;
+ count = select(fdsize, &fdset, NULL, NULL, NULL);
}
- tval.tv_sec = (long)time1;
- tval.tv_usec = (long)((time1 - ((double)tval.tv_sec)) * 1000000);
- count = select(fdsize, &fdset, NULL, NULL, &tval);
- }
- else
- count = select(fdsize, &fdset, NULL, NULL, NULL);
- if (EventDebug(EDBUG_TYPE_EVENTS))
- Eprintf
- ("WaitEvent - count=%d xfd=%d:%d smfd=%d:%d qe=%p time1=%lf
time2=%lf\n",
- count, xfd, FD_ISSET(xfd, &fdset), smfd,
- (smfd >= 0) ? FD_ISSET(smfd, &fdset) : 0, qe, time1, time2);
+ if (EventDebug(EDBUG_TYPE_EVENTS))
+ Eprintf
+ ("EventsMain - count=%d xfd=%d:%d smfd=%d:%d qe=%p dt=%lf
time2=%lf\n",
+ count, xfd, FD_ISSET(xfd, &fdset), smfd,
+ (smfd >= 0) ? FD_ISSET(smfd, &fdset) : 0, qe, dt, time2);
- if (count < 0)
- return;
+ if (count < 0)
+ continue;
- if ((smfd >= 0) && (count > 0) && (FD_ISSET(smfd, &fdset)))
- {
- if (EventDebug(EDBUG_TYPE_EVENTS))
- Eprintf("WaitEvent - ICE\n");
- ProcessICEMSGS();
- }
+ if (count > 0)
+ {
+ if ((smfd >= 0) && (FD_ISSET(smfd, &fdset)))
+ {
+ if (EventDebug(EDBUG_TYPE_EVENTS))
+ Eprintf("EventsMain - ICE\n");
+ ProcessICEMSGS();
+ }
+ continue;
+ }
- if (qe && (count == 0 || time1 <= 0.0))
- {
- if (EventDebug(EDBUG_TYPE_EVENTS))
- Eprintf("WaitEvent - Timers (%s)\n", qe->name);
- HandleTimerEvent();
+ do_timer:
+ if (qe)
+ {
+ if (EventDebug(EDBUG_TYPE_EVENTS))
+ Eprintf("EventsMain - Timers (%s)\n", qe->name);
+ HandleTimerEvent();
+ }
}
}
@@ -906,7 +894,11 @@
Eprintf("%#08lx EV-%s win=%#lx\n", ser, name, win);
break;
case EX_EVENT_SHAPE_NOTIFY:
- Eprintf("%#08lx EV-%s win=%#lx\n", ser, name, win);
+#define se ((XShapeEvent *)ev)
+ Eprintf("%#08lx EV-%s win=%#lx kind=%d shaped=%d %d,%d %dx%d\n",
+ ser, name, win, se->kind, se->shaped,
+ se->x, se->y, se->width, se->height);
+#undef se
break;
#if USE_XRANDR
case EX_EVENT_SCREEN_CHANGE_NOTIFY:
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -3 -r1.137 -r1.138
--- main.c 7 Jan 2006 07:20:58 -0000 1.137
+++ main.c 8 Jan 2006 16:13:20 -0000 1.138
@@ -304,8 +304,7 @@
autosave();
/* The primary event loop */
- for (;;)
- WaitEvent();
+ EventsMain();
/* Of course, we should NEVER get to this point */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/timers.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- timers.c 7 Jan 2006 07:20:58 -0000 1.20
+++ timers.c 8 Jan 2006 16:13:21 -0000 1.21
@@ -39,72 +39,40 @@
int runtime_val, void *runtime_data)
{
Qentry *qe, *ptr, *pptr;
- double tally;
RemoveTimerEvent(name);
qe = Emalloc(sizeof(Qentry));
if (!qe)
return;
+ if (EventDebug(EDBUG_TYPE_EVENTS))
+ Eprintf("DoIn %8.3f: %s\n", in_time, name);
+
qe->name = Estrdup(name);
qe->func = func;
- qe->next = NULL;
- qe->in_time = in_time;
+ qe->at_time = GetTime() + in_time;
qe->runtime_val = runtime_val;
qe->runtime_data = runtime_data;
- qe->just_added = 1;
/* if there is no queue it becomes the queue */
if (!q_first)
- q_first = qe;
+ {
+ q_first = qe;
+ qe->next = NULL;
+ }
else
{
pptr = NULL;
- ptr = q_first;
- tally = 0.0;
- /* scan along the queue from start until sum of all timer intervals */
- /* greater than time then insert before last entry found (since it */
- /* managed to push the tally over past the end of out new timer) */
- while (ptr)
+ for (ptr = q_first; ptr; pptr = ptr, ptr = ptr->next)
{
- /* add to tally */
- tally += ptr->in_time;
- /* if this entry is after our new one add before this entry */
- if (tally > in_time)
- {
- /* number of seconds of stuff to do before the new entry */
- tally -= ptr->in_time;
- /* if the previous pointer exists then add like normal */
- qe->next = ptr;
- if (pptr)
- {
- pptr->next = qe;
- }
- /* no previous - must have to add as first in list */
- else
- q_first = qe;
- /* subtract "stuff to do before" as timers are relative */
- qe->in_time -= tally;
- /* if there is a timer after this one, subtract the time this
- * new timer has to wait from it since its inserted into the
- * time span here
- */
- if (qe->next)
- qe->next->in_time -= qe->in_time;
- /* we're done */
- return;
- }
- pptr = ptr;
- ptr = ptr->next;
- /* keep going through the list till we reach the end */
+ if (ptr->at_time > qe->at_time)
+ break;
}
- /* add to end of list */
if (pptr)
pptr->next = qe;
else
q_first = qe;
-
- qe->in_time -= tally;
+ qe->next = ptr;
}
}
@@ -128,7 +96,7 @@
/* remove it */
q_first = q_first->next;
/* run this callback */
- (*(qe->func)) (qe->runtime_val, qe->runtime_data);
+ qe->func(qe->runtime_val, qe->runtime_data);
/* free the timer */
if (qe->name)
Efree(qe->name);
@@ -142,33 +110,24 @@
Qentry *qe, *ptr, *pptr;
pptr = NULL;
- ptr = q_first;
- /* hunt through the queue */
- while (ptr)
+ for (ptr = q_first; ptr; pptr = ptr, ptr = ptr->next)
{
- /* if the name of a timer matches */
qe = ptr;
- if (!strcmp(qe->name, name))
- {
- /* remove it form the queue */
- if (pptr)
- pptr->next = qe->next;
- else
- q_first = qe->next;
- /* increase the time of the next timer accordingly */
- if (qe->next)
- qe->next->in_time += qe->in_time;
- /* free it */
- if (qe->name)
- Efree(qe->name);
- if (qe)
- Efree(qe);
- /* done */
- return 1;
- }
- pptr = ptr;
- ptr = ptr->next;
- /* keep going through the queue */
+ if (strcmp(qe->name, name))
+ continue;
+
+ /* Match - remove it from the queue */
+ if (pptr)
+ pptr->next = qe->next;
+ else
+ q_first = qe->next;
+ /* free it */
+ if (qe->name)
+ Efree(qe->name);
+ if (qe)
+ Efree(qe);
+ /* done */
+ return 1;
}
return 0;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
