Browse Source

*** empty log message ***

master rel-1.8
Marc Alexander Lehmann 13 years ago
parent
commit
6d3be9094e
1 changed files with 20 additions and 11 deletions
  1. +20
    -11
      ev.c

+ 20
- 11
ev.c View File

@ -478,7 +478,7 @@ ev_feed_event (EV_P_ void *w, int revents)
}
}
void inline_size
void inline_speed
queue_events (EV_P_ W *events, int eventcnt, int type)
{
int i;
@ -640,11 +640,16 @@ upheap (WT *heap, int k)
{
WT w = heap [k];
while (k && heap [k >> 1]->at > w->at)
while (k)
{
heap [k] = heap [k >> 1];
int p = (k - 1) >> 1;
if (heap [p]->at <= w->at)
break;
heap [k] = heap [p];
((W)heap [k])->active = k + 1;
k >>= 1;
k = p;
}
heap [k] = w;
@ -657,19 +662,23 @@ downheap (WT *heap, int N, int k)
{
WT w = heap [k];
while (k < (N >> 1))
for (;;)
{
int j = k << 1;
int c = (k << 1) + 1;
if (c >= N)
break;
if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
++j;
c += c + 1 < N && heap [c]->at > heap [c + 1]->at
? 1 : 0;
if (w->at <= heap [j]->at)
if (w->at <= heap [c]->at)
break;
heap [k] = heap [j];
heap [k] = heap [c];
((W)heap [k])->active = k + 1;
k = j;
k = c;
}
heap [k] = w;


Loading…
Cancel
Save