diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-07-08 19:46:43 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-07-08 19:46:43 +0000 |
| commit | a286f67546eb45c9779660decfb990b38203a268 (patch) | |
| tree | c1332dc8c7179d59960eef3d68422aefe83cb8ab /pjlib/src/pj/ioqueue_select.c | |
| parent | fc263fb7b06d10cabe2dabeb6a22a722a463527b (diff) | |
Attempted to fix epoll for Linux
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@592 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src/pj/ioqueue_select.c')
| -rw-r--r-- | pjlib/src/pj/ioqueue_select.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pjlib/src/pj/ioqueue_select.c b/pjlib/src/pj/ioqueue_select.c index 33fcae7d..93adf07d 100644 --- a/pjlib/src/pj/ioqueue_select.c +++ b/pjlib/src/pj/ioqueue_select.c @@ -542,17 +542,17 @@ static void validate_sets(const pj_ioqueue_t *ioqueue, * set for the specified event. */ static void ioqueue_remove_from_set( pj_ioqueue_t *ioqueue, - pj_sock_t fd, + pj_ioqueue_key_t *key, enum ioqueue_event_type event_type) { pj_lock_acquire(ioqueue->lock); if (event_type == READABLE_EVENT) - PJ_FD_CLR((pj_sock_t)fd, &ioqueue->rfdset); + PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->rfdset); else if (event_type == WRITEABLE_EVENT) - PJ_FD_CLR((pj_sock_t)fd, &ioqueue->wfdset); + PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->wfdset); else if (event_type == EXCEPTION_EVENT) - PJ_FD_CLR((pj_sock_t)fd, &ioqueue->xfdset); + PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->xfdset); else pj_assert(0); @@ -566,17 +566,17 @@ static void ioqueue_remove_from_set( pj_ioqueue_t *ioqueue, * set for the specified event. */ static void ioqueue_add_to_set( pj_ioqueue_t *ioqueue, - pj_sock_t fd, + pj_ioqueue_key_t *key, enum ioqueue_event_type event_type ) { pj_lock_acquire(ioqueue->lock); if (event_type == READABLE_EVENT) - PJ_FD_SET((pj_sock_t)fd, &ioqueue->rfdset); + PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->rfdset); else if (event_type == WRITEABLE_EVENT) - PJ_FD_SET((pj_sock_t)fd, &ioqueue->wfdset); + PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->wfdset); else if (event_type == EXCEPTION_EVENT) - PJ_FD_SET((pj_sock_t)fd, &ioqueue->xfdset); + PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->xfdset); else pj_assert(0); |