зеркало из https://github.com/github/ruby.git
thread.c: move ppoll wrapper before thread_pthread.c
thread_pthread.c relies on ppoll for rb_sigwait_sleep, so ensure the compatibility wrapper is available for it. Reported-by: SHIBATA Hiroshi <hsbt@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
4c1ab82f06
Коммит
2fa1e2e3c3
85
thread.c
85
thread.c
|
@ -361,6 +361,49 @@ ubf_sigwait(void *ignore)
|
|||
rb_thread_wakeup_timer_thread(0);
|
||||
}
|
||||
|
||||
#ifdef USE_POLL
|
||||
|
||||
/* The same with linux kernel. TODO: make platform independent definition. */
|
||||
#define POLLIN_SET (POLLRDNORM | POLLRDBAND | POLLIN | POLLHUP | POLLERR)
|
||||
#define POLLOUT_SET (POLLWRBAND | POLLWRNORM | POLLOUT | POLLERR)
|
||||
#define POLLEX_SET (POLLPRI)
|
||||
|
||||
#ifndef POLLERR_SET /* defined for FreeBSD for now */
|
||||
# define POLLERR_SET (0)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_PPOLL
|
||||
/* TODO: don't ignore sigmask */
|
||||
static int
|
||||
ruby_ppoll(struct pollfd *fds, nfds_t nfds,
|
||||
const struct timespec *ts, const sigset_t *sigmask)
|
||||
{
|
||||
int timeout_ms;
|
||||
|
||||
if (ts) {
|
||||
int tmp, tmp2;
|
||||
|
||||
if (ts->tv_sec > INT_MAX/1000)
|
||||
timeout_ms = INT_MAX;
|
||||
else {
|
||||
tmp = (int)(ts->tv_sec * 1000);
|
||||
/* round up 1ns to 1ms to avoid excessive wakeups for <1ms sleep */
|
||||
tmp2 = (int)((ts->tv_nsec + 999999L) / (1000L * 1000L));
|
||||
if (INT_MAX - tmp < tmp2)
|
||||
timeout_ms = INT_MAX;
|
||||
else
|
||||
timeout_ms = (int)(tmp + tmp2);
|
||||
}
|
||||
}
|
||||
else
|
||||
timeout_ms = -1;
|
||||
|
||||
return poll(fds, nfds, timeout_ms);
|
||||
}
|
||||
# define ppoll(fds,nfds,ts,sigmask) ruby_ppoll((fds),(nfds),(ts),(sigmask))
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include "thread_win32.c"
|
||||
|
||||
|
@ -4021,48 +4064,6 @@ rb_thread_fd_select(int max, rb_fdset_t * read, rb_fdset_t * write, rb_fdset_t *
|
|||
return (int)rb_ensure(do_select, (VALUE)&set, select_set_free, (VALUE)&set);
|
||||
}
|
||||
|
||||
#ifdef USE_POLL
|
||||
|
||||
/* The same with linux kernel. TODO: make platform independent definition. */
|
||||
#define POLLIN_SET (POLLRDNORM | POLLRDBAND | POLLIN | POLLHUP | POLLERR)
|
||||
#define POLLOUT_SET (POLLWRBAND | POLLWRNORM | POLLOUT | POLLERR)
|
||||
#define POLLEX_SET (POLLPRI)
|
||||
|
||||
#ifndef POLLERR_SET /* defined for FreeBSD for now */
|
||||
# define POLLERR_SET (0)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_PPOLL
|
||||
/* TODO: don't ignore sigmask */
|
||||
static int
|
||||
ruby_ppoll(struct pollfd *fds, nfds_t nfds,
|
||||
const struct timespec *ts, const sigset_t *sigmask)
|
||||
{
|
||||
int timeout_ms;
|
||||
|
||||
if (ts) {
|
||||
int tmp, tmp2;
|
||||
|
||||
if (ts->tv_sec > INT_MAX/1000)
|
||||
timeout_ms = INT_MAX;
|
||||
else {
|
||||
tmp = (int)(ts->tv_sec * 1000);
|
||||
/* round up 1ns to 1ms to avoid excessive wakeups for <1ms sleep */
|
||||
tmp2 = (int)((ts->tv_nsec + 999999L) / (1000L * 1000L));
|
||||
if (INT_MAX - tmp < tmp2)
|
||||
timeout_ms = INT_MAX;
|
||||
else
|
||||
timeout_ms = (int)(tmp + tmp2);
|
||||
}
|
||||
}
|
||||
else
|
||||
timeout_ms = -1;
|
||||
|
||||
return poll(fds, nfds, timeout_ms);
|
||||
}
|
||||
# define ppoll(fds,nfds,ts,sigmask) ruby_ppoll((fds),(nfds),(ts),(sigmask))
|
||||
#endif
|
||||
|
||||
/*
|
||||
* returns a mask of events
|
||||
*/
|
||||
|
|
Загрузка…
Ссылка в новой задаче