V5.7.1withceph

.github/workflows/CI.yml

@@ -89,7 +89,7 @@ jobs:
       run: |
         tests/post-install.sh
         tests/check-headers.sh
-
+        
   centos7:
     name: CentOS 7
     runs-on: ubuntu-latest
@@ -134,7 +134,6 @@ jobs:
       run: |
         source /opt/rh/devtoolset-7/enable
         su -p runner -c 'ctest3 -VV -S test.cmake'
-
   alma8:
     name: Alma 8
     runs-on: ubuntu-latest

VERSION

@@ -1 +1 @@
-$Format:%(describe)$
+v5.7.1

packaging/makesrpm.sh

@@ -124,6 +124,11 @@ echo "[i] Working with version: $VERSION"
 # Sanitize version to work with RPMs
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/
 #-------------------------------------------------------------------------------
+RELEASE=4
+if test x`echo $VERSION | grep -E $RCEXP` != x; then
+  RELEASE=0.`echo $VERSION | sed 's/.*-rc/rc/'`
+  VERSION=`echo $VERSION | sed 's/-rc.*//'`
+fi
 
 VERSION=${VERSION#v} # remove "v" prefix
 VERSION=${VERSION/-rc/~rc} # release candidates use ~ in RPMs

src/XrdCeph/CMakeLists.txt

@@ -13,10 +13,14 @@ else()
   endif()
 endif()
 
+include_directories( ${RADOS_INCLUDE_DIR} )
+
 set(BUILD_CEPH TRUE CACHE BOOL INTERNAL FORCE)
 
 add_library(XrdCephPosix SHARED
-  XrdCephPosix.cc XrdCephPosix.hh)
+  XrdCephPosix.cc XrdCephPosix.hh
+  XrdCephBulkAioRead.cc XrdCephBulkAioRead.hh
+  )
 
 target_compile_options(XrdCephPosix
   PRIVATE -Wno-deprecated-declarations)
@@ -28,17 +32,29 @@ target_include_directories(XrdCephPosix
   PUBLIC ${RADOS_INCLUDE_DIR} $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>)
 
 set_target_properties(XrdCephPosix
-  PROPERTIES VERSION 0.0.1 SOVERSION 0)
+  PROPERTIES VERSION 5.7.0 SOVERSION 0)
 
 set(LIB_XRD_CEPH XrdCeph-${PLUGIN_VERSION})
 
 add_library(${LIB_XRD_CEPH} MODULE
-  XrdCephOss.cc     XrdCephOss.hh
-  XrdCephOssFile.cc XrdCephOssFile.hh
-  XrdCephOssDir.cc  XrdCephOssDir.hh)
+  XrdCephOss.cc       XrdCephOss.hh
+  XrdCephOssFile.cc   XrdCephOssFile.hh
+  XrdCephOssDir.cc    XrdCephOssDir.hh
+  XrdCephBulkAioRead.cc XrdCephBulkAioRead.hh
+  XrdCephOssBufferedFile.cc   XrdCephOssBufferedFile.hh
+  XrdCephOssReadVFile.cc   XrdCephOssReadVFile.hh
+  XrdCephBuffers/XrdCephBufferDataSimple.cc XrdCephBuffers/XrdCephBufferDataSimple.hh
+  XrdCephBuffers/XrdCephBufferAlgSimple.cc  XrdCephBuffers/XrdCephBufferAlgSimple.hh
+  XrdCephBuffers/CephIOAdapterRaw.cc  XrdCephBuffers/CephIOAdapterRaw.hh
+  XrdCephBuffers/CephIOAdapterAIORaw.cc  XrdCephBuffers/CephIOAdapterAIORaw.hh
+  XrdCephBuffers/BufferUtils.cc  XrdCephBuffers/BufferUtils.hh
+  XrdCephBuffers/XrdCephReadVNoOp.cc  XrdCephBuffers/XrdCephReadVNoOp.hh
+  XrdCephBuffers/XrdCephReadVBasic.cc  XrdCephBuffers/XrdCephReadVBasic.hh
+)
 
 target_link_libraries(${LIB_XRD_CEPH}
-  PRIVATE ${XROOTD_LIBRARIES} XrdCephPosix)
+  PRIVATE ${XROOTD_LIBRARIES} XrdCephPosix
+  )
 
 set(LIB_XRD_CEPH_XATTR XrdCephXattr-${PLUGIN_VERSION})
 

src/XrdCeph/XrdCephBuffers/BufferUtils.cc

