X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserverimpl.c;fp=python%2Fvserverimpl.c;h=d5f018dd6b9f9b1bda1ad964842626d4b3083d95;hb=55b0a09abca499f96094b45be79692ae540a5d3c;hp=3a93224381d950646ea69101ce8630c4a9a07ae3;hpb=91a23ea97a2793c2f5368cff1467c720ccc6125e;p=util-vserver.git diff --git a/python/vserverimpl.c b/python/vserverimpl.c index 3a93224..d5f018d 100644 --- a/python/vserverimpl.c +++ b/python/vserverimpl.c @@ -44,29 +44,40 @@ POSSIBILITY OF SUCH DAMAGE. #include "vserver.h" #include "vserver-internal.h" +#define NONE ({ Py_INCREF(Py_None); Py_None; }) + /* * context create */ static PyObject * vserver_chcontext(PyObject *self, PyObject *args) { + int result; 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)) + if (!PyArg_ParseTuple(args, "I|K", &ctx, &flags)) + return NULL; + + if ((result = pl_chcontext(ctx, flags, bcaps)) < 0) + return PyErr_SetFromErrno(PyExc_OSError); + + return PyBool_FromLong(result); +} + +static PyObject * +vserver_setup_done(PyObject *self, PyObject *args) +{ + xid_t ctx; + + if (!PyArg_ParseTuple(args, "I", &ctx)) return NULL; - if ((cpu_share = PyMapping_GetItemString(resources, "nm_cpu_share")) && - (cpu_share = PyNumber_Int(cpu_share))) - rspec.cpu_share = PyInt_AsLong(cpu_share); - if (pl_chcontext(ctx, flags, bcaps, &rspec)) - PyErr_SetFromErrno(PyExc_OSError); + if (pl_setup_done(ctx) < 0) + return PyErr_SetFromErrno(PyExc_OSError); - return Py_None; + return NONE; } static PyObject * @@ -83,7 +94,6 @@ vserver_set_rlimit(PyObject *self, PyObject *args) { if (!PyArg_ParseTuple(args, "IiL", &xid, &resource, &limits.hard)) return NULL; - ret = Py_None; if (vc_set_rlimit(xid, resource, &limits)) ret = PyErr_SetFromErrno(PyExc_OSError); else if (vc_get_rlimit(xid, resource, &limits)==-1) @@ -108,7 +118,6 @@ vserver_get_rlimit(PyObject *self, PyObject *args) { if (!PyArg_ParseTuple(args, "Ii", &xid, &resource)) return NULL; - ret = Py_None; if (vc_get_rlimit(xid, resource, &limits)==-1) ret = PyErr_SetFromErrno(PyExc_OSError); else @@ -117,54 +126,27 @@ vserver_get_rlimit(PyObject *self, PyObject *args) { return ret; } -#if 0 /* * setsched */ static PyObject * vserver_setsched(PyObject *self, PyObject *args) { - xid_t xid; - struct vc_set_sched sched; - struct vc_ctx_flags flags; - unsigned cpuguaranteed = 0; - - sched.set_mask = (VC_VXSM_FILL_RATE | - VC_VXSM_INTERVAL | - VC_VXSM_TOKENS_MIN | - VC_VXSM_TOKENS_MAX); - - 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_SCHED_HARD; - flags.mask |= VC_VXF_SCHED_HARD; -#define VC_VXF_SCHED_SHARE 0x00000800ull - if (cpuguaranteed==0) { - flags.flagword |= VC_VXF_SCHED_SHARE; - flags.mask |= VC_VXF_SCHED_SHARE; - } + xid_t ctx; + uint32_t cpu_share; + uint32_t cpu_sched_flags = VC_VXF_SCHED_FLAGS; - if (vc_set_cflags(xid, &flags) == -1) - return PyErr_SetFromErrno(PyExc_OSError); + if (!PyArg_ParseTuple(args, "II|I", &ctx, &cpu_share, &cpu_sched_flags)) + return NULL; - if (vc_set_sched(xid, &sched) == -1) - return PyErr_SetFromErrno(PyExc_OSError); + /* ESRCH indicates that there are no processes in the context */ + if (pl_setsched(ctx, cpu_share, cpu_sched_flags) && + errno != ESRCH) + return PyErr_SetFromErrno(PyExc_OSError); - return Py_None; + return NONE; } -/* - * setsched - */ -#endif - static PyObject * vserver_get_dlimit(PyObject *self, PyObject *args) { @@ -225,24 +207,63 @@ vserver_set_dlimit(PyObject *self, PyObject *args) vserver(VCMD_set_dlimit, xid, &data)) return PyErr_SetFromErrno(PyExc_OSError); - return Py_None; + return NONE; +} + +static PyObject * +vserver_unset_dlimit(PyObject *self, PyObject *args) +{ + 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) + return PyErr_SetFromErrno(PyExc_OSError); + + return NONE; +} + +static PyObject * +vserver_killall(PyObject *self, PyObject *args) +{ + xid_t ctx; + int sig; + + if (!PyArg_ParseTuple(args, "Ii", &ctx, &sig)) + return NULL; + + if (vc_ctx_kill(ctx, 0, sig) && errno != ESRCH) + return PyErr_SetFromErrno(PyExc_OSError); + + return NONE; } static PyMethodDef methods[] = { { "chcontext", vserver_chcontext, METH_VARARGS, "chcontext to vserver with provided flags" }, -#if 0 + { "setup_done", vserver_setup_done, METH_VARARGS, + "Release vserver setup lock" }, { "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" }, + { "unsetdlimit", vserver_unset_dlimit, METH_VARARGS, + "Remove disk limits for given vserver context" }, { "getdlimit", vserver_get_dlimit, METH_VARARGS, "Get disk limits for given vserver context" }, { "setrlimit", vserver_set_rlimit, METH_VARARGS, "Set resource limits for given resource of a vserver context" }, { "getrlimit", vserver_get_rlimit, 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" }, { NULL, NULL, 0, NULL } }; @@ -262,4 +283,9 @@ initvserverimpl(void) /* export limit-related constants */ PyModule_AddIntConstant(mod, "DLIMIT_KEEP", (int)CDLIM_KEEP); PyModule_AddIntConstant(mod, "DLIMIT_INF", (int)CDLIM_INFINITY); + + /* scheduler flags */ + PyModule_AddIntConstant(mod, + "VS_SCHED_CPU_GUARANTEED", + VS_SCHED_CPU_GUARANTEED); }