modification, are permitted provided that the following conditions
are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution.
- * Neither the name of the copyright holder nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
+* Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
#include <errno.h>
#include <stdint.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <unistd.h>
#include "config.h"
#include "pathconfig.h"
-#include "planetlab.h"
#include "virtual.h"
#include "vserver.h"
+#include "planetlab.h"
#include "vserver-internal.h"
#define NONE ({ Py_INCREF(Py_None); Py_None; })
-static int
-get_rspec(PyObject *resources, rspec_t *rspec)
+/*
+ * context create
+ */
+static PyObject *
+vserver_chcontext(PyObject *self, PyObject *args)
{
- int result = -1;
- PyObject *cpu_share;
- PyObject *sched_flags = NULL;
-
- if (!PyMapping_Check(resources))
- {
- PyErr_SetString(PyExc_TypeError, "invalid rspec");
- return -1;
- }
-
- /* get CPU share */
- if (!(cpu_share = PyMapping_GetItemString(resources, "nm_cpu_share")))
- return -1;
- if (!PyInt_Check(cpu_share))
- {
- PyErr_SetString(PyExc_TypeError, "nm_cpu_share not an integer");
- goto out;
- }
- rspec->cpu_share = PyInt_AS_LONG(cpu_share);
-
- /* check whether this share should be guaranteed */
- rspec->cpu_sched_flags = VC_VXF_SCHED_FLAGS;
- result = 0;
- if ((sched_flags = PyMapping_GetItemString(resources, "nm_sched_flags")))
- {
- const char *flagstr;
-
- if (!(flagstr = PyString_AsString(sched_flags)))
- result = -1;
- else if (!strcmp(flagstr, "guaranteed"))
- rspec->cpu_sched_flags &= ~VC_VXF_SCHED_SHARE;
- Py_DECREF(sched_flags);
- }
- else
- /* not an error if nm_sched_flags is missing */
- PyErr_Clear();
+ int ctx_is_new;
+ xid_t ctx;
+ uint_least64_t bcaps = ~vc_get_insecurebcaps();
+
+ if (!PyArg_ParseTuple(args, "I", &ctx))
+ return NULL;
- out:
- Py_DECREF(cpu_share);
+ if ((ctx_is_new = pl_chcontext(ctx, bcaps, 0)) < 0)
+ return PyErr_SetFromErrno(PyExc_OSError);
- return result;
+ return PyBool_FromLong(ctx_is_new);
}
-/*
- * context create
- */
static PyObject *
-vserver_chcontext(PyObject *self, PyObject *args)
+vserver_setup_done(PyObject *self, PyObject *args)
{
xid_t ctx;
- uint32_t flags = 0;
- uint32_t bcaps = ~vc_get_insecurebcaps();
- rspec_t rspec = { 32, VC_VXF_SCHED_FLAGS, -1, -1 };
- PyObject *resources;
- if (!PyArg_ParseTuple(args, "IO|K", &ctx, &resources, &flags) ||
- get_rspec(resources, &rspec))
+ if (!PyArg_ParseTuple(args, "I", &ctx))
return NULL;
- if (pl_chcontext(ctx, flags, bcaps, &rspec))
+ if (pl_setup_done(ctx) < 0)
return PyErr_SetFromErrno(PyExc_OSError);
return NONE;
}
static PyObject *
-vserver_set_rlimit(PyObject *self, PyObject *args) {
- struct vc_rlimit limits;
- xid_t xid;
- int resource;
- PyObject *ret;
-
- limits.min = VC_LIM_KEEP;
- limits.soft = VC_LIM_KEEP;
- limits.hard = VC_LIM_KEEP;
-
- if (!PyArg_ParseTuple(args, "IiL", &xid, &resource, &limits.hard))
- return NULL;
-
- if (vc_set_rlimit(xid, resource, &limits))
- ret = PyErr_SetFromErrno(PyExc_OSError);
- else if (vc_get_rlimit(xid, resource, &limits)==-1)
- ret = PyErr_SetFromErrno(PyExc_OSError);
- else
- ret = Py_BuildValue("L",limits.hard);
-
- return ret;
+vserver_isrunning(PyObject *self, PyObject *args)
+{
+ xid_t ctx;
+ PyObject *ret;
+ struct stat statbuf;
+ char fname[64];
+
+ if (!PyArg_ParseTuple(args, "I", &ctx))
+ return NULL;
+
+ sprintf(fname,"/proc/virtual/%d", ctx);
+
+ if(stat(&fname[0],&statbuf)==0)
+ ret = PyBool_FromLong(1);
+ else
+ ret = PyBool_FromLong(0);
+
+ return ret;
+}
+
+static PyObject *
+__vserver_get_rlimit(xid_t xid, int resource) {
+ struct vc_rlimit limits;
+ PyObject *ret;
+
+ errno = 0;
+ if (vc_get_rlimit(xid, resource, &limits)==-1)
+ ret = PyErr_SetFromErrno(PyExc_OSError);
+ else
+ ret = Py_BuildValue("LLL",limits.hard, limits.soft, limits.min);
+
+ return ret;
}
static PyObject *
vserver_get_rlimit(PyObject *self, PyObject *args) {
- struct vc_rlimit limits;
- xid_t xid;
- int resource;
- PyObject *ret;
+ xid_t xid;
+ int resource;
+ PyObject *ret;
+
+ if (!PyArg_ParseTuple(args, "Ii", &xid, &resource))
+ ret = NULL;
+ else
+ ret = __vserver_get_rlimit(xid, resource);
+
+ return ret;
+}
+
+static PyObject *
+vserver_set_rlimit(PyObject *self, PyObject *args) {
+ struct vc_rlimit limits;
+ struct rlimit lim;
+ xid_t xid;
+ int resource, lresource;
+ PyObject *ret;
- limits.min = VC_LIM_KEEP;
- limits.soft = VC_LIM_KEEP;
- limits.hard = VC_LIM_KEEP;
+ limits.min = VC_LIM_KEEP;
+ limits.soft = VC_LIM_KEEP;
+ limits.hard = VC_LIM_KEEP;
- if (!PyArg_ParseTuple(args, "Ii", &xid, &resource))
- return NULL;
+ if (!PyArg_ParseTuple(args, "IiLLL", &xid, &resource, &limits.hard, &limits.soft, &limits.min))
+ return NULL;
- if (vc_get_rlimit(xid, resource, &limits)==-1)
- ret = PyErr_SetFromErrno(PyExc_OSError);
- else
- ret = Py_BuildValue("L",limits.hard);
+ lresource = resource;
+ switch (resource) {
+ case VC_VLIMIT_NSOCK:
+ case VC_VLIMIT_ANON:
+ case VC_VLIMIT_SHMEM:
+ goto do_vc_set_rlimit;
+ case VC_VLIMIT_OPENFD:
+ lresource = RLIMIT_NOFILE;
+ break;
+ default:
+ break;
+ }
+
+ getrlimit(lresource,&lim);
+ if (adjust_lim(&limits,&lim)) {
+ setrlimit(lresource, &lim);
+ }
+
+ do_vc_set_rlimit:
+ errno = 0;
+ if (vc_set_rlimit(xid, resource, &limits)==-1)
+ ret = PyErr_SetFromErrno(PyExc_OSError);
+ else
+ ret = __vserver_get_rlimit(xid, resource);
- return ret;
+ return ret;
}
/*
vserver_setsched(PyObject *self, PyObject *args)
{
xid_t ctx;
- rspec_t rspec = { 32, VC_VXF_SCHED_FLAGS, -1, -1 };
- PyObject *resources;
+ uint32_t cpu_share;
+ uint32_t cpu_sched_flags = VC_VXF_SCHED_FLAGS;
- if (!PyArg_ParseTuple(args, "IO", &ctx, &resources) ||
- get_rspec(resources, &rspec))
+ if (!PyArg_ParseTuple(args, "II|I", &ctx, &cpu_share, &cpu_sched_flags))
return NULL;
/* ESRCH indicates that there are no processes in the context */
- if (pl_setsched(ctx, rspec.cpu_share, rspec.cpu_sched_flags) &&
+ if (pl_setsched(ctx, cpu_share, cpu_sched_flags) &&
errno != ESRCH)
return PyErr_SetFromErrno(PyExc_OSError);
static PyObject *
vserver_get_dlimit(PyObject *self, PyObject *args)
{
- PyObject *res;
- char* path;
- unsigned xid;
- struct vcmd_ctx_dlimit_v0 data;
- int r;
-
- if (!PyArg_ParseTuple(args, "si", &path,&xid))
- return NULL;
-
- memset(&data, 0, sizeof(data));
- data.name = path;
- data.flags = 0;
- r = vserver(VCMD_get_dlimit, xid, &data);
- if (r>=0) {
- res = Py_BuildValue("(i,i,i,i,i)",
- data.space_used,
- data.space_total,
- data.inodes_used,
- data.inodes_total,
- data.reserved);
- } else {
- res = PyErr_SetFromErrno(PyExc_OSError);
- }
-
- return res;
+ PyObject *res;
+ char* path;
+ unsigned xid;
+ struct vc_ctx_dlimit data;
+ int r;
+
+ if (!PyArg_ParseTuple(args, "si", &path,&xid))
+ return NULL;
+
+ memset(&data, 0, sizeof(data));
+ r = vc_get_dlimit(path, xid, 0, &data);
+ if (r>=0) {
+ res = Py_BuildValue("(i,i,i,i,i)",
+ data.space_used,
+ data.space_total,
+ data.inodes_used,
+ data.inodes_total,
+ data.reserved);
+ } else {
+ res = PyErr_SetFromErrno(PyExc_OSError);
+ }
+
+ return res;
}
static PyObject *
vserver_set_dlimit(PyObject *self, PyObject *args)
{
- char* path;
- unsigned xid;
- struct vcmd_ctx_dlimit_base_v0 init;
- struct vcmd_ctx_dlimit_v0 data;
-
- memset(&data,0,sizeof(data));
- if (!PyArg_ParseTuple(args, "siiiiii", &path,
- &xid,
- &data.space_used,
- &data.space_total,
- &data.inodes_used,
- &data.inodes_total,
- &data.reserved))
- return NULL;
-
- data.name = path;
- data.flags = 0;
-
- memset(&init, 0, sizeof(init));
- init.name = path;
- init.flags = 0;
-
- if ((vserver(VCMD_add_dlimit, xid, &init) && errno != EEXIST) ||
- vserver(VCMD_set_dlimit, xid, &data))
- return PyErr_SetFromErrno(PyExc_OSError);
-
- return NONE;
+ char* path;
+ unsigned xid;
+ struct vc_ctx_dlimit data;
+
+ memset(&data,0,sizeof(data));
+ if (!PyArg_ParseTuple(args, "siiiiii", &path,
+ &xid,
+ &data.space_used,
+ &data.space_total,
+ &data.inodes_used,
+ &data.inodes_total,
+ &data.reserved))
+ return NULL;
+
+ if ((vc_add_dlimit(path, xid, 0) && errno != EEXIST) ||
+ vc_set_dlimit(path, xid, 0, &data))
+ return PyErr_SetFromErrno(PyExc_OSError);
+
+ return NONE;
}
static PyObject *
{
char *path;
unsigned xid;
- struct vcmd_ctx_dlimit_base_v0 init;
if (!PyArg_ParseTuple(args, "si", &path, &xid))
return NULL;
- memset(&init, 0, sizeof(init));
- init.name = path;
- init.flags = 0;
-
- if (vserver(VCMD_rem_dlimit, xid, &init) && errno != ESRCH)
+ if (vc_rem_dlimit(path, xid, 0) && errno != ESRCH)
return PyErr_SetFromErrno(PyExc_OSError);
return NONE;
static PyMethodDef methods[] = {
{ "chcontext", vserver_chcontext, METH_VARARGS,
"chcontext to vserver with provided flags" },
+ { "setup_done", vserver_setup_done, METH_VARARGS,
+ "Release vserver setup lock" },
{ "setsched", vserver_setsched, METH_VARARGS,
"Change vserver scheduling attributes for given vserver context" },
{ "setdlimit", vserver_set_dlimit, METH_VARARGS,
"Get resource limits for given resource of a vserver context" },
{ "killall", vserver_killall, METH_VARARGS,
"Send signal to all processes in vserver context" },
+ { "isrunning", vserver_isrunning, METH_VARARGS,
+ "Check if vserver is running"},
{ NULL, NULL, 0, NULL }
};
PyModule_AddStringConstant(mod, "VSERVER_BASEDIR", DEFAULT_VSERVERDIR);
/* export limit-related constants */
- PyModule_AddIntConstant(mod, "DLIMIT_KEEP", (int)CDLIM_KEEP);
- PyModule_AddIntConstant(mod, "DLIMIT_INF", (int)CDLIM_INFINITY);
+ PyModule_AddIntConstant(mod, "DLIMIT_KEEP", (int)VC_CDLIM_KEEP);
+ PyModule_AddIntConstant(mod, "DLIMIT_INF", (int)VC_CDLIM_INFINITY);
+ PyModule_AddIntConstant(mod, "VC_LIM_KEEP", (int)VC_LIM_KEEP);
+
+ PyModule_AddIntConstant(mod, "RLIMIT_CPU", (int)RLIMIT_CPU);
+ PyModule_AddIntConstant(mod, "RLIMIT_RSS", (int)RLIMIT_RSS);
+ PyModule_AddIntConstant(mod, "RLIMIT_NPROC", (int)RLIMIT_NPROC);
+ PyModule_AddIntConstant(mod, "RLIMIT_NOFILE", (int)RLIMIT_NOFILE);
+ PyModule_AddIntConstant(mod, "RLIMIT_MEMLOCK", (int)RLIMIT_MEMLOCK);
+ PyModule_AddIntConstant(mod, "RLIMIT_AS", (int)RLIMIT_AS);
+ PyModule_AddIntConstant(mod, "RLIMIT_LOCKS", (int)RLIMIT_LOCKS);
+
+ PyModule_AddIntConstant(mod, "RLIMIT_SIGPENDING", (int)RLIMIT_SIGPENDING);
+ PyModule_AddIntConstant(mod, "RLIMIT_MSGQUEUE", (int)RLIMIT_MSGQUEUE);
+
+ PyModule_AddIntConstant(mod, "VLIMIT_NSOCK", (int)VC_VLIMIT_NSOCK);
+ PyModule_AddIntConstant(mod, "VLIMIT_OPENFD", (int)VC_VLIMIT_OPENFD);
+ PyModule_AddIntConstant(mod, "VLIMIT_ANON", (int)VC_VLIMIT_ANON);
+ PyModule_AddIntConstant(mod, "VLIMIT_SHMEM", (int)VC_VLIMIT_SHMEM);
+
+ /* scheduler flags */
+ PyModule_AddIntConstant(mod,
+ "VS_SCHED_CPU_GUARANTEED",
+ VS_SCHED_CPU_GUARANTEED);
}