Fix set_bwlimit() to accept parameters for limit-exempt class

[util-vserver.git] / python / vserverimpl.c

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 7a90cf0..d5f018d 100644 (file)
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -44,22 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "vserver.h"
 #include "vserver-internal.h"
 
-static int
-get_rspec(PyObject *resources, rspec_t *rspec)
-{
-  PyObject  *cpu_share;
-
-  if (!PyMapping_Check(resources))
-    {
-      PyErr_SetString(PyExc_TypeError, "invalid rspec");
-      return -1;
-    }
-  if ((cpu_share = PyMapping_GetItemString(resources, "nm_cpu_share")) &&
-      (cpu_share = PyNumber_Int(cpu_share)))
-    rspec->cpu_share = PyInt_AsLong(cpu_share);
-
-  return 0;
-}
+#define NONE  ({ Py_INCREF(Py_None); Py_None; })
 
 /*
  * context create
@@ -67,20 +52,32 @@ get_rspec(PyObject *resources, rspec_t *rspec)
 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;
 
-  if (!PyArg_ParseTuple(args, "IO|K", &ctx, &resources, &flags) ||
-      get_rspec(resources, &rspec))
+  if (!PyArg_ParseTuple(args, "I|K", &ctx, &flags))
     return NULL;
 
-  if (pl_chcontext(ctx, flags, bcaps, &rspec))
+  if ((result = pl_chcontext(ctx, flags, bcaps)) < 0)
     return PyErr_SetFromErrno(PyExc_OSError);
 
-  return Py_None;
+  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 (pl_setup_done(ctx) < 0)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
 }
 
 static PyObject *
@@ -97,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)
@@ -122,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
@@ -138,17 +133,18 @@ static PyObject *
 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;
 
-  if (pl_setsched(ctx, rspec.cpu_share, rspec.cpu_sched_flags))
+  /* 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;
 }
 
 static PyObject *
@@ -211,7 +207,7 @@ 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 *
@@ -231,7 +227,7 @@ vserver_unset_dlimit(PyObject *self, PyObject *args)
   if (vserver(VCMD_rem_dlimit, xid, &init) && errno != ESRCH)
     return PyErr_SetFromErrno(PyExc_OSError);
 
-  return Py_None;      
+  return NONE; 
 }
 
 static PyObject *
@@ -246,12 +242,14 @@ vserver_killall(PyObject *self, PyObject *args)
   if (vc_ctx_kill(ctx, 0, sig) && errno != ESRCH)
     return PyErr_SetFromErrno(PyExc_OSError);
 
-  return Py_None;
+  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,
@@ -285,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);
 }