@@ -0,0 +1,169 @@
+
+#include "BufferUtils.hh"
+#include <algorithm> // std::max
+
+using namespace XrdCephBuffer;
+
+#ifdef CEPHBUFDEBUG
+// to synchronise logging statements 
+  std::mutex cephbuf_iolock;
+#endif 
+
+// ------------------------------------------------------ //
+//         Extent       //
+
+bool Extent::in_extent(off_t pos) const
+{
+    return ((pos > begin()) && (pos < end()));
+}
+
+bool Extent::isContiguous(const Extent &rhs) const
+{
+    // does the rhs connect directly to the end of the first
+    if (end() != rhs.begin())
+        return false;
+    return true;
+}
+
+bool Extent::allInExtent(off_t pos, size_t len) const
+{
+    // is all the range in this extent
+    if ((pos < begin()) || (pos >= end()))
+        return false;
+
+    if (off_t(pos + len) > end())
+        return false;
+    return true;
+}
+bool Extent::someInExtent(off_t pos, size_t len) const
+{ // is some of the range in this extent
+    if ((off_t(pos + len) < begin()) || (pos >= end()))
+        return false;
+    return true;
+}
+
+Extent Extent::containedExtent(off_t pos, size_t len) const
+{
+    // return the subset of input range that is in this extent
+    off_t subbeg = std::max(begin(), pos);
+    off_t subend = std::min(end(), off_t(pos + len));
+
+    return Extent(subbeg, subend - subbeg);
+}
+Extent Extent::containedExtent(const Extent &rhs) const
+{
+    return containedExtent(rhs.begin(), rhs.len());
+}
+
+bool Extent::operator<(const Extent &rhs) const
+{
+    // comparison primarily on begin values
+    // use end values if begin values are equal.
+
+    if (begin() > rhs.begin()) return false;
+    if (begin() < rhs.begin()) return true;
+    if (end()   < rhs.end() )  return true;
+    return false; 
+}
+bool Extent::operator==(const Extent &rhs) const
+{
+    // equivalence based only on start and end
+    if (begin() != rhs.begin())
+        return false;
+    if (end() != rhs.end())
+        return false;
+    return true;
+}
+
+// ------------------------------------------------------ //
+//         ExtentHolder       //
+
+ExtentHolder::ExtentHolder() {}
+
+ExtentHolder::ExtentHolder(size_t elements)
+{
+    m_extents.reserve(elements);
+}
+
+ExtentHolder::ExtentHolder(const ExtentContainer &extents)
+{
+    m_extents.reserve(extents.size());
+    for (ExtentContainer::const_iterator vit = m_extents.cbegin(); vit != m_extents.cend(); ++vit) {
+        push_back(*vit);
+    }
+
+}
+ExtentHolder::~ExtentHolder()
+{
+    m_extents.clear();
+}
+
+void ExtentHolder::push_back(const Extent & in) {
+    if (size()) {
+        m_begin = std::min(m_begin, in.begin());
+        m_end   = std::max(m_end, in.end());
+    } else {
+        m_begin = in.begin();
+        m_end = in.end();
+    }
+    return m_extents.push_back(in);
+}
+
+
+
+Extent ExtentHolder::asExtent() const {
+    // if (!size()) return Extent(0,0);
+    // ExtentContainer se = getSortedExtents();
+    // off_t b = se.front().begin();
+    // off_t e = se.back().end();
+
+    return Extent(m_begin, m_end-m_begin);
+
+}
+
+size_t ExtentHolder::bytesContained() const {
+    size_t nbytes{0};
+    for (ExtentContainer::const_iterator vit = m_extents.cbegin(); vit != m_extents.cend(); ++vit) {
+        nbytes += vit->len();
+    }
+    return nbytes;
+}
+
+size_t ExtentHolder::bytesMissing() const {
+    size_t bytesUsed = bytesContained();
+    size_t totalRange = asExtent().len(); //might be expensive to call
+    return totalRange - bytesUsed;
+}   
+
+
+void ExtentHolder::sort() {
+        std::sort(m_extents.begin(), m_extents.end());
+}
+
+
+ExtentContainer ExtentHolder::getSortedExtents() const {
+    ExtentContainer v;
+    v.assign(m_extents.begin(), m_extents.end() );
+    std::sort(v.begin(), v.end());
+    return v;
+}
+
+ExtentContainer ExtentHolder::getExtents() const {
+    ExtentContainer v;
+    v.assign(m_extents.begin(), m_extents.end() );
+    return v;
+}
+
+// ------------------------------------------------------ //
+//         Timer ns       //
+
+Timer_ns::Timer_ns(long &output) : m_output_val(output)
+{
+    m_start = std::chrono::steady_clock::now();
+}
+
+Timer_ns::~Timer_ns()
+{
+    auto end = std::chrono::steady_clock::now();
+    m_output_val = std::chrono::duration_cast<std::chrono::nanoseconds>(end - m_start).count();
+}