xrootd · simonmichal · Dec 7, 2020 · Nov 24, 2020
diff --git a/cmake/XRootDFindLibs.cmake b/cmake/XRootDFindLibs.cmake
@@ -54,7 +54,7 @@ if( ENABLE_KRB5 )
 endif()
 
 # mac fuse not supported
-if( ENABLE_FUSE AND Linux )
+if( ENABLE_FUSE AND LINUX )
   find_package( fuse )
   if( FUSE_FOUND )
     add_definitions( -DHAVE_FUSE )
@@ -111,7 +111,7 @@ else()
   set( BUILD_SCITOKENS FALSE )
 endif()
 
-if( ENABLE_PYTHON AND (Linux OR APPLE) )
+if( ENABLE_PYTHON AND (LINUX OR Hurd OR MacOSX) )
   find_package( PythonInterp ${XRD_PYTHON_REQ_VERSION} )
   find_package( PythonLibs ${XRD_PYTHON_REQ_VERSION} )
   if( PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND )
@@ -122,7 +122,7 @@ if( ENABLE_PYTHON AND (Linux OR APPLE) )
   endif()
 endif()
 
-if( ENABLE_VOMS AND Linux )
+if( ENABLE_VOMS AND (LINUX OR Hurd) )
   find_package( VOMS )
   if( VOMS_FOUND )
     set( BUILD_VOMS TRUE )

diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
@@ -4,7 +4,8 @@
 
 include( CheckCXXSourceRuns )
 
-set( Linux    FALSE )
+set( LINUX    FALSE )
+set( Hurd     FALSE )
 set( MacOSX   FALSE )
 set( Solaris  FALSE )
 
@@ -77,9 +78,17 @@ endif()
 # Linux
 #-------------------------------------------------------------------------------
 if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
-  set( Linux TRUE )
+  set( LINUX TRUE )
+  include( GNUInstallDirs )
+  set( EXTRA_LIBS rt )
+endif()
+
+#-------------------------------------------------------------------------------
+# GNU/Hurd
+#-------------------------------------------------------------------------------
+if( ${CMAKE_SYSTEM_NAME} STREQUAL "GNU" )
+  set( Hurd TRUE )
   include( GNUInstallDirs )
-  add_definitions( -D__linux__=1 )
   set( EXTRA_LIBS rt )
 endif()
 
@@ -97,7 +106,6 @@ if( APPLE )
   # this is here because of Apple deprecating openssl and krb5
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations" )
 
-  add_definitions( -D__macos__=1 )
   add_definitions( -DLT_MODULE_EXT=".dylib" )
   set( CMAKE_INSTALL_LIBDIR "lib" )
   set( CMAKE_INSTALL_BINDIR "bin" )

diff --git a/src/XProtocol/XProtocol.hh b/src/XProtocol/XProtocol.hh
@@ -1284,10 +1284,8 @@ struct ALIGN_CHECK {char chkszreq[25-sizeof(ClientRequest)];
 #endif
 
 #ifndef EBADRQC
-#if defined(__APPLE__)
 #define EBADRQC EBADRPC
 #endif
-#endif
 
 #ifndef EAUTH
 #define EAUTH EBADE

diff --git a/src/Xrd/XrdConfig.cc b/src/Xrd/XrdConfig.cc
@@ -88,7 +88,7 @@
 #include "XrdTls/XrdTls.hh"
 #include "XrdTls/XrdTlsContext.hh"
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU__)
 #include <netinet/tcp.h>
 #endif
 #ifdef __APPLE__
@@ -1143,7 +1143,7 @@ int XrdConfig::setFDL()
 
 // The scheduler will have already set the thread limit. We just report it
 //
-#if defined(__linux__) && defined(RLIMIT_NPROC)
+#if ( defined(__linux__) || defined(__GNU__) ) && defined(RLIMIT_NPROC)
 
 // Obtain the actual limit now (Scheduler construction sets this to rlim_max)
 //
@@ -1177,7 +1177,7 @@ int XrdConfig::Setup(char *dfltp, char *libProt)
 
 // Special handling for Linux sendfile()
 //
