ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Get rid of the annoying error messages when setrlimit fails, which seems to be a constant problem on the Mac. Don't use the changed values for max limits if the setrlimit call failed.

Просмотр исходного кода 
This commit was SVN r24703.
Этот коммит содержится в:
Ralph Castain 2011-05-17 03:27:43 +00:00
родитель 36db9c6233
Коммит 486041f89d
1 изменённых файлов: 16 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

35
opal/util/sys_limits.c
Просмотреть файл

@ -57,7 +57,7 @@ OPAL_DECLSPEC opal_sys_limits_t opal_sys_limits = {
int opal_util_init_sys_limits(void) int opal_util_init_sys_limits(void)
{ {
#ifndef __WINDOWS__ #ifndef __WINDOWS__
struct rlimit rlim; struct rlimit rlim, rlim_set;
#endif #endif
int value; int value;
bool set_lims; bool set_lims;
@ -71,13 +71,12 @@ int opal_util_init_sys_limits(void)
/* George: please insert whatever is needed here someday */ /* George: please insert whatever is needed here someday */
#else #else
/* get/set the system limits on number of files we can have open */ /* get/set the system limits on number of files we can have open */
if (getrlimit (RLIMIT_NOFILE, &rlim) < 0) { if (0 <= getrlimit (RLIMIT_NOFILE, &rlim)) {
opal_output(0, "getrlimit (RLIMIT_NOFILE) failed: %s\n", strerror(errno));
} else {
if (set_lims) { if (set_lims) {
rlim.rlim_cur = rlim.rlim_max; rlim_set.rlim_cur = rlim.rlim_max;
if (setrlimit (RLIMIT_NOFILE, &rlim) < 0) { rlim_set.rlim_max = rlim.rlim_max;
opal_output(0, "setrlimit (RLIMIT_NOFILE) failed: %s\n", strerror(errno)); if (0 <= setrlimit (RLIMIT_NOFILE, &rlim_set)) {
rlim.rlim_cur = rlim.rlim_max;
} }
} }
opal_sys_limits.num_files = rlim.rlim_cur; opal_sys_limits.num_files = rlim.rlim_cur;
@ -85,13 +84,12 @@ int opal_util_init_sys_limits(void)
#if HAVE_DECL_RLIMIT_NPROC #if HAVE_DECL_RLIMIT_NPROC
/* get/set the system limits on number of child procs we can have open */ /* get/set the system limits on number of child procs we can have open */
if (getrlimit (RLIMIT_NPROC, &rlim) < 0) { if (0 <= getrlimit (RLIMIT_NPROC, &rlim)) {
opal_output(0, "getrlimit (RLIMIT_NPROC) failed: %s\n", strerror(errno));
} else {
if (set_lims) { if (set_lims) {
rlim.rlim_cur = rlim.rlim_max; rlim_set.rlim_cur = rlim.rlim_max;
if (setrlimit (RLIMIT_NPROC, &rlim) < 0) { rlim_set.rlim_max = rlim.rlim_max;
opal_output(0, "setrlimit (RLIMIT_NPROC) failed: %s\n", strerror(errno)); if (0 <= setrlimit (RLIMIT_NPROC, &rlim_set)) {
rlim.rlim_cur = rlim.rlim_max;
} }
} }
opal_sys_limits.num_procs = rlim.rlim_cur; opal_sys_limits.num_procs = rlim.rlim_cur;
@ -99,13 +97,12 @@ int opal_util_init_sys_limits(void)
#endif #endif
/* get/set the system limits on max file size we can create */ /* get/set the system limits on max file size we can create */
if (getrlimit (RLIMIT_FSIZE, &rlim) < 0) { if (0 <= getrlimit (RLIMIT_FSIZE, &rlim)) {
opal_output(0, "getrlimit (RLIMIT_FSIZE) failed: %s\n", strerror(errno));
} else {
if (set_lims) { if (set_lims) {
rlim.rlim_cur = rlim.rlim_max; rlim_set.rlim_cur = rlim.rlim_max;
if (setrlimit (RLIMIT_FSIZE, &rlim) < 0) { rlim_set.rlim_max = rlim.rlim_max;
opal_output(0, "setrlimit (RLIMIT_FSIZE) failed: %s\n", strerror(errno)); if (0 <= setrlimit (RLIMIT_FSIZE, &rlim_set)) {
rlim.rlim_cur = rlim.rlim_max;
} }
} }
opal_sys_limits.file_size = rlim.rlim_cur; opal_sys_limits.file_size = rlim.rlim_cur;