#include <unistd.h>
#include <ctype.h>
#include <sys/resource.h>
+#include <sys/types.h>
#include <fcntl.h>
#define _GNU_SOURCE
#include <sched.h>
#include "vserver.h"
#include "planetlab.h"
+/* defined in netns.c */
+extern uint32_t get_space_flag(xid_t);
+
#ifndef VC_NXC_RAW_SOCKET
# define VC_NXC_RAW_SOCKET 0x00000200ull
#endif
if (vc_tag_create(ctx) == VC_NOCTX)
return -1;
-process:
-
/*
* Create context info - this sets the STATE_SETUP and STATE_INIT flags.
*/
};
struct pl_resources {
- char *name;
- unsigned type;
+ char *name;
+ unsigned type;
union {
unsigned long long *limit;
unsigned long int *personality;
{
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 sliver_list[] = {
{"sched/fill-rate2", TYPE_LONG, &slr->vs_cpu},
{"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},
{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;
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;
fclose(fb);
}
- fchdir(cwd);
+ (void)fchdir(cwd);
out_fd:
close(cwd);
out:
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);
}