-#if defined(__linux__) && defined(TCP_CORK)
+#if ( defined(__linux__) || defined(__GNU__) ) && defined(TCP_CORK)
 {  int sokFD, setON = 1;
    if ((sokFD = socket(PF_INET, SOCK_STREAM, 0)) >= 0)
       {setsockopt(sokFD, XrdNetUtils::ProtoID("tcp"), TCP_NODELAY,

diff --git a/src/Xrd/XrdLink.cc b/src/Xrd/XrdLink.cc
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU__)
 #include <netinet/tcp.h>
 #if !defined(TCP_CORK)
 #undef HAVE_SENDFILE

diff --git a/src/Xrd/XrdLinkXeq.cc b/src/Xrd/XrdLinkXeq.cc
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU__)
 #include <netinet/tcp.h>
 #if !defined(TCP_CORK)
 #undef HAVE_SENDFILE
@@ -79,12 +79,6 @@ extern XrdScheduler   Sched;
 extern XrdTlsContext *tlsCtx;
        XrdTcpMonPin  *TcpMonPin = 0;
 extern int            devNull;
-
-#ifdef IOV_MAX
-       int            maxIOV = IOV_MAX;
-#else
-       int            maxIOV = sysconf(_SC_IOV_MAX);
-#endif
 };
 
 using namespace XrdGlobal;
@@ -554,6 +548,18 @@ int XrdLinkXeq::Send(const char *Buff, int Blen)
 int XrdLinkXeq::Send(const struct iovec *iov, int iocnt, int bytes)
 {
    int retc;
+   static int maxIOV = -1;
+   if (maxIOV == -1) {
+#ifdef _SC_IOV_MAX
+      maxIOV = sysconf(_SC_IOV_MAX);
+      if (maxIOV == -1)
+#endif
+#ifdef IOV_MAX
+         maxIOV = IOV_MAX;
+#else
+         maxIOV = 1024;
+#endif
+   }
 
 // Get a lock and assume we will be successful (statistically we are)
 //
@@ -668,7 +674,7 @@ do{retc = sendfilev(LinkInfo.FD, vecSFP, sfN, &xframt);
    Log.Emsg("Link", retc, "send file to", ID);
    return -1;
 
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__GNU__)
 
    static const int setON = 1, setOFF = 0;
    ssize_t retc = 0, bytesleft;

diff --git a/src/Xrd/XrdScheduler.cc b/src/Xrd/XrdScheduler.cc
@@ -107,7 +107,7 @@ XrdScheduler::XrdScheduler(XrdSysError *eP, XrdOucTrace *tP,
 
 // Make sure we are using the maximum number of threads allowed (Linux only)
 //
-#if defined(__linux__) && defined(RLIMIT_NPROC)
+#if ( defined(__linux__) || defined(__GNU__) ) && defined(RLIMIT_NPROC)
 
    struct rlimit rlim;
 
@@ -165,7 +165,7 @@ XrdScheduler::XrdScheduler(int minw, int maxw, int maxi)
 
 // Get a file descriptor mirroring standard error
 //
-#if defined(__linux__) && defined(O_CLOEXEC)
+#if ( defined(__linux__) || defined(__GNU__) ) && defined(F_DUPFD_CLOEXEC)
    eFD = fcntl(STDERR_FILENO, F_DUPFD_CLOEXEC, 0);
 #else
    eFD = dup(STDERR_FILENO);

diff --git a/src/XrdAcc/XrdAccAuthFile.hh b/src/XrdAcc/XrdAccAuthFile.hh
@@ -34,6 +34,7 @@
 #include <netdb.h>
 #include <sys/param.h>
 #include "XrdSys/XrdSysError.hh"
+#include "XrdSys/XrdSysPlatform.hh"
 #include "XrdSys/XrdSysPthread.hh"
 #include "XrdOuc/XrdOucStream.hh"
 #include "XrdAcc/XrdAccAuthDB.hh"
@@ -75,6 +76,6 @@ time_t            modtime;
 XrdSysMutex       DBcontext;
 
 char recname_buff[MAXHOSTNAMELEN+1];   // Max record name by default
-char path_buff[PATH_MAX+2];          // Max path   name
+char path_buff[MAXPATHLEN+2];          // Max path   name
 };
 #endif
diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 
 #include "XrdSys/XrdSysHeaders.hh"
+#include "XrdSys/XrdSysPlatform.hh"
 #include "XrdSys/XrdSysPwd.hh"
 #include "XrdAcc/XrdAccCapability.hh"
 #include "XrdAcc/XrdAccGroups.hh"

diff --git a/src/XrdApps/Xrdadler32.cc b/src/XrdApps/Xrdadler32.cc
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU__)
   #include <sys/xattr.h>
 #endif
 #include <zlib.h>
@@ -71,7 +71,7 @@ void fSetXattrAdler32(const char *path, int fd, const char* attr, char *value)
 
 // Remove any old attribute at this point
 //
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GNU__)
     fremovexattr(fd, attr);
 #elif defined(__solaris__)
     int attrfd;
