From 99ac9a161087ffe8071b51ecf9e566894a19268f Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 6 May 2021 22:19:10 +0200 Subject: [PATCH] [XrdCl] Remove more ugly hack --- packaging/rhel/xrootd.spec.in | 20 +------------------- src/XrdCl/CMakeLists.txt | 1 - src/XrdCl/XrdClChannel.cc | 4 ++-- src/XrdCl/XrdClCheckSumManager.cc | 1 + src/XrdCl/XrdClClassicCopyJob.cc | 1 + src/XrdCl/XrdClCopyProcess.cc | 5 +++-- src/XrdCl/XrdClFileStateHandler.cc | 3 ++- src/XrdCl/XrdClSyncQueue.hh | 2 +- src/XrdCl/XrdClThirdPartyCopyJob.cc | 3 ++- src/XrdCl/XrdClXRootDMsgHandler.cc | 1 + src/XrdHeaders.cmake | 1 - 11 files changed, 14 insertions(+), 28 deletions(-) diff --git a/packaging/rhel/xrootd.spec.in b/packaging/rhel/xrootd.spec.in index 8a098bd1fb1..983aa9d95fd 100644 --- a/packaging/rhel/xrootd.spec.in +++ b/packaging/rhel/xrootd.spec.in @@ -3,11 +3,8 @@ #------------------------------------------------------------------------------- %if %{?rhel:1}%{!?rhel:0} # starting with rhel 7 we have systemd and macaroons, - # also glibc semaphores are fixed - %if %{rhel} >= 7 %define use_systemd 1 %define have_macaroons 1 - %define use_libc_semaphore 1 %if %{rhel} == 7 # we build both python2 and python3 bindings for EPEL7 @@ -20,15 +17,6 @@ %define python3only 1 %define python2and3 0 %endif - %else - %define use_systemd 0 - %define have_macaroons 0 - %define use_libc_semaphore 0 - # we only build python2 bindings for EPEL<=6 - %define python2only 1 - %define python3only 0 - %define python2and3 0 - %endif %else # do we have macaroons ? %if %{?fedora}%{!?fedora:0} >= 28 @@ -42,12 +30,6 @@ %else %define use_systemd 0 %endif - # can we use glibc semaphores ? - %if %{?fedora}%{!?fedora:0} >= 22 - %define use_libc_semaphore 1 - %else - %define use_libc_semaphore 0 - %endif # we only build python3 bindings for fedora %define python2only 0 %define python3only 1 @@ -609,7 +591,7 @@ cmake \ %if %{?_with_xrdclhttp:1}%{!?_with_xrdclhttp:0} -DXRDCLHTTP_SUBMODULE=TRUE \ %endif - -DUSE_LIBC_SEMAPHORE=%{use_libc_semaphore} ../ + ../ make -i VERBOSE=1 %{?_smp_mflags} popd diff --git a/src/XrdCl/CMakeLists.txt b/src/XrdCl/CMakeLists.txt index 77422295372..fe7d6e3f665 100644 --- a/src/XrdCl/CMakeLists.txt +++ b/src/XrdCl/CMakeLists.txt @@ -90,7 +90,6 @@ add_library( XrdClJobManager.cc XrdClJobManager.hh XrdClResponseJob.hh XrdClFileTimer.cc XrdClFileTimer.hh - XrdClUglyHacks.hh XrdClPlugInInterface.hh XrdClPlugInManager.cc XrdClPlugInManager.hh XrdClPropertyList.hh diff --git a/src/XrdCl/XrdClChannel.cc b/src/XrdCl/XrdClChannel.cc index a47fd24886b..fca95892294 100644 --- a/src/XrdCl/XrdClChannel.cc +++ b/src/XrdCl/XrdClChannel.cc @@ -128,7 +128,7 @@ namespace FilterHandler(const FilterHandler &other); FilterHandler &operator = (const FilterHandler &other); - XrdSysSemaphore *pSem; + XrdSysSemaphore *pSem; XrdCl::MessageFilter *pFilter; XrdCl::Message *pMsg; XrdCl::XRootDStatus pStatus; @@ -179,7 +179,7 @@ namespace StatusHandler(const StatusHandler &other); StatusHandler &operator = (const StatusHandler &other); - XrdSysSemaphore *pSem; + XrdSysSemaphore *pSem; XrdCl::XRootDStatus pStatus; XrdCl::Message *pMsg; }; diff --git a/src/XrdCl/XrdClCheckSumManager.cc b/src/XrdCl/XrdClCheckSumManager.cc index c509023cadc..473c55165ae 100644 --- a/src/XrdCl/XrdClCheckSumManager.cc +++ b/src/XrdCl/XrdClCheckSumManager.cc @@ -28,6 +28,7 @@ #include "XrdCks/XrdCksCalccrc32.hh" #include "XrdCks/XrdCksCalcadler32.hh" #include "XrdSys/XrdSysE2T.hh" +#include "XrdSys/XrdSysPthread.hh" #include "XrdVersion.hh" #include diff --git a/src/XrdCl/XrdClClassicCopyJob.cc b/src/XrdCl/XrdClClassicCopyJob.cc index 87ea25796e7..e50712e1e53 100644 --- a/src/XrdCl/XrdClClassicCopyJob.cc +++ b/src/XrdCl/XrdClClassicCopyJob.cc @@ -38,6 +38,7 @@ #include "XrdCl/XrdClXRootDTransport.hh" #include "XrdClXCpCtx.hh" #include "XrdSys/XrdSysE2T.hh" +#include "XrdSys/XrdSysPthread.hh" #include #include diff --git a/src/XrdCl/XrdClCopyProcess.cc b/src/XrdCl/XrdClCopyProcess.cc index 8054e3bff71..3827980e8af 100644 --- a/src/XrdCl/XrdClCopyProcess.cc +++ b/src/XrdCl/XrdClCopyProcess.cc @@ -35,6 +35,7 @@ #include "XrdCl/XrdClJobManager.hh" #include "XrdCl/XrdClRedirectorRegistry.hh" #include "XrdCl/XrdClConstants.hh" +#include "XrdSys/XrdSysPthread.hh" #include @@ -50,7 +51,7 @@ namespace XrdCl::CopyProgressHandler *progress, uint16_t currentJob, uint16_t totalJobs, - XrdSysSemaphore *sem = 0 ): + XrdSysSemaphore *sem = 0 ): pJob(job), pProgress(progress), pCurrentJob(currentJob), pTotalJobs(totalJobs), pSem(sem), pRetryCnt( XrdCl::DefaultRetryWrtAtLBLimit ) @@ -162,7 +163,7 @@ namespace XrdCl::CopyProgressHandler *pProgress; uint16_t pCurrentJob; uint16_t pTotalJobs; - XrdSysSemaphore *pSem; + XrdSysSemaphore *pSem; int pRetryCnt; }; }; diff --git a/src/XrdCl/XrdClFileStateHandler.cc b/src/XrdCl/XrdClFileStateHandler.cc index 8224aea5e8e..c4324d00fba 100644 --- a/src/XrdCl/XrdClFileStateHandler.cc +++ b/src/XrdCl/XrdClFileStateHandler.cc @@ -44,8 +44,9 @@ #include "XrdOuc/XrdOucCRC.hh" -#include "XrdSys/XrdSysPageSize.hh" #include "XrdSys/XrdSysKernelBuffer.hh" +#include "XrdSys/XrdSysPageSize.hh" +#include "XrdSys/XrdSysPthread.hh" #include #include diff --git a/src/XrdCl/XrdClSyncQueue.hh b/src/XrdCl/XrdClSyncQueue.hh index b0c8cf2cec7..8f6e3c68c97 100644 --- a/src/XrdCl/XrdClSyncQueue.hh +++ b/src/XrdCl/XrdClSyncQueue.hh @@ -99,7 +99,7 @@ namespace XrdCl protected: std::queue pQueue; XrdSysMutex pMutex; - XrdSysSemaphore *pSem; + XrdSysSemaphore *pSem; }; } diff --git a/src/XrdCl/XrdClThirdPartyCopyJob.cc b/src/XrdCl/XrdClThirdPartyCopyJob.cc index b7ce44cb186..442459ac64a 100644 --- a/src/XrdCl/XrdClThirdPartyCopyJob.cc +++ b/src/XrdCl/XrdClThirdPartyCopyJob.cc @@ -32,6 +32,7 @@ #include "XrdCl/XrdClRedirectorRegistry.hh" #include "XrdCl/XrdClDlgEnv.hh" #include "XrdOuc/XrdOucTPC.hh" +#include "XrdSys/XrdSysPthread.hh" #include "XrdSys/XrdSysTimer.hh" #include @@ -700,7 +701,7 @@ namespace XrdCl // Do the copy and follow progress //-------------------------------------------------------------------------- TPCStatusHandler statusHandler; - XrdSysSemaphore *sem = statusHandler.GetXrdSysSemaphore(); + XrdSysSemaphore *sem = statusHandler.GetXrdSysSemaphore(); StatInfo *info = 0; uint16_t tpcTimeout = 0; diff --git a/src/XrdCl/XrdClXRootDMsgHandler.cc b/src/XrdCl/XrdClXRootDMsgHandler.cc index 7447a424cfa..df057a15289 100644 --- a/src/XrdCl/XrdClXRootDMsgHandler.cc +++ b/src/XrdCl/XrdClXRootDMsgHandler.cc @@ -43,6 +43,7 @@ #include "XrdSys/XrdSysPlatform.hh" // same as above #include "XrdSys/XrdSysAtomics.hh" +#include "XrdSys/XrdSysPthread.hh" #include #include #include diff --git a/src/XrdHeaders.cmake b/src/XrdHeaders.cmake index 80e59d392c3..a011ec0343a 100644 --- a/src/XrdHeaders.cmake +++ b/src/XrdHeaders.cmake @@ -62,7 +62,6 @@ set( XROOTD_PUBLIC_HEADERS XrdSys/XrdSysError.hh XrdSys/XrdSysFD.hh XrdSys/XrdSysHeaders.hh - XrdSys/XrdSysLinuxSemaphore.hh XrdSys/XrdSysLogger.hh XrdSys/XrdSysLogPI.hh XrdSys/XrdSysPageSize.hh