From: Enrico Scholz Date: Wed, 21 Jan 2004 18:48:25 +0000 (+0000) Subject: obsoleted by v13/oldproc functions X-Git-Tag: VERSION_0_10~863 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=012bc067913999c399c75d99cda3073490aa63bb;p=util-vserver.git obsoleted by v13/oldproc functions git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@667 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib/getctx-compat.hc b/util-vserver/lib/getctx-compat.hc deleted file mode 100644 index e0dfd0b..0000000 --- a/util-vserver/lib/getctx-compat.hc +++ /dev/null @@ -1,30 +0,0 @@ -// $Id$ --*- c++ -*-- - -// Copyright (C) 2003 Enrico Scholz -// -// 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. - - -#ifndef H_UTIL_VSERVER_LIB_GETCTX_COMPAT_H -#define H_UTIL_VSERVER_LIB_GETCTX_COMPAT_H - -#include "getctx-legacy.hc" - -static inline ALWAYSINLINE xid_t -vc_X_getctx_compat(pid_t pid) -{ - return vc_X_getctx_legacy(pid); -} - -#endif // H_UTIL_VSERVER_LIB_GETCTX_COMPAT_H diff --git a/util-vserver/lib/getctx-legacy.hc b/util-vserver/lib/getctx-legacy.hc deleted file mode 100644 index 7d52b56..0000000 --- a/util-vserver/lib/getctx-legacy.hc +++ /dev/null @@ -1,58 +0,0 @@ -// $Id$ --*- c++ -*-- - -// Copyright (C) 2003 Enrico Scholz -// -// 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. - - -#ifndef H_UTIL_VSERVER_LIB_GETCTX_LEGACY_H -#define H_UTIL_VSERVER_LIB_GETCTX_LEGACY_H - -#ifdef HAVE_CONFIG_H -# include -#endif -#include "compat.h" - -#include "vserver.h" -#include "utils-legacy.h" - -#include -#include - -static xid_t -vc_X_getctx_legacy_internal(pid_t pid) -{ - size_t bufsize = utilvserver_getProcEntryBufsize(); - char buf[bufsize]; - char *pos = 0; - - pos = utilvserver_getProcEntry(pid, "\ns_context: ", buf, bufsize); - - if (pos!=0) return atoi(pos); - else return VC_NOCTX; -} - -static xid_t -vc_X_getctx_legacy(pid_t pid) -{ - xid_t res; - do { - res = vc_X_getctx_legacy_internal(pid); - } while (res==VC_NOCTX && errno==EAGAIN); - - return res; -} - - -#endif // H_UTIL_VSERVER_LIB_GETCTX_LEGACY_H diff --git a/util-vserver/lib/getctx.c b/util-vserver/lib/getctx.c deleted file mode 100644 index ee1b504..0000000 --- a/util-vserver/lib/getctx.c +++ /dev/null @@ -1,49 +0,0 @@ -// $Id$ --*- c++ -*-- - -// Copyright (C) 2003 Enrico Scholz -// -// 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 -#endif - -#ifdef VC_ENABLE_API_COMPAT -# include "getctx-compat.hc" -#endif - -#ifdef VC_ENABLE_API_LEGACY -# include "getctx-legacy.hc" -#endif - -#include "vserver.h" -#include "vserver-internal.h" -#include "internal.h" - -#include - -xid_t -vc_X_getctx(pid_t pid) -{ -#ifndef NDEBUG - if (getenv("VC_BE_VALGRIND_FRIENDLY")==0) -#endif - CALL_VC(CALL_VC_COMPAT(vc_X_getctx, pid), - CALL_VC_LEGACY(vc_X_getctx, pid)); -#ifndef NDEBUG - else - return vc_X_getctx_legacy(pid); -#endif -} diff --git a/util-vserver/lib/getinitpid-compat.hc b/util-vserver/lib/getinitpid-compat.hc deleted file mode 100644 index 9de1d4c..0000000 --- a/util-vserver/lib/getinitpid-compat.hc +++ /dev/null @@ -1,30 +0,0 @@ -// $Id$ --*- c++ -*-- - -// Copyright (C) 2003 Enrico Scholz -// -// 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. - - -#ifndef H_UTIL_VSERVER_LIB_GETINITPID_COMPAT_H -#define H_UTIL_VSERVER_LIB_GETINITPID_COMPAT_H - -#include "getinitpid-legacy.hc" - -static inline ALWAYSINLINE pid_t -vc_X_getinitpid_compat(pid_t pid) -{ - return vc_X_getinitpid_legacy(pid); -} - -#endif // H_UTIL_VSERVER_LIB_GETINITPID_COMPAT_H diff --git a/util-vserver/lib/getinitpid-legacy.hc b/util-vserver/lib/getinitpid-legacy.hc deleted file mode 100644 index 14be1b0..0000000 --- a/util-vserver/lib/getinitpid-legacy.hc +++ /dev/null @@ -1,61 +0,0 @@ -// $Id$ --*- c++ -*-- - -// Copyright (C) 2003 Enrico Scholz -// -// 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. - - -#ifndef H_UTIL_VSERVER_LIB_GETINITPID_LEGACY_H -#define H_UTIL_VSERVER_LIB_GETINITPID_LEGACY_H - -#ifdef HAVE_CONFIG_H -# include -#endif -#include "compat.h" - -#include "vserver.h" -#include "utils-legacy.h" - -#include -#include -#include - -static pid_t -vc_X_getinitpid_legacy_internal(pid_t pid) -{ - size_t bufsize = utilvserver_getProcEntryBufsize(); - char buf[bufsize]; - char *pos = 0; - - pos = utilvserver_getProcEntry(pid, "\ninitpid: ", buf, bufsize); - - if (pos!=0) { - if (memcmp(pos,"none",4)==0) return 1; - else return atoi(pos); - } - else return -1; -} - -static pid_t -vc_X_getinitpid_legacy(pid_t pid) -{ - pid_t res; - do { - res = vc_X_getinitpid_legacy_internal(pid); - } while (res==-1 && errno==EAGAIN); - - return res; -} - -#endif // H_UTIL_VSERVER_LIB_GETINITPID_LEGACY_H diff --git a/util-vserver/lib/getinitpid.c b/util-vserver/lib/getinitpid.c deleted file mode 100644 index fbc178c..0000000 --- a/util-vserver/lib/getinitpid.c +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ --*- c++ -*-- - -// Copyright (C) 2003 Enrico Scholz -// -// 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 -#endif - -#ifdef VC_ENABLE_API_COMPAT -# include "getinitpid-compat.hc" -#endif - -#ifdef VC_ENABLE_API_LEGACY -# include "getinitpid-legacy.hc" -#endif - -#include "vserver.h" -#include "vserver-internal.h" -#include "internal.h" - -#include - -pid_t -vc_X_getinitpid(pid_t pid) -{ - CALL_VC(CALL_VC_COMPAT(vc_X_getinitpid, pid), - CALL_VC_LEGACY(vc_X_getinitpid, pid)); -}