@@ -90,7 +90,7 @@ int fGetXattrAdler32(int fd, const char* attr, char *value)
     if (fstat(fd, &st)) return 0;
     sprintf(mtime, "%ld", st.st_mtime);
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GNU__)
     rc = fgetxattr(fd, attr, attr_val, 25);
 #elif defined(__solaris__)
     int attrfd;

diff --git a/src/XrdCks/XrdCksConfig.cc b/src/XrdCks/XrdCksConfig.cc
@@ -46,6 +46,7 @@
 #include "XrdOuc/XrdOucStream.hh"
 #include "XrdOuc/XrdOucUtils.hh"
 #include "XrdSys/XrdSysError.hh"
+#include "XrdSys/XrdSysPlatform.hh"
 #include "XrdSys/XrdSysPlugin.hh"
 
 /******************************************************************************/

diff --git a/src/XrdCks/XrdCksManOss.cc b/src/XrdCks/XrdCksManOss.cc
@@ -43,6 +43,7 @@
 #include "XrdOss/XrdOss.hh"
 #include "XrdOuc/XrdOucEnv.hh"
 #include "XrdSys/XrdSysError.hh"
+#include "XrdSys/XrdSysPlatform.hh"
 
 /******************************************************************************/
 /*                         L o c a l   S t a t i c s                          */

diff --git a/src/XrdCks/XrdCksManager.cc b/src/XrdCks/XrdCksManager.cc
@@ -179,6 +179,8 @@ int XrdCksManager::Calc(const char *Pfn, time_t &MTime, XrdCksCalc *csP)
         {if ((inBuff = (char *)mmap(0, ioSize, PROT_READ, 
 #if defined(__FreeBSD__)
                        MAP_RESERVED0040|MAP_PRIVATE, In.FD, Offset)) == MAP_FAILED)
+#elif defined(__GNU__)
+                       MAP_PRIVATE, In.FD, Offset)) == MAP_FAILED)
 #else
                        MAP_NORESERVE|MAP_PRIVATE, In.FD, Offset)) == MAP_FAILED)
 #endif

diff --git a/src/XrdCl/XrdClAsyncSocketHandler.cc b/src/XrdCl/XrdClAsyncSocketHandler.cc
@@ -119,7 +119,7 @@ namespace XrdCl
         log->Error( AsyncSockMsg, "[%s] Unable to turn on keepalive: %s",
                     st.ToString().c_str() );
 
-#if defined(__linux__) && defined( TCP_KEEPIDLE ) && \
+#if ( defined(__linux__) || defined(__GNU__) ) && defined( TCP_KEEPIDLE ) && \
     defined( TCP_KEEPINTVL ) && defined( TCP_KEEPCNT )
 
       param = DefaultTCPKeepAliveTime;

diff --git a/src/XrdCl/XrdClSocket.cc b/src/XrdCl/XrdClSocket.cc
@@ -463,7 +463,7 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     // We use send with MSG_NOSIGNAL to avoid SIGPIPEs on Linux
     //--------------------------------------------------------------------------
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU__)
     int status = ::send( pSocket, buffer, size, MSG_NOSIGNAL );
 #else
     int status = ::write( pSocket, buffer, size );

diff --git a/src/XrdCl/XrdClTaskManager.cc b/src/XrdCl/XrdClTaskManager.cc
@@ -242,6 +242,7 @@ namespace XrdCl
       // Enable the cancelation and go to sleep
       //------------------------------------------------------------------------
       pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, 0 );
+      pthread_testcancel();
       XrdSysTimer::Wait( pResolution*1000 );
     }
   }

diff --git a/src/XrdClient/XrdClientSock.cc b/src/XrdClient/XrdClientSock.cc
@@ -57,10 +57,6 @@
 #include "XrdSys/XrdWin32.hh"
 #endif
 
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#endif
-
 #if __cplusplus >= 201103L
 #define XRDCL_SMART_PTR_T std::unique_ptr
 #else
@@ -460,7 +456,8 @@ int XrdClientSock::TryConnect_low(bool isUnix, int altport, int windowsz)
       if( XrdNetSocket::setOpts( sock, XRDNET_KEEPALIVE, 0 ) != 0 )
         Error( "ClientSock::TryConnect_low", "Unable to set the TCP Keep Alive option" );
 
