1
1

Undo 4 of the 5 changes introduced by r22638. Leave

one of them in as it may still be needed on Solaris.

This fixes trac:2530.

This commit was SVN r23626.

The following SVN revision numbers were found above:
  r22638 --> open-mpi/ompi@2a4b1227d9

The following Trac tickets were found above:
  Ticket 2530 --> https://svn.open-mpi.org/trac/ompi/ticket/2530
Этот коммит содержится в:
Rolf vandeVaart 2010-08-18 20:06:50 +00:00
родитель 94be1e043d
Коммит e71827b8ff
2 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -192,12 +192,12 @@ devpoll_recalc(struct event_base *base, void *arg, int max)
{ {
struct devpollop *devpollop = arg; struct devpollop *devpollop = arg;
if (max > devpollop->nfds) { if (max >= devpollop->nfds) {
struct evdevpoll *fds; struct evdevpoll *fds;
int nfds; int nfds;
nfds = devpollop->nfds; nfds = devpollop->nfds;
while (nfds < max) while (nfds <= max)
nfds <<= 1; nfds <<= 1;
fds = realloc(devpollop->fds, nfds * sizeof(struct evdevpoll)); fds = realloc(devpollop->fds, nfds * sizeof(struct evdevpoll));

Просмотреть файл

@ -167,12 +167,12 @@ epoll_recalc(struct event_base *base, void *arg, int max)
{ {
struct epollop *epollop = arg; struct epollop *epollop = arg;
if (max > epollop->nfds) { if (max >= epollop->nfds) {
struct evepoll *fds; struct evepoll *fds;
int nfds; int nfds;
nfds = epollop->nfds; nfds = epollop->nfds;
while (nfds < max) while (nfds <= max)
nfds <<= 1; nfds <<= 1;
fds = realloc(epollop->fds, nfds * sizeof(struct evepoll)); fds = realloc(epollop->fds, nfds * sizeof(struct evepoll));