openfd -> nofile

diff --git a/src/planetlab.c b/src/planetlab.c
index d3669e3..73ccfc3 100644 (file)
--- a/src/planetlab.c
+++ b/src/planetlab.c
@@ -261,8 +261,8 @@ enum {
 };
 
 struct pl_resources {
 };
 
 struct pl_resources {

-       char *name;
-        unsigned type;
+  char *name;
+  unsigned type;

   union {
     unsigned long long *limit;
     unsigned long int *personality;
   union {
     unsigned long long *limit;
     unsigned long int *personality;


@@ -280,9 +280,8 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
 {
   FILE *fb;
   int cwd;
 {
   FILE *fb;
   int cwd;

-  size_t len = strlen(VSERVERCONF) + strlen(context) + NULLBYTE_SIZE;
-  char *conf = (char *)malloc(len + strlen("rlimits/openfd.hard"));

   struct pl_resources *r;
   struct pl_resources *r;

+

   struct pl_resources sliver_list[] = {
     {"sched/fill-rate2", TYPE_LONG, &slr->vs_cpu},
 
   struct pl_resources sliver_list[] = {
     {"sched/fill-rate2", TYPE_LONG, &slr->vs_cpu},
 


@@ -298,9 +297,9 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
     {"rlimits/as.soft", TYPE_LONG, &slr->vs_as.soft},
     {"rlimits/as.min", TYPE_LONG, &slr->vs_as.min},
   
     {"rlimits/as.soft", TYPE_LONG, &slr->vs_as.soft},
     {"rlimits/as.min", TYPE_LONG, &slr->vs_as.min},
   

-    {"rlimits/openfd.hard", TYPE_LONG, &slr->vs_openfd.hard},
-    {"rlimits/openfd.soft", TYPE_LONG, &slr->vs_openfd.soft},
-    {"rlimits/openfd.min", TYPE_LONG, &slr->vs_openfd.min},
+    {"rlimits/nofile.hard", TYPE_LONG, &slr->vs_nofile.hard},
+    {"rlimits/nofile.soft", TYPE_LONG, &slr->vs_nofile.soft},
+    {"rlimits/nofile.min", TYPE_LONG, &slr->vs_nofile.min},

 
     {"rlimits/memlock.hard", TYPE_LONG, &slr->vs_memlock.hard},
     {"rlimits/memlock.soft", TYPE_LONG, &slr->vs_memlock.soft},
 
     {"rlimits/memlock.hard", TYPE_LONG, &slr->vs_memlock.hard},
     {"rlimits/memlock.soft", TYPE_LONG, &slr->vs_memlock.soft},


@@ -311,6 +310,8 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
     {0,0}
   };
 
     {0,0}
   };
 

+  size_t len = strlen(VSERVERCONF) + strlen(context) + NULLBYTE_SIZE;
+  char *conf = (char *)malloc(len);

   sprintf(conf, "%s%s", VSERVERCONF, context);
 
   slr->vs_rss.hard = VC_LIM_KEEP;
   sprintf(conf, "%s%s", VSERVERCONF, context);
 
   slr->vs_rss.hard = VC_LIM_KEEP;


@@ -325,9 +326,9 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
   slr->vs_nproc.soft = VC_LIM_KEEP;
   slr->vs_nproc.min = VC_LIM_KEEP;
 
   slr->vs_nproc.soft = VC_LIM_KEEP;
   slr->vs_nproc.min = VC_LIM_KEEP;
 

-  slr->vs_openfd.hard = VC_LIM_KEEP;
-  slr->vs_openfd.soft = VC_LIM_KEEP;
-  slr->vs_openfd.min = VC_LIM_KEEP;
+  slr->vs_nofile.hard = VC_LIM_KEEP;
+  slr->vs_nofile.soft = VC_LIM_KEEP;
+  slr->vs_nofile.min = VC_LIM_KEEP;

 
   slr->vs_memlock.hard = VC_LIM_KEEP;
   slr->vs_memlock.soft = VC_LIM_KEEP;
 
   slr->vs_memlock.hard = VC_LIM_KEEP;
   slr->vs_memlock.soft = VC_LIM_KEEP;


@@ -452,7 +453,7 @@ pl_set_ulimits(const struct sliver_resources *slr)
   set_one_ulimit(RLIMIT_RSS, &slr->vs_rss);
   set_one_ulimit(RLIMIT_AS, &slr->vs_as);
   set_one_ulimit(RLIMIT_NPROC, &slr->vs_nproc);
   set_one_ulimit(RLIMIT_RSS, &slr->vs_rss);
   set_one_ulimit(RLIMIT_AS, &slr->vs_as);
   set_one_ulimit(RLIMIT_NPROC, &slr->vs_nproc);

-  set_one_ulimit(RLIMIT_NOFILE, &slr->vs_openfd);
+  set_one_ulimit(RLIMIT_NOFILE, &slr->vs_nofile);

   set_one_ulimit(RLIMIT_MEMLOCK, &slr->vs_memlock);
   return set_personality(slr->personality);
 }
   set_one_ulimit(RLIMIT_MEMLOCK, &slr->vs_memlock);
   return set_personality(slr->personality);
 }

diff --git a/src/planetlab.h b/src/planetlab.h
index 66bd84d..3946640 100644 (file)
--- a/src/planetlab.h
+++ b/src/planetlab.h
@@ -45,7 +45,7 @@ struct sliver_resources {
   struct vc_rlimit vs_rss;
   struct vc_rlimit vs_as;
   struct vc_rlimit vs_nproc;
   struct vc_rlimit vs_rss;
   struct vc_rlimit vs_as;
   struct vc_rlimit vs_nproc;

-  struct vc_rlimit vs_openfd;
+  struct vc_rlimit vs_nofile;

   struct vc_rlimit vs_memlock;
   unsigned long int personality;
 };
   struct vc_rlimit vs_memlock;
   unsigned long int personality;
 };