#include "vserver.h"
#include "vserver-internal.h"
+#define NONE ({ Py_INCREF(Py_None); Py_None; })
+
+static int
+get_rspec(PyObject *resources, rspec_t *rspec)
+{
+ 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();
+
+ out:
+ Py_DECREF(cpu_share);
+
+ return result;
+}
+
/*
* context create
*/
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, &resources, &flags))
+ if (!PyArg_ParseTuple(args, "IO|K", &ctx, &resources, &flags) ||
+ get_rspec(resources, &rspec))
return NULL;
- if (!PyMapping_Check(resources))
- {
- PyErr_SetString(PyExc_TypeError, "invalid resources object");
- 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);
+ return PyErr_SetFromErrno(PyExc_OSError);
- return Py_None;
+ return NONE;
}
static PyObject *
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)
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
xid_t ctx;
rspec_t rspec = { 32, VC_VXF_SCHED_FLAGS, -1, -1 };
PyObject *resources;
- PyObject *cpu_share;
- if (!PyArg_ParseTuple(args, "IO", &ctx, &resources))
+ if (!PyArg_ParseTuple(args, "IO", &ctx, &resources) ||
+ get_rspec(resources, &rspec))
return NULL;
- if (!PyMapping_Check(resources))
- {
- PyErr_SetString(PyExc_TypeError, "invalid resources object");
- 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_setsched(ctx, rspec.cpu_share, rspec.cpu_sched_flags))
- PyErr_SetFromErrno(PyExc_OSError);
+ /* ESRCH indicates that there are no processes in the context */
+ if (pl_setsched(ctx, rspec.cpu_share, rspec.cpu_sched_flags) &&
+ errno != ESRCH)
+ return PyErr_SetFromErrno(PyExc_OSError);
- return Py_None;
+ return NONE;
}
static PyObject *
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[] = {
"Change vserver scheduling attributes for given vserver context" },
{ "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 }
};