# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 71fa0e0d520ccd7dfe446418020e6cc199d18fe2
# Parent 954f4dea9da6336aaa35d0706aed55fde7909644
Rename csched -> sched_credit/sched-credit in control plane.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/libxc/xc_csched.c | 8 +++---
tools/libxc/xenctrl.h | 14 +++++------
tools/python/xen/lowlevel/xc/xc.c | 36 +++++++++++++++---------------
tools/python/xen/xend/XendDomain.py | 8 +++---
tools/python/xen/xend/server/SrvDomain.py | 8 +++---
tools/python/xen/xm/main.py | 16 ++++++-------
xen/include/public/sched_ctl.h | 2 -
7 files changed, 46 insertions(+), 46 deletions(-)
diff -r 954f4dea9da6 -r 71fa0e0d520c tools/libxc/xc_csched.c
--- a/tools/libxc/xc_csched.c Fri May 26 17:22:30 2006 +0100
+++ b/tools/libxc/xc_csched.c Sat May 27 10:13:27 2006 +0100
@@ -12,10 +12,10 @@
int
-xc_csched_domain_set(
+xc_sched_credit_domain_set(
int xc_handle,
uint32_t domid,
- struct csched_domain *sdom)
+ struct sched_credit_adjdom *sdom)
{
DECLARE_DOM0_OP;
@@ -29,10 +29,10 @@ xc_csched_domain_set(
}
int
-xc_csched_domain_get(
+xc_sched_credit_domain_get(
int xc_handle,
uint32_t domid,
- struct csched_domain *sdom)
+ struct sched_credit_adjdom *sdom)
{
DECLARE_DOM0_OP;
int err;
diff -r 954f4dea9da6 -r 71fa0e0d520c tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h Fri May 26 17:22:30 2006 +0100
+++ b/tools/libxc/xenctrl.h Sat May 27 10:13:27 2006 +0100
@@ -354,13 +354,13 @@ int xc_sedf_domain_get(int xc_handle,
uint64_t *latency, uint16_t *extratime,
uint16_t *weight);
-int xc_csched_domain_set(int xc_handle,
- uint32_t domid,
- struct csched_domain *sdom);
-
-int xc_csched_domain_get(int xc_handle,
- uint32_t domid,
- struct csched_domain *sdom);
+int xc_sched_credit_domain_set(int xc_handle,
+ uint32_t domid,
+ struct sched_credit_adjdom *sdom);
+
+int xc_sched_credit_domain_get(int xc_handle,
+ uint32_t domid,
+ struct sched_credit_adjdom *sdom);
typedef evtchn_status_t xc_evtchn_status_t;
diff -r 954f4dea9da6 -r 71fa0e0d520c tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Fri May 26 17:22:30 2006 +0100
+++ b/tools/python/xen/lowlevel/xc/xc.c Sat May 27 10:13:27 2006 +0100
@@ -716,16 +716,16 @@ static PyObject *pyxc_sedf_domain_get(Xc
"weight", weight);
}
-static PyObject *pyxc_csched_domain_set(XcObject *self,
- PyObject *args,
- PyObject *kwds)
+static PyObject *pyxc_sched_credit_domain_set(XcObject *self,
+ PyObject *args,
+ PyObject *kwds)
{
uint32_t domid;
uint16_t weight;
uint16_t cap;
static char *kwd_list[] = { "dom", "weight", "cap", NULL };
static char kwd_type[] = "I|HH";
- struct csched_domain sdom;
+ struct sched_credit_adjdom sdom;
weight = 0;
cap = (uint16_t)~0U;
@@ -736,22 +736,22 @@ static PyObject *pyxc_csched_domain_set(
sdom.weight = weight;
sdom.cap = cap;
- if ( xc_csched_domain_set(self->xc_handle, domid, &sdom) != 0 )
- return PyErr_SetFromErrno(xc_error);
-
- Py_INCREF(zero);
- return zero;
-}
-
-static PyObject *pyxc_csched_domain_get(XcObject *self, PyObject *args)
+ if ( xc_sched_credit_domain_set(self->xc_handle, domid, &sdom) != 0 )
+ return PyErr_SetFromErrno(xc_error);
+
+ Py_INCREF(zero);
+ return zero;
+}
+
+static PyObject *pyxc_sched_credit_domain_get(XcObject *self, PyObject *args)
{
uint32_t domid;
- struct csched_domain sdom;
+ struct sched_credit_adjdom sdom;
if( !PyArg_ParseTuple(args, "I", &domid) )
return NULL;
- if ( xc_csched_domain_get(self->xc_handle, domid, &sdom) != 0 )
+ if ( xc_sched_credit_domain_get(self->xc_handle, domid, &sdom) != 0 )
return PyErr_SetFromErrno(xc_error);
return Py_BuildValue("{s:H,s:H}",
@@ -1084,8 +1084,8 @@ static PyMethodDef pyxc_methods[] = {
" latency [long]: domain's wakeup latency hint\n"
" extratime [int]: domain aware of extratime?\n"},
- { "csched_domain_set",
- (PyCFunction)pyxc_csched_domain_set,
+ { "sched_credit_domain_set",
+ (PyCFunction)pyxc_sched_credit_domain_set,
METH_KEYWORDS, "\n"
"Set the scheduling parameters for a domain when running with the\n"
"SMP credit scheduler.\n"
@@ -1093,8 +1093,8 @@ static PyMethodDef pyxc_methods[] = {
" weight [short]: domain's scheduling weight\n"
"Returns: [int] 0 on success; -1 on error.\n" },
- { "csched_domain_get",
- (PyCFunction)pyxc_csched_domain_get,
+ { "sched_credit_domain_get",
+ (PyCFunction)pyxc_sched_credit_domain_get,
METH_VARARGS, "\n"
"Get the scheduling parameters for a domain when running with the\n"
"SMP credit scheduler.\n"
diff -r 954f4dea9da6 -r 71fa0e0d520c tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py Fri May 26 17:22:30 2006 +0100
+++ b/tools/python/xen/xend/XendDomain.py Sat May 27 10:13:27 2006 +0100
@@ -522,25 +522,25 @@ class XendDomain:
except Exception, ex:
raise XendError(str(ex))
- def domain_csched_get(self, domid):
+ def domain_sched_credit_get(self, domid):
"""Get credit scheduler parameters for a domain.
"""
dominfo = self.domain_lookup_by_name_or_id_nr(domid)
if not dominfo:
raise XendInvalidDomain(str(domid))
try:
- return xc.csched_domain_get(dominfo.getDomid())
+ return xc.sched_credit_domain_get(dominfo.getDomid())
except Exception, ex:
raise XendError(str(ex))
- def domain_csched_set(self, domid, weight, cap):
+ def domain_sched_credit_set(self, domid, weight, cap):
"""Set credit scheduler parameters for a domain.
"""
dominfo = self.domain_lookup_by_name_or_id_nr(domid)
if not dominfo:
raise XendInvalidDomain(str(domid))
try:
- return xc.csched_domain_set(dominfo.getDomid(), weight, cap)
+ return xc.sched_credit_domain_set(dominfo.getDomid(), weight, cap)
except Exception, ex:
raise XendError(str(ex))
diff -r 954f4dea9da6 -r 71fa0e0d520c tools/python/xen/xend/server/SrvDomain.py
--- a/tools/python/xen/xend/server/SrvDomain.py Fri May 26 17:22:30 2006 +0100
+++ b/tools/python/xen/xend/server/SrvDomain.py Sat May 27 10:13:27 2006 +0100
@@ -132,15 +132,15 @@ class SrvDomain(SrvDir):
val = fn(req.args, {'dom': self.dom.domid})
return val
- def op_domain_csched_get(self, _, req):
- fn = FormFn(self.xd.domain_csched_get,
+ def op_domain_sched_credit_get(self, _, req):
+ fn = FormFn(self.xd.domain_sched_credit_get,
[['dom', 'int']])
val = fn(req.args, {'dom': self.dom.domid})
return val
- def op_domain_csched_set(self, _, req):
- fn = FormFn(self.xd.domain_csched_set,
+ def op_domain_sched_credit_set(self, _, req):
+ fn = FormFn(self.xd.domain_sched_credit_set,
[['dom', 'int'],
['weight', 'int']])
val = fn(req.args, {'dom': self.dom.domid})
diff -r 954f4dea9da6 -r 71fa0e0d520c tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py Fri May 26 17:22:30 2006 +0100
+++ b/tools/python/xen/xm/main.py Sat May 27 10:13:27 2006 +0100
@@ -99,7 +99,7 @@ sched_sedf_help = "sched-sedf [DOM] [OPT
specifies another way of setting a
domain's\n\
cpu period/slice."
-csched_help = "csched Set or get credit scheduler
parameters"
+sched_credit_help = "sched-credit Set or get credit
scheduler parameters"
block_attach_help = """block-attach <DomId> <BackDev> <FrontDev> <Mode>
[BackDomId] Create a new virtual block device"""
block_detach_help = """block-detach <DomId> <DevId> Destroy a domain's
virtual block device,
@@ -175,7 +175,7 @@ host_commands = [
]
scheduler_commands = [
- "csched",
+ "sched-credit",
"sched-bvt",
"sched-bvt-ctxallow",
"sched-sedf",
@@ -737,11 +737,11 @@ def xm_sched_sedf(args):
else:
print_sedf(sedf_info)
-def xm_csched(args):
- usage_msg = """Csched: Set or get credit scheduler parameters
+def xm_sched_credit(args):
+ usage_msg = """sched-credit: Set or get credit scheduler parameters
Usage:
- csched -d domain [-w weight] [-c cap]
+ sched-credit -d domain [-w weight] [-c cap]
"""
try:
opts, args = getopt.getopt(args[0:], "d:w:c:",
@@ -769,14 +769,14 @@ def xm_csched(args):
sys.exit(1)
if weight is None and cap is None:
- print server.xend.domain.csched_get(domain)
+ print server.xend.domain.sched_credit_get(domain)
else:
if weight is None:
weight = int(0)
if cap is None:
cap = int(~0)
- err = server.xend.domain.csched_set(domain, weight, cap)
+ err = server.xend.domain.sched_credit_set(domain, weight, cap)
if err != 0:
print err
@@ -1076,7 +1076,7 @@ commands = {
"sched-bvt": xm_sched_bvt,
"sched-bvt-ctxallow": xm_sched_bvt_ctxallow,
"sched-sedf": xm_sched_sedf,
- "csched": xm_csched,
+ "sched-credit": xm_sched_credit,
# block
"block-attach": xm_block_attach,
"block-detach": xm_block_detach,
diff -r 954f4dea9da6 -r 71fa0e0d520c xen/include/public/sched_ctl.h
--- a/xen/include/public/sched_ctl.h Fri May 26 17:22:30 2006 +0100
+++ b/xen/include/public/sched_ctl.h Sat May 27 10:13:27 2006 +0100
@@ -49,7 +49,7 @@ struct sched_adjdom_cmd {
uint32_t extratime;
uint32_t weight;
} sedf;
- struct csched_domain {
+ struct sched_credit_adjdom {
uint16_t weight;
uint16_t cap;
} credit;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home