62116e0476f1e663d37de8477766f5cdee572862 galt Fri Oct 12 18:37:08 2012 -0700 v12.16 - fixed bug in planner which had r and c reversed so that -ramUnit option now works diff --git src/parasol/paraNode/paraNode.c src/parasol/paraNode/paraNode.c index 5606ebc..02dc455 100644 --- src/parasol/paraNode/paraNode.c +++ src/parasol/paraNode/paraNode.c @@ -366,31 +366,31 @@ { logWarn("memLimit %lld exceeds address space on 32-bit machine, treating it as 4GB limit", memLimit); memLimit = 4294967295LL; } struct rlimit rlim; rlim.rlim_cur = rlim.rlim_max = memLimit; if (setrlimit(RLIMIT_DATA, &rlim) < 0) logWarn("setrlimit failed with RLIMIT_DATA rlim_cur=%lld rlim_max=%lld" , (long long) rlim.rlim_cur , (long long) rlim.rlim_max); // although RLIMIT_AS is not supported/enforced on all platforms, // it is useful for linux and some other unix OSes. if (setrlimit(RLIMIT_AS, &rlim) < 0) logWarn("setrlimit failed with RLIMIT_AS rlim_cur=%lld rlim_max=%lld" , (long long) rlim.rlim_cur , (long long) rlim.rlim_max); - { // DEBUG REMOVE + if (0) { // change to 1 for debugging logInfo("memLimit=%lld", memLimit); struct rlimit rlim; int rv; rv = getrlimit(RLIMIT_DATA,&rlim); if ( rv == -1 ) logWarn("error getrlimit RLIMIT_DATA %s", strerror(errno)); else logInfo("rlimit_data:%lu,%lu\n", rlim.rlim_max, rlim.rlim_cur); rv = getrlimit(RLIMIT_AS,&rlim); if ( rv == -1 ) logWarn("error getrlimit RLIMIT_AS %s", strerror(errno)); else logInfo("rlimit_as:%lu,%lu\n", rlim.rlim_max, rlim.rlim_cur); }