X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserverimpl.c;h=3a93224381d950646ea69101ce8630c4a9a07ae3;hb=73708328b2f53205367df5499d2b898b4e92203b;hp=09e37825e7f27e053cc31f53692153f830d3961a;hpb=0f3e056bac8cdb4d7ed89e08f8886002942e0ab6;p=util-vserver.git diff --git a/python/vserverimpl.c b/python/vserverimpl.c index 09e3782..3a93224 100644 --- a/python/vserverimpl.c +++ b/python/vserverimpl.c @@ -33,78 +33,54 @@ POSSIBILITY OF SUCH DAMAGE. #include -#include "config.h" -#include "compat.h" - -#include -#include #include -#include -#include -#include -#include -#include -#include #include +#include +#include "config.h" +#include "pathconfig.h" +#include "planetlab.h" +#include "virtual.h" #include "vserver.h" #include "vserver-internal.h" -#include "sched_cmd.h" -#include "virtual.h" /* - * chcontext + * context create */ static PyObject * vserver_chcontext(PyObject *self, PyObject *args) { - struct vc_ctx_caps caps; - struct vc_ctx_flags flags; - xid_t ctx, xid; - - caps.ccaps = ~vc_get_insecureccaps(); - caps.cmask = ~0ull; - caps.bcaps = ~vc_get_insecurebcaps(); - caps.bmask = ~0ull; - - flags.flagword = VC_VXF_INFO_LOCK; - flags.mask = VC_VXF_STATE_SETUP | VC_VXF_INFO_LOCK; - - if (!PyArg_ParseTuple(args, "I", &ctx)) - return NULL; - - xid = vc_ctx_create(ctx); - if (xid == VC_NOCTX && errno != EEXIST) { - return PyErr_SetFromErrno(PyExc_OSError); - } - - if (vc_set_ccaps(ctx, &caps) == -1) { - return PyErr_SetFromErrno(PyExc_OSError); - } - - if (vc_set_cflags(ctx, &flags) == -1) { - return PyErr_SetFromErrno(PyExc_OSError); - } + 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; + PyObject *cpu_share; + + if (!PyArg_ParseTuple(args, "IO!|K", &ctx, &PyDict_Type, &resources, &flags)) + return NULL; + if ((cpu_share = PyMapping_GetItemString(resources, "nm_cpu_share")) && + (cpu_share = PyNumber_Int(cpu_share))) + rspec.cpu_share = PyInt_AsLong(cpu_share); - /* context already exists, migrate to it */ - if (xid == VC_NOCTX && vc_ctx_migrate(ctx) == -1) { - return PyErr_SetFromErrno(PyExc_OSError); - } + if (pl_chcontext(ctx, flags, bcaps, &rspec)) + PyErr_SetFromErrno(PyExc_OSError); - return Py_None; + return Py_None; } static PyObject * vserver_set_rlimit(PyObject *self, PyObject *args) { struct vc_rlimit limits; - int xid, resource; + 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)) + if (!PyArg_ParseTuple(args, "IiL", &xid, &resource, &limits.hard)) return NULL; ret = Py_None; @@ -121,14 +97,15 @@ vserver_set_rlimit(PyObject *self, PyObject *args) { static PyObject * vserver_get_rlimit(PyObject *self, PyObject *args) { struct vc_rlimit limits; - int xid, resource; + 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, "ii", &xid, &resource)) + if (!PyArg_ParseTuple(args, "Ii", &xid, &resource)) return NULL; ret = Py_None; @@ -140,6 +117,7 @@ vserver_get_rlimit(PyObject *self, PyObject *args) { return ret; } +#if 0 /* * setsched */ @@ -156,17 +134,16 @@ vserver_setsched(PyObject *self, PyObject *args) VC_VXSM_TOKENS_MIN | VC_VXSM_TOKENS_MAX); - if (!PyArg_ParseTuple(args, "I|I|I|I|I|I", &xid, + if (!PyArg_ParseTuple(args, "I|I|I|I|I|I|I", &xid, &sched.fill_rate, &sched.interval, + &sched.tokens, &sched.tokens_min, &sched.tokens_max, &cpuguaranteed)) return NULL; - flags.flagword = VC_VXF_INFO_LOCK; - flags.mask = VC_VXF_STATE_SETUP | VC_VXF_INFO_LOCK; - flags.flagword |= VC_VXF_SCHED_HARD; + flags.flagword = VC_VXF_SCHED_HARD; flags.mask |= VC_VXF_SCHED_HARD; #define VC_VXF_SCHED_SHARE 0x00000800ull if (cpuguaranteed==0) { @@ -174,9 +151,8 @@ vserver_setsched(PyObject *self, PyObject *args) flags.mask |= VC_VXF_SCHED_SHARE; } - if (vc_set_cflags(xid, &flags) == -1) { + if (vc_set_cflags(xid, &flags) == -1) return PyErr_SetFromErrno(PyExc_OSError); - } if (vc_set_sched(xid, &sched) == -1) return PyErr_SetFromErrno(PyExc_OSError); @@ -187,16 +163,7 @@ vserver_setsched(PyObject *self, PyObject *args) /* * setsched */ - -/* inode vserver commands */ -#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) -#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0) -#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0) -#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0) - -#define CDLIM_UNSET (0ULL) -#define CDLIM_INFINITY (~0ULL) -#define CDLIM_KEEP (~1ULL) +#endif static PyObject * vserver_get_dlimit(PyObject *self, PyObject *args) @@ -236,7 +203,6 @@ vserver_set_dlimit(PyObject *self, PyObject *args) unsigned xid; struct vcmd_ctx_dlimit_base_v0 init; struct vcmd_ctx_dlimit_v0 data; - int r; memset(&data,0,sizeof(data)); if (!PyArg_ParseTuple(args, "siiiiii", &path, @@ -255,20 +221,20 @@ vserver_set_dlimit(PyObject *self, PyObject *args) init.name = path; init.flags = 0; - r = vserver(VCMD_rem_dlimit, xid, &init); - if (r<0){} - r = vserver(VCMD_add_dlimit, xid, &init); - if (r<0){} - r = vserver(VCMD_set_dlimit, xid, &data); - if (r<0){} + if ((vserver(VCMD_add_dlimit, xid, &init) && errno != EEXIST) || + vserver(VCMD_set_dlimit, xid, &data)) + return PyErr_SetFromErrno(PyExc_OSError); + return Py_None; } static PyMethodDef methods[] = { { "chcontext", vserver_chcontext, METH_VARARGS, - "Change to the given vserver context" }, + "chcontext to vserver with provided flags" }, +#if 0 { "setsched", vserver_setsched, METH_VARARGS, "Change vserver scheduling attributes for given vserver context" }, +#endif { "setdlimit", vserver_set_dlimit, METH_VARARGS, "Set disk limits for given vserver context" }, { "getdlimit", vserver_get_dlimit, METH_VARARGS, @@ -283,5 +249,17 @@ static PyMethodDef methods[] = { PyMODINIT_FUNC initvserverimpl(void) { - Py_InitModule("vserverimpl", methods); + PyObject *mod; + + mod = Py_InitModule("vserverimpl", methods); + + /* export the set of 'safe' capabilities */ + PyModule_AddIntConstant(mod, "CAP_SAFE", ~vc_get_insecurebcaps()); + + /* export the default vserver directory */ + 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); }