#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"
-#define MEF_DEBUG 1
/*
* context create
*/
static PyObject *
vserver_chcontext(PyObject *self, PyObject *args)
{
- 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;
-
- caps.ccaps = ~vc_get_insecureccaps();
- caps.cmask = ~0ull;
- caps.bcaps = ~vc_get_insecurebcaps();
- caps.bmask = ~0ull;
-
- 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);
- }
-
- 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);
+ 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 (!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);
-#ifdef MEF_DEBUG
- printf("vserver_create xid = %d(%d)\n",xid,ctx);
-#endif
- return Py_None;
+ return Py_None;
}
static PyObject *
static PyObject *
vserver_setsched(PyObject *self, PyObject *args)
{
- 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|I|I", &xid,
- &sched.fill_rate,
- &sched.interval,
- &sched.tokens,
- &sched.tokens_min,
- &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);
+ xid_t ctx;
+ rspec_t rspec = { 32, VC_VXF_SCHED_FLAGS, -1, -1 };
+ PyObject *resources;
+ PyObject *cpu_share;
- if (vc_set_sched(xid, &sched) == -1)
- return PyErr_SetFromErrno(PyExc_OSError);
+ 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);
return Py_None;
}
-/*
- * setsched
- */
-
static PyObject *
vserver_get_dlimit(PyObject *self, PyObject *args)
{
/* export the default vserver directory */
PyModule_AddStringConstant(mod, "VSERVER_BASEDIR", DEFAULT_VSERVERDIR);
- /* export a constant to indicate unchanged disk quota values */
+ /* export limit-related constants */
PyModule_AddIntConstant(mod, "DLIMIT_KEEP", (int)CDLIM_KEEP);
+ PyModule_AddIntConstant(mod, "DLIMIT_INF", (int)CDLIM_INFINITY);
}