cleanups; optimize CALL_VC() usage
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Wed, 21 Jan 2004 18:55:12 +0000 (18:55 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Wed, 21 Jan 2004 18:55:12 +0000 (18:55 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@671 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/lib/syscall_kill.c
util-vserver/lib/syscall_rlimit.c

index 0e7fdf6..96a0046 100644 (file)
 #include "vserver-internal.h"
 #include "linuxvirtual.h"
 
-#ifdef VC_ENABLE_API_V11
+#if defined(VC_ENABLE_API_V11) || defined(VC_ENABLE_API_V13)
 #  include "syscall_kill-v11.hc"
 #endif
 
+#ifdef VC_ENABLE_API_V13
+#  define vc_ctx_kill_v13      vc_ctx_kill_v11
+#endif
+
+
+#if defined(VC_ENABLE_API_V11) || defined(VC_ENABLE_API_V13)
+
+  // NOTICE: the reverse order of V11 -> V13 is correct here since these are
+  // the same syscalls
+
 int
 vc_ctx_kill(xid_t ctx, pid_t pid, int sig)
 {
-  CALL_VC(CALL_VC_V11(vc_ctx_kill, ctx, pid, sig));
+  CALL_VC(CALL_VC_V11(vc_ctx_kill, ctx, pid, sig),
+         CALL_VC_V13(vc_ctx_kill, ctx, pid, sig));
 }
 
-#if defined (VC_ENABLE_API_V11)
 #endif
index 3a64446..c3f75a5 100644 (file)
 #include "compat.h"
 
 #include "vserver.h"
-#include "vserver-internal.h"
 #include "internal.h"
 #include "linuxvirtual.h"
 
-#ifdef VC_ENABLE_API_V11
+
+#include "vserver-internal.h"
+
+#if defined(VC_ENABLE_API_V11) || defined(VC_ENABLE_API_V13)
 #  include "syscall_rlimit-v11.hc"
 #endif
 
-#if defined (VC_ENABLE_API_V11)
+#ifdef VC_ENABLE_API_V13
+#  define vc_get_rlimit_v13            vc_get_rlimit_v11
+#  define vc_set_rlimit_v13            vc_set_rlimit_v11
+#  define vc_get_rlimit_mask_v13       vc_get_rlimit_mask_v11
+#endif
+
+
+#if defined(VC_ENABLE_API_V11) || defined(VC_ENABLE_API_V13)
+
+  // NOTICE: the reverse order of V11 -> V13 is correct here since these are
+  // the same syscalls
 
 int
 vc_get_rlimit(xid_t ctx, int resource, struct vc_rlimit *lim)
 {
-  CALL_VC(CALL_VC_V11(vc_get_rlimit, ctx, resource, lim));
+  CALL_VC(CALL_VC_V11(vc_get_rlimit, ctx, resource, lim),
+         CALL_VC_V13(vc_get_rlimit, ctx, resource, lim));
 }
 
 int
 vc_set_rlimit(xid_t ctx, int resource, struct vc_rlimit const *lim)
 {
-  CALL_VC(CALL_VC_V11(vc_set_rlimit, ctx, resource, lim));
+  CALL_VC(CALL_VC_V11(vc_set_rlimit, ctx, resource, lim),
+         CALL_VC_V13(vc_set_rlimit, ctx, resource, lim));
 }
 
 int
 vc_get_rlimit_mask(xid_t ctx, struct vc_rlimit_mask *lim)
 {
-  CALL_VC(CALL_VC_V11(vc_get_rlimit_mask, ctx, 0, lim));
+  CALL_VC(CALL_VC_V11(vc_get_rlimit_mask, ctx, 0, lim),
+         CALL_VC_V13(vc_get_rlimit_mask, ctx, 0, lim));
 }