#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 <unistd.h>
+#include "config.h"
+#include "pathconfig.h"
+#include "planetlab.h"
+#include "virtual.h"
#include "vserver.h"
#include "vserver-internal.h"
-#include "sched_cmd.h"
-#include "virtual.h"
/*
- * chcontext
+ * context create
*/
static PyObject *
vserver_chcontext(PyObject *self, PyObject *args)
{
- unsigned xid;
- unsigned caps_remove = 0;
-
- if (!PyArg_ParseTuple(args, "I|I", &xid, &caps_remove))
+ 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;
+ PyObject *cpu_share;
+
+ if (!PyArg_ParseTuple(args, "IO|K", &ctx, &resources, &flags))
return NULL;
-
- if (vc_new_s_context(xid, caps_remove, 0) < 0)
- return PyErr_SetFromErrno(PyExc_OSError);
+ if (!PyMapping_Check(resources))
+ {
+ PyErr_SetString(PyExc_TypeError, "invalid resources object");
+ return NULL;
+ }
+ if ((cpu_share = PyMapping_GetItemString(resources, "nm_cpu_share")) &&
+ (cpu_share = PyNumber_Int(cpu_share)))
+ rspec.cpu_share = PyInt_AsLong(cpu_share);
+
+ if (pl_chcontext(ctx, flags, bcaps, &rspec))
+ PyErr_SetFromErrno(PyExc_OSError);
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;
+vserver_set_rlimit(PyObject *self, PyObject *args) {
+ struct vc_rlimit limits;
+ xid_t xid;
+ int resource;
+ PyObject *ret;
- if (vc_set_sched(xid, &sched) == -1)
- return PyErr_SetFromErrno(PyExc_OSError);
+ limits.min = VC_LIM_KEEP;
+ limits.soft = VC_LIM_KEEP;
+ limits.hard = VC_LIM_KEEP;
- return Py_None;
+ 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;
+ 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))
+ 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
*/
+static PyObject *
+vserver_setsched(PyObject *self, PyObject *args)
+{
+ xid_t ctx;
+ rspec_t rspec = { 32, VC_VXF_SCHED_FLAGS, -1, -1 };
+ PyObject *resources;
+ PyObject *cpu_share;
-/* 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;
-};
+ if (!PyArg_ParseTuple(args, "IO", &ctx, &resources))
+ return NULL;
+ if (!PyMapping_Check(resources))
+ {
+ PyErr_SetString(PyExc_TypeError, "invalid resources object");
+ return NULL;
+ }
+ if ((cpu_share = PyMapping_GetItemString(resources, "nm_cpu_share")) &&
+ (cpu_share = PyNumber_Int(cpu_share)))
+ rspec.cpu_share = PyInt_AsLong(cpu_share);
+
+ if (pl_setsched(ctx, rspec.cpu_share, rspec.cpu_sched_flags))
+ PyErr_SetFromErrno(PyExc_OSError);
-#define CDLIM_UNSET (0ULL)
-#define CDLIM_INFINITY (~0ULL)
-#define CDLIM_KEEP (~1ULL)
+ return Py_None;
+}
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_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))
+ if (!PyArg_ParseTuple(args, "si", &path,&xid))
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;
}
+static PyObject *
+vserver_set_dlimit(PyObject *self, PyObject *args)
+{
+ char* path;
+ unsigned xid;
+ struct vcmd_ctx_dlimit_base_v0 init;
+ struct vcmd_ctx_dlimit_v0 data;
+
+ memset(&data,0,sizeof(data));
+ if (!PyArg_ParseTuple(args, "siiiiii", &path,
+ &xid,
+ &data.space_used,
+ &data.space_total,
+ &data.inodes_used,
+ &data.inodes_total,
+ &data.reserved))
+ return NULL;
+
+ data.name = path;
+ data.flags = 0;
+
+ memset(&init, 0, sizeof(init));
+ init.name = path;
+ init.flags = 0;
+
+ if ((vserver(VCMD_add_dlimit, xid, &init) && errno != EEXIST) ||
+ vserver(VCMD_set_dlimit, xid, &data))
+ return PyErr_SetFromErrno(PyExc_OSError);
+
+ return Py_None;
+}
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" },
- { "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 }
};
PyMODINIT_FUNC
initvserverimpl(void)
{
- Py_InitModule("vserverimpl", methods);
+ PyObject *mod;
+
+ mod = Py_InitModule("vserverimpl", methods);
+
+ /* export the set of 'safe' capabilities */
+ PyModule_AddIntConstant(mod, "CAP_SAFE", ~vc_get_insecurebcaps());
+
+ /* export the default vserver directory */
+ PyModule_AddStringConstant(mod, "VSERVER_BASEDIR", DEFAULT_VSERVERDIR);
+
+ /* export limit-related constants */
+ PyModule_AddIntConstant(mod, "DLIMIT_KEEP", (int)CDLIM_KEEP);
+ PyModule_AddIntConstant(mod, "DLIMIT_INF", (int)CDLIM_INFINITY);
}
git://git.onelab.eu / util-vserver.git / blobdiff