-#if defined(__linux__) && defined( TCP_KEEPIDLE ) && defined( TCP_KEEPINTVL ) && defined( TCP_KEEPCNT )
+#if ( defined(__linux__) || defined(__GNU__) ) && defined( TCP_KEEPIDLE ) && \
+    defined( TCP_KEEPINTVL ) && defined( TCP_KEEPCNT )
 
       int val = EnvGetLong( NAME_TCP_KEEPALIVE_TIME );
       if( setsockopt( sock, SOL_TCP, TCP_KEEPIDLE, (char *)&val, sizeof( val ) ) < 0 )

diff --git a/src/XrdCms/XrdCmsLogin.cc b/src/XrdCms/XrdCmsLogin.cc
@@ -29,6 +29,7 @@
 /******************************************************************************/
 
 #include <netinet/in.h>
+#include <unistd.h>
 
 #include "XProtocol/YProtocol.hh"
 
@@ -210,6 +211,18 @@ int XrdCmsLogin::sendData(XrdLink *Link, CmsLoginData &Data)
    char         Work[xNum*12];
    struct iovec Liov[xNum];
    CmsRRHdr     Resp={0, kYR_login, 0, 0};
+   static int   iovmax = -1;
+   if (iovmax == -1) {
+#ifdef _SC_IOV_MAX
+      iovmax = sysconf(_SC_IOV_MAX);
+      if (iovmax == -1)
+#endif
+#ifdef IOV_MAX
+         iovmax = IOV_MAX;
+#else
+         iovmax = 1024;
+#endif
+   }
 
 // Pack the response (ignore the auth token for now)
 //
@@ -225,11 +238,11 @@ int XrdCmsLogin::sendData(XrdLink *Link, CmsLoginData &Data)
 // Send off the data *break it up to IOV_MAX chunks, mostly for Solaris)
 //
    n = 0; iovcnt++;
-   if (iovcnt <= IOV_MAX) Link->Send(Liov, iovcnt);
+   if (iovcnt <= iovmax) Link->Send(Liov, iovcnt);
       else while(iovcnt > 0)
-                {iovnum = (iovcnt > IOV_MAX ? IOV_MAX : iovcnt);
+                {iovnum = (iovcnt > iovmax ? iovmax : iovcnt);
                  Link->Send(&Liov[n], iovnum);
-                 n += IOV_MAX; iovcnt -= IOV_MAX;
+                 n += iovmax; iovcnt -= iovmax;
                 }
 
 // Return success

diff --git a/src/XrdDig/XrdDigFS.cc b/src/XrdDig/XrdDigFS.cc
@@ -239,7 +239,7 @@ const char *XrdDigDirectory::nextEntry()
 
 // Read the next directory entry
 //
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU__)
 do{errno = 0;
    rp = readdir(dh);
    if (!rp)

diff --git a/src/XrdFrm/XrdFrmAdmin.cc b/src/XrdFrm/XrdFrmAdmin.cc
@@ -52,6 +52,7 @@
 #include "XrdOuc/XrdOucTList.hh"
 #include "XrdOuc/XrdOucTokenizer.hh"
 #include "XrdSys/XrdSysE2T.hh"
+#include "XrdSys/XrdSysPlatform.hh"
 #include "XrdSys/XrdSysTimer.hh"
 
 using namespace XrdFrc;

diff --git a/src/XrdFrm/XrdFrmAdminUnlink.cc b/src/XrdFrm/XrdFrmAdminUnlink.cc
@@ -43,6 +43,7 @@
 #include "XrdOss/XrdOss.hh"
 #include "XrdOss/XrdOssPath.hh"
 #include "XrdOuc/XrdOucNSWalk.hh"
+#include "XrdSys/XrdSysPlatform.hh"
 
 using namespace XrdFrc;
 using namespace XrdFrm;

diff --git a/src/XrdFrm/XrdFrmCns.cc b/src/XrdFrm/XrdFrmCns.cc
@@ -42,6 +42,7 @@
 #include "XrdFrm/XrdFrmConfig.hh"
 #include "XrdOuc/XrdOucSxeq.hh"
 #include "XrdOuc/XrdOucUtils.hh"
+#include "XrdSys/XrdSysPlatform.hh"
 #include "XrdSys/XrdSysPthread.hh"
 #include "XrdSys/XrdSysTimer.hh"
 

diff --git a/src/XrdFrm/XrdFrmXfrJob.hh b/src/XrdFrm/XrdFrmXfrJob.hh
@@ -32,6 +32,7 @@
 
 #include <sys/param.h>
 #include "XrdFrc/XrdFrcRequest.hh"
+#include "XrdSys/XrdSysPlatform.hh"
 
 class XrdFrcReqFile;
 class XrdOucTList;