*** empty log message ***

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index b73d16b7e66f7d37e4a84440965ffdddff6ab1dd..783eef12e1b3709f5a5898c626c5a1779e58e297 100644 (file)
--- a/event.c
+++ b/event.c
@@ -31,9 +31,12 @@
 
 #include <stddef.h>
 #include <stdlib.h>
 
 #include <stddef.h>
 #include <stdlib.h>

-#include <sys/time.h>

 #include <assert.h>
 
 #include <assert.h>
 

+#ifndef WIN32
+# include <sys/time.h>
+#endif
+

 #include "ev.h"
 #include "event.h"
 
 #include "ev.h"
 #include "event.h"
 


@@ -91,7 +94,7 @@ void *event_init (void)
 #else
   assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
 
 #else
   assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
 

-  x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
+  x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);

 #endif
 
   return x_cur;
 #endif
 
   return x_cur;


@@ -167,7 +170,6 @@ x_cb_to (EV_P_ struct ev_timer *w, int revents)
 
 void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
 {
 
 void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
 {

-  printf ("event set %p\n", ev);//D

   if (events & EV_SIGNAL)
     ev_watcher_init (&ev->iosig.sig, x_cb_sig);
   else
   if (events & EV_SIGNAL)
     ev_watcher_init (&ev->iosig.sig, x_cb_sig);
   else


@@ -191,7 +193,6 @@ int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg,
 
 int event_add (struct event *ev, struct timeval *tv)
 {
 
 int event_add (struct event *ev, struct timeval *tv)
 {

-  printf ("event add %p %p\n", ev, &ev->to);//D

   dLOOPev;
 
   /* disable all watchers */
   dLOOPev;
 
   /* disable all watchers */


@@ -219,7 +220,6 @@ int event_add (struct event *ev, struct timeval *tv)
 
 int event_del (struct event *ev)
 {
 
 int event_del (struct event *ev)
 {

-  printf ("event del %p\n", ev);//D

   dLOOPev;
 
   if (ev->ev_events & EV_SIGNAL)
   dLOOPev;
 
   if (ev->ev_events & EV_SIGNAL)


@@ -228,14 +228,13 @@ int event_del (struct event *ev)
       if (ev_is_active (&ev->iosig.sig))
         ev_signal_stop (EV_A_ &ev->iosig.sig);
     }
       if (ev_is_active (&ev->iosig.sig))
         ev_signal_stop (EV_A_ &ev->iosig.sig);
     }

-  else
+  else if (ev->ev_events & (EV_READ | EV_WRITE))

     {
       /* io */
       if (ev_is_active (&ev->iosig.io))
         ev_io_stop (EV_A_ &ev->iosig.io);
     }
 
     {
       /* io */
       if (ev_is_active (&ev->iosig.io))
         ev_io_stop (EV_A_ &ev->iosig.io);
     }
 

-  printf ("to %p %d\n", &ev->to, ev->to.active);//D

   if (ev_is_active (&ev->to))
     ev_timer_stop (EV_A_ &ev->to);
 
   if (ev_is_active (&ev->to))
     ev_timer_stop (EV_A_ &ev->to);
 


@@ -244,9 +243,9 @@ int event_del (struct event *ev)
 
 int event_pending (struct event *ev, short events, struct timeval *tv)
 {
 
 int event_pending (struct event *ev, short events, struct timeval *tv)
 {

+  short revents = 0;

   dLOOPev;
 
   dLOOPev;
 

-  short revents = 0;

 
   if (ev->ev_events & EV_SIGNAL)
     {
 
   if (ev->ev_events & EV_SIGNAL)
     {


@@ -254,7 +253,7 @@ int event_pending (struct event *ev, short events, struct timeval *tv)
       if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
         revents |= EV_SIGNAL;
     }
       if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
         revents |= EV_SIGNAL;
     }

-  else
+  else if (ev->ev_events & (EV_READ | EV_WRITE))

     {
       /* io */
       if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
     {
       /* io */
       if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))


@@ -315,8 +314,8 @@ x_loopexit_cb (int revents, void *base)
 
 int event_base_loopexit (struct event_base *base, struct timeval *tv)
 {
 
 int event_base_loopexit (struct event_base *base, struct timeval *tv)
 {

-  dLOOPbase;

   ev_tstamp after = tv_get (tv);
   ev_tstamp after = tv_get (tv);

+  dLOOPbase;

 
   ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
 
 
   ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
 


@@ -333,7 +332,7 @@ struct x_once
 static void
 x_once_cb (int revents, void *arg)
 {
 static void
 x_once_cb (int revents, void *arg)
 {

-  struct x_once *once = arg;
+  struct x_once *once = (struct x_once *)arg;

 
   once->cb (once->fd, revents, once->arg);
   free (once);
 
   once->cb (once->fd, revents, once->arg);
   free (once);


@@ -341,8 +340,8 @@ x_once_cb (int revents, void *arg)
 
 int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
 {
 
 int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
 {

+  struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));

   dLOOPbase;
   dLOOPbase;

-  struct x_once *once = malloc (sizeof (struct x_once));

 
   if (!once)
     return -1;
 
   if (!once)
     return -1;