cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 13:58:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

make event ports compile again

Browse Source 
svn:r1020
This commit is contained in:
Niels Provos 2009-01-19 07:00:51 +00:00
parent ec4cfa33c9
commit ddf3ee976d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
evport.c
View File

@ -96,11 +96,11 @@
*/ */
struct fd_info { struct fd_info {
short fdi_what /* combinations of EV_READ and EV_WRITE */ short fdi_what; /* combinations of EV_READ and EV_WRITE */
}; };
#define FDI_HAS_READ(fdi) ((fdi)->fdi_what & EV_READ) #define FDI_HAS_READ(fdi) ((fdi)->fdi_what & EV_READ)
#define FDI_HAS_WRITE(fdi) ((fdi)->fdi_what & EV_WRITE)) #define FDI_HAS_WRITE(fdi) ((fdi)->fdi_what & EV_WRITE)
#define FDI_HAS_EVENTS(fdi) (FDI_HAS_READ(fdi) || FDI_HAS_WRITE(fdi)) #define FDI_HAS_EVENTS(fdi) (FDI_HAS_READ(fdi) || FDI_HAS_WRITE(fdi))
#define FDI_TO_SYSEVENTS(fdi) (FDI_HAS_READ(fdi) ? POLLIN : 0) | \ #define FDI_TO_SYSEVENTS(fdi) (FDI_HAS_READ(fdi) ? POLLIN : 0) | \
(FDI_HAS_WRITE(fdi) ? POLLOUT : 0) (FDI_HAS_WRITE(fdi) ? POLLOUT : 0)
@ -297,7 +297,7 @@ evport_dispatch(struct event_base *base, struct timeval *tv)
} }
if (fdi != NULL && FDI_HAS_EVENTS(fdi)) { if (fdi != NULL && FDI_HAS_EVENTS(fdi)) {
int fd = edp->ed_pending[i]; int fd = epdp->ed_pending[i];
reassociate(epdp, fdi, fd); reassociate(epdp, fdi, fd);
epdp->ed_pending[i] = -1; epdp->ed_pending[i] = -1;
} }
@ -322,7 +322,6 @@ evport_dispatch(struct event_base *base, struct timeval *tv)
event_debug(("%s: port_getn reports %d events", __func__, nevents)); event_debug(("%s: port_getn reports %d events", __func__, nevents));
for (i = 0; i < nevents; ++i) { for (i = 0; i < nevents; ++i) {
struct event *ev;
struct fd_info *fdi; struct fd_info *fdi;
port_event_t *pevt = &pevtlist[i]; port_event_t *pevt = &pevtlist[i];
int fd = (int) pevt->portev_object; int fd = (int) pevt->portev_object;
@ -383,7 +382,7 @@ evport_add(struct event_base *base, int fd, short old, short events, void *p)
} }
fdi = &evpd->ed_fds[fd]; fdi = &evpd->ed_fds[fd];
fdi->what |= events; fdi->fdi_what |= events;
return reassociate(evpd, fdi, fd); return reassociate(evpd, fdi, fd);
} }
@ -416,9 +415,9 @@ evport_del(struct event_base *base, int fd, short old, short events, void *p)
fdi = &evpd->ed_fds[fd]; fdi = &evpd->ed_fds[fd];
if (events & EV_READ) if (events & EV_READ)
fdi->what &= ~EV_READ; fdi->fdi_what &= ~EV_READ;
if (events & EV_WRITE) if (events & EV_WRITE)
fdi->what &= ~EV_WRITE; fdi->fdi_what &= ~EV_WRITE;
if (associated) { if (associated) {
if (!FDI_HAS_EVENTS(fdi) && if (!FDI_HAS_EVENTS(fdi) &&
@ -437,7 +436,7 @@ evport_del(struct event_base *base, int fd, short old, short events, void *p)
} }
} }
} else { } else {
if ((fdi->what & (EV_READ|EV_WRITE)) == 0) { if ((fdi->fdi_what & (EV_READ|EV_WRITE)) == 0) {
evpd->ed_pending[i] = -1; evpd->ed_pending[i] = -1;
} }
} }