}
}
-static void *(*alloc)(void *ptr, long size);
+static void *(*alloc)(void *ptr, size_t size) = realloc;
void
-ev_set_allocator (void *(*cb)(void *ptr, long size))
+ev_set_allocator (void *(*cb)(void *ptr, size_t size))
{
alloc = cb;
}
-static void *
-ev_realloc (void *ptr, long size)
+inline_speed void *
+ev_realloc (void *ptr, size_t size)
{
- ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
+ ptr = alloc (ptr, size);
if (!ptr && size)
{
- fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
+ fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size);
abort ();
}
return backend;
}
-static void
+static void noinline
loop_init (EV_P_ unsigned int flags)
{
if (!backend)
}
}
-static void
+static void noinline
loop_destroy (EV_P)
{
int i;
backend = 0;
}
-static void
+void inline_size
loop_fork (EV_P)
{
#if EV_USE_PORT
if (expect_true (p->w))
{
- assert (("non-pending watcher on pending list", p->w->pending));
+ /*assert (("non-pending watcher on pending list", p->w->pending));*/
p->w->pending = 0;
EV_CB_INVOKE (p->w, p->events);
{
ev_timer *w = timers [0];
- assert (("inactive timer on timer heap detected", ev_is_active (w)));
+ /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
/* first reschedule or stop timer */
if (w->repeat)
{
ev_periodic *w = periodics [0];
- assert (("inactive timer on periodic heap detected", ev_is_active (w)));
+ /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
/* first reschedule or stop timer */
if (w->reschedule_cb)
timers [timercnt - 1] = w;
upheap ((WT *)timers, timercnt - 1);
- assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
+ /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
}
void
assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
- if (expect_true (((W)w)->active < timercnt--))
- {
- timers [((W)w)->active - 1] = timers [timercnt];
- adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
- }
+ {
+ int active = ((W)w)->active;
+
+ if (expect_true (--active < --timercnt))
+ {
+ timers [active] = timers [timercnt];
+ adjustheap ((WT *)timers, timercnt, active);
+ }
+ }
((WT)w)->at -= mn_now;
periodics [periodiccnt - 1] = w;
upheap ((WT *)periodics, periodiccnt - 1);
- assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
+ /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
}
void
assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
- if (expect_true (((W)w)->active < periodiccnt--))
- {
- periodics [((W)w)->active - 1] = periodics [periodiccnt];
- adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
- }
+ {
+ int active = ((W)w)->active;
+
+ if (expect_true (--active < --periodiccnt))
+ {
+ periodics [active] = periodics [periodiccnt];
+ adjustheap ((WT *)periodics, periodiccnt, active);
+ }
+ }
ev_stop (EV_A_ (W)w);
}