more fixes

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

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 5b2cdb8..4136525 100644 (file)
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -53,21 +53,73 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "virtual.h"
 
 /*
- * chcontext
+ * context create
  */
 static PyObject *
-vserver_chcontext(PyObject *self, PyObject *args)
+vserver_create(PyObject *self, PyObject *args)
 {
-  unsigned  xid;
-  unsigned  caps_remove = 0;
+       xid_t ctx, xid;
 
-  if (!PyArg_ParseTuple(args, "I|I", &xid, &caps_remove))
-    return NULL;
+       if (!PyArg_ParseTuple(args, "I", &ctx))
+               return NULL;
 
-  if (vc_new_s_context(xid, caps_remove, 0) < 0)
-    return PyErr_SetFromErrno(PyExc_OSError);
+       xid = vc_ctx_create(ctx);
+       if (xid == VC_NOCTX && errno != EEXIST) {
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+       return Py_None;
+}
 
-  return Py_None;
+/*
+ * set flags
+ */
+static PyObject *
+vserver_flags(PyObject *self, PyObject *args)
+{
+       struct vc_ctx_caps caps;
+       struct vc_ctx_flags flags;
+       xid_t ctx;
+
+       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;
+
+       if (vc_set_ccaps(ctx, &caps) == -1) {
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+
+       if (vc_set_cflags(ctx, &flags) == -1) {
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+       return Py_None;
+}
+
+/*
+ * enter
+ */
+static PyObject *
+vserver_enter(PyObject *self, PyObject *args)
+{
+       xid_t ctx, xid;
+       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 (xid == VC_NOCTX && vc_ctx_migrate(ctx) == -1) {
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+       return Py_None;
 }
 
 static PyObject *
@@ -122,23 +174,41 @@ 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_INFO_LOCK;
+  flags.mask = VC_VXF_STATE_SETUP | VC_VXF_INFO_LOCK;
+  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;
 }
@@ -153,21 +223,6 @@ vserver_setsched(PyObject *self, PyObject *args)
 #define VCMD_set_dlimit                VC_CMD(DLIMIT, 5, 0)
 #define VCMD_get_dlimit                VC_CMD(DLIMIT, 6, 0)
 
-struct  vcmd_ctx_dlimit_base_v0 {
-       char *name;
-       uint32_t flags;
-};
-
-struct  vcmd_ctx_dlimit_v0 {
-       char *name;
-       uint32_t space_used;                    /* used space in kbytes */
-       uint32_t space_total;                   /* maximum space in kbytes */
-       uint32_t inodes_used;                   /* used inodes */
-       uint32_t inodes_total;                  /* maximum inodes */
-       uint32_t reserved;                      /* reserved for root in % */
-       uint32_t flags;
-};
-
 #define CDLIM_UNSET             (0ULL)
 #define CDLIM_INFINITY          (~0ULL)
 #define CDLIM_KEEP              (~1ULL)
@@ -239,8 +294,12 @@ vserver_set_dlimit(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef  methods[] = {
-  { "chcontext", vserver_chcontext, METH_VARARGS,
-    "Change to the given vserver context" },
+  { "create", vserver_create, METH_VARARGS,
+    "Create a new vserver context" },
+  { "flags", vserver_flags, METH_VARARGS,
+    "Set the default flags and caps" },
+  { "enter", vserver_flags, METH_VARARGS,
+    "Enter the vserver context" },
   { "setsched", vserver_setsched, METH_VARARGS,
     "Change vserver scheduling attributes for given vserver context" },
   { "setdlimit", vserver_set_dlimit, METH_VARARGS,