[prev in list] [next in list] [prev in thread] [next in thread] 

List:       grid-engine-dev
Subject:    [PATCH] SGE 5.3 support for NetBSD alpha/amd64 platforms
From:       Nicolas Joly <njoly () pasteur ! fr>
Date:       2004-06-14 11:42:56
Message-ID: 20040614114256.GA46843 () medusa ! sis ! pasteur ! fr
[Download RAW message or body]

Hi,

Attached is a small set of patches, against SGE 5.3 CVS, that add
support for NetBSD alpha and amd64 platforms.

This is mostly 64bit fixes (following FREEBSD ones) + use of
`processor architecture name' instead of `machine hardware name'
(uname -p vs. uname -m') in `arch' script.

Comments ?

-- 
Nicolas Joly

Biological Software and Databanks.
Institut Pasteur, Paris.

["grid-nbsd64.diff" (text/plain)]

Index: common/basis_types.h
===================================================================
RCS file: /cvs/gridengine/source/common/basis_types.h,v
retrieving revision 1.3.2.8
diff -u -r1.3.2.8 basis_types.h
--- common/basis_types.h	15 Jan 2004 00:30:26 -0000	1.3.2.8
+++ common/basis_types.h	14 Jun 2004 11:20:13 -0000
@@ -52,7 +52,7 @@
 
 
 
-#if defined(FREEBSD)
+#if defined(FREEBSD) || defined(NETBSD)
 #  define U32CFormat "%u"
 #  define u32c(x)  (unsigned int)(x)
 
@@ -92,7 +92,7 @@
 #  define u_long32 u_int
 #elif defined(WIN32NATIVE)
 #  define u_long32 unsigned long
-#elif defined(FREEBSD)
+#elif defined(FREEBSD) || defined(NETBSD)
 #  define u_long32 uint32_t
 #else
 #  define u_long32 u_long
@@ -100,7 +100,7 @@
 
 /* set u32 and x32 for 64 or 32 bit machines */
 /* uu32 for strictly unsigned, not nice, but did I use %d for an unsigned? */
-#if defined(ALPHA) || defined(IRIX6) || defined(CRAY) || defined(SOLARIS64) || \
defined(NECSX4) || defined(NECSX5) || defined(ALINUX) || defined(IA64LINUX) || \
defined(LINUXAMD64) ||defined(FREEBSD) +#if defined(ALPHA) || defined(IRIX6) || \
defined(CRAY) || defined(SOLARIS64) || defined(NECSX4) || defined(NECSX5) || \
defined(ALINUX) || defined(IA64LINUX) || defined(LINUXAMD64) || defined(FREEBSD) || \
defined(NETBSD)  #  define u32    "%d"
 #  define uu32   "%u"
 #  define x32    "%x"
@@ -116,7 +116,7 @@
    solaris (who else - it's IRIX?) uses long 
    variables for uid_t, gid_t and pid_t 
 */
-#if defined(FREEBSD)
+#if defined(FREEBSD) || defined(NETBSD)
 #  define uid_t_fmt "%u"
 #else 
 #  define uid_t_fmt pid_t_fmt
@@ -132,7 +132,7 @@
 #  define gid_t_fmt    "%ld"
 #elif defined(LINUX5)
 #  define gid_t_fmt    "%hu"
-#elif defined(LINUX6) || defined(FREEBSD)
+#elif defined(LINUX6) || defined(FREEBSD) || defined(NETBSD)
 #  define gid_t_fmt    "%u"
 #else
 #  define gid_t_fmt    "%d"
@@ -185,7 +185,7 @@
 #define SN_UNLIMITED  "%s"
 
 /* used for shepherd and procfs */
-#if defined(LINUX) || defined(SUN4) || defined(AIX4) || defined(HP10) || \
defined(HP11) || defined(FREEBSD) +#if defined(LINUX) || defined(SUN4) || \
defined(AIX4) || defined(HP10) || defined(HP11) || defined(FREEBSD) || \
defined(NETBSD)  #  define MAX_GROUPS NGROUPS
 #elif defined(IRIX6) || defined(SOLARIS)
 #  define MAX_GROUPS NGROUPS_UMAX
Index: daemons/common/pdc.c
===================================================================
RCS file: /cvs/gridengine/source/daemons/common/pdc.c,v
retrieving revision 1.3.2.3
diff -u -r1.3.2.3 pdc.c
--- daemons/common/pdc.c	19 Mar 2003 16:38:38 -0000	1.3.2.3
+++ daemons/common/pdc.c	14 Jun 2004 11:20:13 -0000
@@ -117,7 +117,7 @@
 #include "sge_stat.h"
 #endif
 
-#if defined(LINUX) || defined(ALPHA) || defined(IRIX6) || defined(SOLARIS) || \
defined(FREEBSD) || defined(DARWIN) +#if defined(LINUX) || defined(ALPHA) || \
defined(IRIX6) || defined(SOLARIS) || defined(FREEBSD) || defined(DARWIN) || \
defined(NETBSD)  #include "sge_nprocs.h"
 #endif
 
@@ -2082,7 +2082,7 @@
    pagesize = getpagesize();
 
    /* retrieve static parameters */
-#if defined(LINUX) || defined(ALINUX) || defined(IRIX6) || defined(SOLARIS) || \
defined(FREEBSD) || defined(DARWIN) +#if defined(LINUX) || defined(ALINUX) || \
defined(IRIX6) || defined(SOLARIS) || defined(FREEBSD) || defined(DARWIN) || \
defined(NETBSD)  ncpus = sge_nprocs();
 #elif defined(ALPHA)
    {
Index: daemons/shepherd/setrlimits.c
===================================================================
RCS file: /cvs/gridengine/source/daemons/shepherd/setrlimits.c,v
retrieving revision 1.4.2.7
diff -u -r1.4.2.7 setrlimits.c
--- daemons/shepherd/setrlimits.c	24 Apr 2004 18:43:20 -0000	1.4.2.7
+++ daemons/shepherd/setrlimits.c	14 Jun 2004 11:20:14 -0000
@@ -404,7 +404,7 @@
       if (rlp->rlim_max < rlp->rlim_cur)
          rlp->rlim_cur = rlp->rlim_max;
 
-#if defined(ALINUX) || defined(LINUX5) || ( defined(SOLARIS) && !defined(SOLARIS64) \
) || defined(NECSX4) || defined(NECSX5) +#if defined(ALINUX) || defined(LINUX5) || ( \
defined(SOLARIS) && !defined(SOLARIS64) ) || defined(NECSX4) || defined(NECSX5) || \
defined(NETBSD_ALPHA) || defined(NETBSD_X86_64)  #  define limit_fmt "%ld"
 #elif defined(LINUX6) || defined(IRIX6) || defined(HP11) || defined(HP10) || \
defined(DARWIN) || defined(FREEBSD) || defined(NETBSD)  #  define limit_fmt "%lld"
Index: dist/util/arch
===================================================================
RCS file: /cvs/gridengine/source/dist/util/arch,v
retrieving revision 1.7.2.16
diff -u -r1.7.2.16 arch
--- dist/util/arch	24 Apr 2004 18:13:52 -0000	1.7.2.16
+++ dist/util/arch	14 Jun 2004 11:20:14 -0000
@@ -55,6 +55,7 @@
 if [ -x /usr/bin/uname ]; then
    os="`/usr/bin/uname -s`"
    ht="`/usr/bin/uname -m`"
+   ha="`/usr/bin/uname -p`"
    osht="$os,$ht"
    case $osht in
    Darwin,*)
@@ -64,7 +65,7 @@
       ARCH=fbsd-$ht
       ;;
    NetBSD,*)
-      ARCH=nbsd-$ht
+      ARCH=nbsd-$ha
       ;;
    esac
 fi



[prev in list] [next in list] [prev in thread] [next in thread]