added setsched and dlimit vserver syscall support

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index ecfad20..f1662e7 100644 (file)
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -33,9 +33,28 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <Python.h>
 
+#include "config.h"
 #include "compat.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdint.h>
+
 #include "vserver.h"
+#include "vserver-internal.h"
+#include "sched_cmd.h"
+#include "virtual.h"
 
+/*
+ * chcontext
+ */
 static PyObject *
 vserver_chcontext(PyObject *self, PyObject *args)
 {
@@ -51,9 +70,121 @@ vserver_chcontext(PyObject *self, PyObject *args)
   return Py_None;
 }
 
+/*
+ * setsched
+ */
+static PyObject *
+vserver_setsched(PyObject *self, PyObject *args)
+{
+  unsigned  xid;
+  struct vc_set_sched sched;
+
+  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, 
+                       &sched.fill_rate,
+                       &sched.interval,
+                       &sched.tokens_min,
+                       &sched.tokens_max))
+    return NULL;
+
+  if (vc_set_sched(xid, &sched) == -1)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return Py_None;
+}
+
+/*
+ * setsched
+ */
+
+/*  inode vserver commands */
+#define VCMD_add_dlimit                VC_CMD(DLIMIT, 1, 0)
+#define VCMD_rem_dlimit                VC_CMD(DLIMIT, 2, 0)
+#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)
+
+static PyObject *
+vserver_dlimit(PyObject *self, PyObject *args)
+{
+       PyObject *res;
+       char* path;
+       unsigned xid;
+       struct vcmd_ctx_dlimit_base_v0 init;
+       struct vcmd_ctx_dlimit_v0 data;
+       int r;
+
+       memset(&data,0,sizeof(data));
+       if (!PyArg_ParseTuple(args, "s(iiiii)", &path, 
+                             &data.space_used,
+                             &data.space_total,
+                             &data.inodes_used,
+                             &data.inodes_total,
+                             &data.reserved))
+               return NULL;
+
+       data.name = path;
+       data.flags = 0;
+
+       init.name = path;
+       init.flags = 0;
+
+       r = vserver(VCMD_rem_dlimit, xid, &init);
+       if (r<0){}
+       r = vserver(VCMD_add_dlimit, xid, &init);
+       if (r<0){}
+       r = vserver(VCMD_set_dlimit, xid, &data);
+       if (r<0){}
+
+       memset(&data, 0, sizeof(data));
+       data.name = path;
+       data.flags = 0;
+       r = vserver(VCMD_get_dlimit, xid, &data);
+       if (r>=0) {
+               res = Py_BuildValue("(i,i,i,i,i)",
+                                   data.space_used,
+                                   data.space_total,
+                                   data.inodes_used,
+                                   data.inodes_total,
+                                   data.reserved);
+       } else {
+               res = PyErr_SetFromErrno(PyExc_OSError);
+       }
+
+       return res;
+}
+
+
+
 static PyMethodDef  methods[] = {
   { "chcontext", vserver_chcontext, METH_VARARGS,
     "Change to the given vserver context" },
+  { "setsched", vserver_setsched, METH_VARARGS,
+    "Change vserver scheduling attributes for given vserver context" },
+  { "dlimit", vserver_dlimit, METH_VARARGS,
+    "Set disk limits for given vserver context" },
   { NULL, NULL, 0, NULL }
 };