Browse Source

better resize

master
Marc Alexander Lehmann 13 years ago
parent
commit
471dfc58ca
2 changed files with 30 additions and 21 deletions
  1. +29
    -20
      ev.c
  2. +1
    -1
      ev.h

+ 29
- 20
ev.c View File

@ -115,7 +115,13 @@ get_clock (void)
#define array_needsize(base,cur,cnt,init) \
if ((cnt) > cur) \
{ \
int newcnt = cur ? cur << 1 : 16; \
int newcnt = cur; \
do \
{ \
newcnt = (newcnt << 1) | 4 & ~3; \
} \
while ((cnt) > newcnt); \
\
base = realloc (base, sizeof (*base) * (newcnt)); \
init (base + cur, newcnt - cur); \
cur = newcnt; \
@ -370,36 +376,39 @@ childcb (struct ev_signal *sw, int revents)
int ev_init (int flags)
{
if (!ev_method)
{
#if HAVE_MONOTONIC
{
struct timespec ts;
if (!clock_gettime (CLOCK_MONOTONIC, &ts))
have_monotonic = 1;
}
{
struct timespec ts;
if (!clock_gettime (CLOCK_MONOTONIC, &ts))
have_monotonic = 1;
}
#endif
ev_now = ev_time ();
now = get_clock ();
diff = ev_now - now;
ev_now = ev_time ();
now = get_clock ();
diff = ev_now - now;
if (pipe (sigpipe))
return 0;
if (pipe (sigpipe))
return 0;
ev_method = EVMETHOD_NONE;
ev_method = EVMETHOD_NONE;
#if HAVE_EPOLL
if (ev_method == EVMETHOD_NONE) epoll_init (flags);
if (ev_method == EVMETHOD_NONE) epoll_init (flags);
#endif
#if HAVE_SELECT
if (ev_method == EVMETHOD_NONE) select_init (flags);
if (ev_method == EVMETHOD_NONE) select_init (flags);
#endif
if (ev_method)
{
evw_init (&sigev, sigcb);
siginit ();
if (ev_method)
{
evw_init (&sigev, sigcb);
siginit ();
evsignal_init (&childev, childcb, SIGCHLD);
evsignal_start (&childev);
evsignal_init (&childev, childcb, SIGCHLD);
evsignal_start (&childev);
}
}
return ev_method;


+ 1
- 1
ev.h View File

@ -148,7 +148,7 @@ struct ev_child
EV_WATCHER_LIST (ev_child);
int pid; /* ro */
int status; /* holds the exit status, use the macros from sys/wait.h */
int status; /* rw, holds the exit status, use the macros from sys/wait.h */
};
#define EVMETHOD_NONE 0


Loading…
Cancel
Save