Now exporting the vserver rlimit interface directly, which can be used to

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

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index ad58d48..5b2cdb8 100644 (file)
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -70,6 +70,52 @@ vserver_chcontext(PyObject *self, PyObject *args)
   return Py_None;
 }
 
+static PyObject *
+vserver_set_rlimit(PyObject *self, PyObject *args) {
+       struct vc_rlimit limits;
+       int xid, 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))
+               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)
+               ret = PyErr_SetFromErrno(PyExc_OSError);
+       else
+               ret = Py_BuildValue("L",limits.hard);
+
+       return ret;
+}
+
+static PyObject *
+vserver_get_rlimit(PyObject *self, PyObject *args) {
+       struct vc_rlimit limits;
+       int xid, 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))
+               return NULL;
+
+       ret = Py_None;
+       if (vc_get_rlimit(xid, resource, &limits)==-1)
+               ret = PyErr_SetFromErrno(PyExc_OSError);
+       else
+               ret = Py_BuildValue("L",limits.hard);
+
+       return ret;
+}
+
 /*
  * setsched
  */
@@ -127,9 +173,39 @@ struct  vcmd_ctx_dlimit_v0 {
 #define CDLIM_KEEP              (~1ULL)
 
 static PyObject *
-vserver_dlimit(PyObject *self, PyObject *args)
+vserver_get_dlimit(PyObject *self, PyObject *args)
 {
        PyObject *res;
+       char* path;
+       unsigned xid;
+       struct vcmd_ctx_dlimit_v0 data;
+       int r;
+
+       if (!PyArg_ParseTuple(args, "si", &path,&xid))
+               return NULL;
+
+       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 PyObject *
+vserver_set_dlimit(PyObject *self, PyObject *args)
+{
        char* path;
        unsigned xid;
        struct vcmd_ctx_dlimit_base_v0 init;
@@ -149,6 +225,7 @@ vserver_dlimit(PyObject *self, PyObject *args)
        data.name = path;
        data.flags = 0;
 
+       memset(&init, 0, sizeof(init));
        init.name = path;
        init.flags = 0;
 
@@ -158,34 +235,22 @@ vserver_dlimit(PyObject *self, PyObject *args)
        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;
+       return Py_None; 
 }
 
-
-
 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,
+  { "setdlimit", vserver_set_dlimit, METH_VARARGS,
     "Set 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" },
   { NULL, NULL, 0, NULL }
 };