X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fsyscall_setsched-v13.hc;fp=lib%2Fsyscall_setsched-v13.hc;h=af08a5da9f0cfc3382f21d48a00d7ba597edeffa;hb=2822ba293eb308225c50d346930c47bf98d9927b;hp=dc2f514aa3a722fb3f37a1357a043e0242359434;hpb=2894fc5a4c8335e4d7221311fed0556f33f8047c;p=util-vserver.git

diff --git a/lib/syscall_setsched-v13.hc b/lib/syscall_setsched-v13.hc
index dc2f514..af08a5d 100644
--- a/lib/syscall_setsched-v13.hc
+++ b/lib/syscall_setsched-v13.hc
@@ -1,4 +1,4 @@
-// $Id: syscall_setsched-v13.hc,v 1.3 2007/01/18 15:28:28 mef Exp $    --*- c -*--
+// $Id: syscall_setsched-v13.hc,v 1.2 2005/08/21 22:07:28 mlhuang Exp $    --*- c -*--
 
 // Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 //  
@@ -23,6 +23,25 @@
 #include "vserver.h"
 #include <lib_internal/util.h>
 
+#define VCGET(MASK,VAL)		((data->set_mask & (MASK)) ? (VAL) : SCHED_KEEP);
+
+static inline ALWAYSINLINE int
+vc_set_sched_v13obs(xid_t xid, struct vc_set_sched const *data)
+{
+#warning vc_set_sched_v13() uses an obsolete interface; remove it in the final version
+  struct vcmd_set_sched_v2	k_data;
+
+  
+  k_data.cpu_mask    = 0;
+  k_data.fill_rate   = VCGET(VC_VXSM_FILL_RATE,  data->fill_rate);
+  k_data.interval    = VCGET(VC_VXSM_INTERVAL,   data->interval);
+  k_data.tokens      = VCGET(VC_VXSM_TOKENS,     data->tokens);
+  k_data.tokens_min  = VCGET(VC_VXSM_TOKENS_MIN, data->tokens_min);
+  k_data.tokens_max  = VCGET(VC_VXSM_TOKENS_MAX, data->tokens_max);
+
+  return vserver(VCMD_set_sched_v2, CTX_USER2KERNEL(xid), &k_data);
+}
+
 #define X(ATTR)		ENSC_SAME_STRUCT_IDX(k_data, *data, ATTR)
 
 static inline ALWAYSINLINE int
@@ -30,13 +49,21 @@ vc_set_sched_v13b(xid_t xid, struct vc_set_sched const *data)
 {
   struct vcmd_set_sched_v3	k_data;
 
-  k_data.set_mask      = data->set_mask & VC_VXSM_V3_MASK;
-  k_data.fill_rate     = data->fill_rate;
-  k_data.interval      = data->interval;
-  k_data.tokens        = data->tokens;
-  k_data.tokens_min    = data->tokens_min;
-  k_data.tokens_max    = data->tokens_max;
-  k_data.priority_bias = data->priority_bias;
+    // This expression will be evaluated at compile-time
+  if (sizeof(struct vcmd_set_sched_v3)==sizeof(struct vc_set_sched) &&
+      X(set_mask)   && X(fill_rate)  && X(interval)   && X(tokens) &&
+      X(tokens_min) && X(tokens_max) && X(priority_bias))
+    return vserver(VCMD_set_sched, CTX_USER2KERNEL(xid),
+		   const_cast(struct vc_set_sched *)(data));
+  else {
+    k_data.set_mask      = data->set_mask;
+    k_data.fill_rate     = data->fill_rate;
+    k_data.interval      = data->interval;
+    k_data.tokens        = data->tokens;
+    k_data.tokens_min    = data->tokens_min;
+    k_data.tokens_max	 = data->tokens_max;
+    k_data.priority_bias = data->priority_bias;
 
-  return vserver(VCMD_set_sched_v3, CTX_USER2KERNEL(xid), &k_data);
+    return vserver(VCMD_set_sched, CTX_USER2KERNEL(xid), &k_data);
+  }
 }