Fix to implement chcontext so that NM's vserver start works correctly.

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

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 77df9f5..3aff725 100644 (file)
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -52,35 +52,60 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "sched_cmd.h"
 #include "virtual.h"
 
+#define MEF_DEBUG 1
 /*
- * chcontext
+ * context create
  */
 static PyObject *
 vserver_chcontext(PyObject *self, PyObject *args)
 {
-  unsigned  xid;
-  unsigned  caps_remove = 0;
+       xid_t xid, ctx;
+       struct vc_ctx_caps caps;
+       struct vc_ctx_flags flags;
+       struct vc_vx_info vc;
+       unsigned long long v;
+
+       v = VC_VXF_STATE_SETUP;
+       if (!PyArg_ParseTuple(args, "I|K", &ctx, &v))
+               return NULL;
 
-  if (!PyArg_ParseTuple(args, "I|I", &xid, &caps_remove))
-    return NULL;
+       caps.ccaps = ~vc_get_insecureccaps();
+       caps.cmask = ~0ull;
+       caps.bcaps = ~vc_get_insecurebcaps();
+       caps.bmask = ~0ull;
 
-  if (vc_new_s_context(xid, caps_remove, 0) < 0)
-    return PyErr_SetFromErrno(PyExc_OSError);
+       xid = VC_NOCTX;
+       if (vc_get_vx_info(ctx,&vc) != 0) {
+               xid = vc_ctx_create(ctx);
+               if (xid == VC_NOCTX && errno != EEXIST)
+                       return PyErr_SetFromErrno(PyExc_OSError);
+       }
 
-  return Py_None;
+       flags.mask = flags.flagword = v;
+       if (vc_set_cflags(ctx, &flags) == -1)
+               return PyErr_SetFromErrno(PyExc_OSError);
+
+       if (xid == VC_NOCTX && vc_ctx_migrate(ctx) == -1)
+               return PyErr_SetFromErrno(PyExc_OSError);
+
+#ifdef MEF_DEBUG
+       printf("vserver_create xid = %d(%d)\n",xid,ctx);
+#endif
+       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;
@@ -97,14 +122,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;
@@ -122,23 +148,38 @@ vserver_get_rlimit(PyObject *self, PyObject *args) {
 static PyObject *
 vserver_setsched(PyObject *self, PyObject *args)
 {
-  unsigned  xid;
+  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", &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))
+                       &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;
+  }
+
+  if (vc_set_cflags(xid, &flags) == -1)
+         return PyErr_SetFromErrno(PyExc_OSError);
+
   if (vc_set_sched(xid, &sched) == -1)
-    return PyErr_SetFromErrno(PyExc_OSError);
+         return PyErr_SetFromErrno(PyExc_OSError);
 
   return Py_None;
 }
@@ -225,7 +266,7 @@ vserver_set_dlimit(PyObject *self, PyObject *args)
 
 static PyMethodDef  methods[] = {
   { "chcontext", vserver_chcontext, METH_VARARGS,
-    "Change to the given vserver context" },
+    "chcontext to vserver with provided flags" },
   { "setsched", vserver_setsched, METH_VARARGS,
     "Change vserver scheduling attributes for given vserver context" },
   { "setdlimit", vserver_set_dlimit, METH_VARARGS,