Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
openldap
OpenLDAP
Commits
054c9133
Commit
054c9133
authored
Jan 02, 2019
by
Howard Chu
Browse files
ITS#8952 use msec for epoll / devpoll event wait
parent
de1575aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
servers/slapd/daemon.c
View file @
054c9133
...
...
@@ -533,7 +533,7 @@ static slap_daemon_st slap_daemon[SLAPD_MAX_DAEMON_THREADS];
# define SLAP_EVENT_WAIT(t, tvp, nsp) do { \
*(nsp) = epoll_wait( slap_daemon[t].sd_epfd, revents, \
dtblsize, (tvp) ? (tvp)->tv_sec * 1000 : -1 ); \
dtblsize, (tvp) ?
(
(tvp)->tv_sec * 1000
+ (tvp)->tv_usec / 1000)
: -1 ); \
} while (0)
#elif defined(SLAP_X_DEVPOLL) && defined(HAVE_DEVPOLL)
...
...
@@ -709,7 +709,7 @@ static slap_daemon_st slap_daemon[SLAPD_MAX_DAEMON_THREADS];
# define SLAP_EVENT_WAIT(t, tvp, nsp) do { \
struct dvpoll sd_dvpoll; \
sd_dvpoll.dp_timeout = (tvp) ? (tvp)->tv_sec * 1000 : -1; \
sd_dvpoll.dp_timeout = (tvp) ?
(
(tvp)->tv_sec * 1000
+ (tvp)->tv_usec / 1000)
: -1; \
sd_dvpoll.dp_nfds = dtblsize; \
sd_dvpoll.dp_fds = revents; \
*(nsp) = ioctl( slap_daemon[t].sd_dpfd, DP_POLL, &sd_dvpoll ); \
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment