Commit 6f860637 authored by unknown's avatar unknown

Fix broken arg fot getrlimit


ndb/src/cw/cpcd/Process.cpp:
  Fix broken arg for getrlimit
parent 69424ca9
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
#include "CPCD.hpp" #include "CPCD.hpp"
#include <pwd.h> #include <pwd.h>
#ifdef HAVE_GETRLIMIT
#include <sys/resource.h> #include <sys/resource.h>
#endif
void void
CPCD::Process::print(FILE * f){ CPCD::Process::print(FILE * f){
...@@ -205,6 +207,7 @@ setup_environment(const char *env) { ...@@ -205,6 +207,7 @@ setup_environment(const char *env) {
static static
int int
set_ulimit(const BaseString & pair){ set_ulimit(const BaseString & pair){
#ifdef HAVE_GETRLIMIT
errno = 0; errno = 0;
do { do {
Vector<BaseString> list; Vector<BaseString> list;
...@@ -212,42 +215,43 @@ set_ulimit(const BaseString & pair){ ...@@ -212,42 +215,43 @@ set_ulimit(const BaseString & pair){
if(list.size() != 2){ if(list.size() != 2){
break; break;
} }
int resource = 0; int res;
rlim_t value = RLIM_INFINITY; rlim_t value = RLIM_INFINITY;
if(!(list[1].trim() == "unlimited")){ if(!(list[1].trim() == "unlimited")){
value = atoi(list[1].c_str()); value = atoi(list[1].c_str());
} }
struct rlimit rlp;
#define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }}
if(list[0].trim() == "c"){ if(list[0].trim() == "c"){
resource = RLIMIT_CORE; _RLIMIT_FIX(RLIMIT_CORE);
} else if(list[0] == "d"){ } else if(list[0] == "d"){
resource = RLIMIT_DATA; _RLIMIT_FIX(RLIMIT_DATA);
} else if(list[0] == "f"){ } else if(list[0] == "f"){
resource = RLIMIT_FSIZE; _RLIMIT_FIX(RLIMIT_FSIZE);
} else if(list[0] == "n"){ } else if(list[0] == "n"){
resource = RLIMIT_NOFILE; _RLIMIT_FIX(RLIMIT_NOFILE);
} else if(list[0] == "s"){ } else if(list[0] == "s"){
resource = RLIMIT_STACK; _RLIMIT_FIX(RLIMIT_STACK);
} else if(list[0] == "t"){ } else if(list[0] == "t"){
resource = RLIMIT_CPU; _RLIMIT_FIX(RLIMIT_CPU);
} else { } else {
errno = EINVAL; errno = EINVAL;
break; break;
} }
struct rlimit rlp; if(!res)
if(getrlimit(resource, &rlp) != 0){
break; break;
}
rlp.rlim_cur = value;
if(setrlimit(resource, &rlp) != 0){
break;
}
return 0; return 0;
} while(false); } while(false);
logger.error("Unable to process ulimit: %s(%s)", logger.error("Unable to process ulimit: %s(%s)",
pair.c_str(), strerror(errno)); pair.c_str(), strerror(errno));
return -1; return -1;
#else
return 0; // Maybe it's ok anyway...
#endif
} }
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment