split vc_set_sched_v13obs() into an own file
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Sun, 22 Jan 2006 18:18:28 +0000 (18:18 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Sun, 22 Jan 2006 18:18:28 +0000 (18:18 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2271 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/lib/Makefile-files
util-vserver/lib/syscall_setsched-v13.hc
util-vserver/lib/syscall_setsched-v13obs.hc [new file with mode: 0644]
util-vserver/lib/syscall_setsched.c

index af7f50b..0b01d82 100644 (file)
@@ -92,6 +92,7 @@ lib_v13_SRCS =                        lib/syscall_ctxcreate.c \
                                lib/syscall_setnflags-net.hc \
                                lib/syscall_setnflags.c \
                                lib/syscall_setsched-v13.hc \
+                               lib/syscall_setsched-v13obs.hc \
                                lib/syscall_setsched.c \
                                lib/syscall_setvhiname-olduts.hc \
                                lib/syscall_setvhiname-v13.hc \
index 83c2af7..e48eee7 100644 (file)
 #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
diff --git a/util-vserver/lib/syscall_setsched-v13obs.hc b/util-vserver/lib/syscall_setsched-v13obs.hc
new file mode 100644 (file)
index 0000000..2f67a9e
--- /dev/null
@@ -0,0 +1,43 @@
+// $Id$    --*- c -*--
+
+// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+//  
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//  
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//  
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#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);
+}
index 48b9603..0a6813c 100644 (file)
 #include "vserver.h"
 #include "virtual.h"
 
-#define VC_MULTIVERSION_SYSCALL        1
+#if defined(VC_ENABLE_API_V13OBS) && defined(VC_ENABLE_API_V13)
+#  define VC_MULTIVERSION_SYSCALL      1
+#endif
 #include "vserver-internal.h"
 
 #ifdef VC_ENABLE_API_V13
 #  include "syscall_setsched-v13.hc"
 #endif
 
+#ifdef VC_ENABLE_API_V13OBS
+#  include "syscall_setsched-v13obs.hc"
+#endif
+
 int
 vc_set_sched(xid_t xid, struct vc_set_sched const *data)
 {