X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserverimpl.c;h=d5f018dd6b9f9b1bda1ad964842626d4b3083d95;hb=6bbeb3e9837789f7813f1a38d39ac2e4df3a570b;hp=58b0a6125c2816ba30f69fc798e786eb2f42029e;hpb=b15d92ff405320b0b0a95e536f3dfb29ce763f9f;p=util-vserver.git

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 58b0a61..d5f018d 100644
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -33,57 +33,67 @@ 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 <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 NONE  ({ Py_INCREF(Py_None); Py_None; })
 
 /*
- * chcontext
+ * context create
  */
 static PyObject *
 vserver_chcontext(PyObject *self, PyObject *args)
 {
-  unsigned  xid;
-  unsigned  caps_remove = 0;
+  int  result;
+  xid_t  ctx;
+  uint32_t  flags = 0;
+  uint32_t  bcaps = ~vc_get_insecurebcaps();
 
-  if (!PyArg_ParseTuple(args, "I|I", &xid, &caps_remove))
+  if (!PyArg_ParseTuple(args, "I|K", &ctx, &flags))
     return NULL;
 
-  if (vc_new_s_context(xid, caps_remove, 0) < 0)
+  if ((result = pl_chcontext(ctx, flags, bcaps)) < 0)
     return PyErr_SetFromErrno(PyExc_OSError);
 
-  return Py_None;
+  return PyBool_FromLong(result);
 }
 
 static PyObject *
-__vserver_rlimit(PyObject *self, PyObject *args, int resource) {
+vserver_setup_done(PyObject *self, PyObject *args)
+{
+  xid_t  ctx;
+
+  if (!PyArg_ParseTuple(args, "I", &ctx))
+    return NULL;
+
+  if (pl_setup_done(ctx) < 0)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
+}
+
+static PyObject *
+vserver_set_rlimit(PyObject *self, PyObject *args) {
 	struct vc_rlimit limits;
-	int xid; 
+	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, "iL", &xid, &limits.hard))
+	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)
@@ -94,18 +104,27 @@ __vserver_rlimit(PyObject *self, PyObject *args, int resource) {
 	return ret;
 }
 
-
 static PyObject *
-vserver_memlimit(PyObject *self, PyObject *args) {
-	return __vserver_rlimit(self,args,5);
-}
+vserver_get_rlimit(PyObject *self, PyObject *args) {
+	struct vc_rlimit limits;
+	xid_t xid;
+	int resource;
+	PyObject *ret;
 
-static PyObject *
-vserver_tasklimit(PyObject *self, PyObject *args) {
-	return __vserver_rlimit(self,args,6);
-}
+	limits.min = VC_LIM_KEEP;
+	limits.soft = VC_LIM_KEEP;
+	limits.hard = VC_LIM_KEEP;
 
+	if (!PyArg_ParseTuple(args, "Ii", &xid, &resource))
+		return NULL;
 
+	if (vc_get_rlimit(xid, resource, &limits)==-1)
+		ret = PyErr_SetFromErrno(PyExc_OSError);
+	else
+		ret = Py_BuildValue("L",limits.hard);
+
+	return ret;
+}
 
 /*
  * setsched
@@ -113,65 +132,59 @@ vserver_tasklimit(PyObject *self, PyObject *args) {
 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))
+  xid_t  ctx;
+  uint32_t  cpu_share;
+  uint32_t  cpu_sched_flags = VC_VXF_SCHED_FLAGS;
+
+  if (!PyArg_ParseTuple(args, "II|I", &ctx, &cpu_share, &cpu_sched_flags))
     return NULL;
 
-  if (vc_set_sched(xid, &sched) == -1)
+  /* ESRCH indicates that there are no processes in the context */
+  if (pl_setsched(ctx, cpu_share, cpu_sched_flags) &&
+      errno != ESRCH)
     return PyErr_SetFromErrno(PyExc_OSError);
 
-  return Py_None;
+  return NONE;
 }
 
-/*
- * setsched
- */
+static PyObject *
+vserver_get_dlimit(PyObject *self, PyObject *args)
+{
+	PyObject *res;
+	char* path;
+	unsigned xid;
+	struct vcmd_ctx_dlimit_v0 data;
+	int r;
 
-/*  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)
+	if (!PyArg_ParseTuple(args, "si", &path,&xid))
+		return NULL;
 
-struct  vcmd_ctx_dlimit_base_v0 {
-	char *name;
-	uint32_t flags;
-};
+	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);
+	}
 
-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;
-};
+	return res;
+}
 
-#define CDLIM_UNSET             (0ULL)
-#define CDLIM_INFINITY          (~0ULL)
-#define CDLIM_KEEP              (~1ULL)
 
 static PyObject *
-vserver_dlimit(PyObject *self, PyObject *args)
+vserver_set_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, "siiiiii", &path,
@@ -186,50 +199,93 @@ vserver_dlimit(PyObject *self, PyObject *args)
 	data.name = path;
 	data.flags = 0;
 
+	memset(&init, 0, sizeof(init));
 	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){}
+	if ((vserver(VCMD_add_dlimit, xid, &init) && errno != EEXIST) ||
+            vserver(VCMD_set_dlimit, xid, &data))
+          return PyErr_SetFromErrno(PyExc_OSError);
 
-	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 NONE;	
+}
 
-	return res;
+static PyObject *
+vserver_unset_dlimit(PyObject *self, PyObject *args)
+{
+  char  *path;
+  unsigned  xid;
+  struct vcmd_ctx_dlimit_base_v0  init;
+
+  if (!PyArg_ParseTuple(args, "si", &path, &xid))
+    return NULL;
+
+  memset(&init, 0, sizeof(init));
+  init.name = path;
+  init.flags = 0;
+
+  if (vserver(VCMD_rem_dlimit, xid, &init) && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;	
+}
+
+static PyObject *
+vserver_killall(PyObject *self, PyObject *args)
+{
+  xid_t  ctx;
+  int  sig;
+
+  if (!PyArg_ParseTuple(args, "Ii", &ctx, &sig))
+    return NULL;
+
+  if (vc_ctx_kill(ctx, 0, sig) && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
 }
 
 static PyMethodDef  methods[] = {
   { "chcontext", vserver_chcontext, METH_VARARGS,
-    "Change to the given vserver context" },
+    "chcontext to vserver with provided flags" },
+  { "setup_done", vserver_setup_done, METH_VARARGS,
+    "Release vserver setup lock" },
   { "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" },
-  { "tasklimit", vserver_tasklimit, METH_VARARGS,
-    "Set task limits for given vserver context" },
-  { "memlimit", vserver_memlimit, METH_VARARGS,
-    "Set memory limits for given vserver context" },
+  { "unsetdlimit", vserver_unset_dlimit, METH_VARARGS,
+    "Remove 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" },
+  { "killall", vserver_killall, METH_VARARGS,
+    "Send signal to all processes in 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);
+
+  /* scheduler flags */
+  PyModule_AddIntConstant(mod,
+			  "VS_SCHED_CPU_GUARANTEED",
+			  VS_SCHED_CPU_GUARANTEED);
 }