uni15_test(1) works for backlog and new files

Author: semmerson

CMakeLists.txt

@@ -107,5 +107,5 @@ set(CPACK_GENERATOR DEB STGZ RPM) # RPM needs yum(1)-compatible UPC software rep
 include(CPack)
 
 # Configure deployment and testing
-configure_file(deploy.sh deploy)
-configure_file(uni15-test.sh uni15-test)
+configure_file(deploy.sh deploy @ONLY)
+configure_file(uni15-test.sh uni15-test @ONLY)

main/BicastProto.cpp

@@ -23,6 +23,7 @@
 #include "BicastProto.h"
 
 #include "error.h"
+#include "logging.h"
 #include "Xprt.h"
 
 #include <chrono>
@@ -157,11 +158,13 @@ class ProdIdSet::Impl
      * @retval    false    Connection lost
      */
     bool write(Xprt& xprt) const {
-        if (!xprt.write(static_cast<uint32_t>(prodIds.size())))
+        uint32_t size = prodIds.size();
+        if (!xprt.write(size))
             return false;
-        for (auto iter = prodIds.begin(), end = prodIds.end(); iter != end; ++iter)
+        for (auto iter = prodIds.begin(), end = prodIds.end(); iter != end; ++iter, --size)
             if (!iter->write(xprt))
                 return false;
+        LOG_ASSERT(size == 0);
         return true;
     }
 
@@ -177,7 +180,7 @@ class ProdIdSet::Impl
             return false;
         prodIds.clear();
         prodIds.reserve(size);
-        for (uint32_t i; i < size; ++i) {
+        while (size--) {
             ProdId prodId;
             if (!prodId.read(xprt))
                 return false;

main/BicastProto.h

@@ -468,22 +468,6 @@ class DataSeg final : public XprtAble
     std::shared_ptr<Impl> pImpl;
 
 public:
-    /**
-     * Sets the maximum size of a data-segment.
-     *
-     * @param[in] maxSegSize       Maximum data-segment size in bytes
-     * @return                     Previous value
-     * @throw     InvalidArgument  Argument is not positive
-     */
-    static SegSize setMaxSegSize(const SegSize maxSegSize) noexcept;
-
-    /**
-     * Gets the maximum size of a data-segment.
-     *
-     * @return  Maximum size of a data-segment in bytes
-     */
-    static SegSize getMaxSegSize() noexcept;
-
     /**
      * Returns the size of a given data-segment.
      *

main/inet/Xprt.cpp

@@ -37,7 +37,7 @@ namespace bicast {
 /// An implementation of a transport
 class Xprt::Impl
 {
-    const Socket              sock;              ///< Underlying socket
+    const Socket  sock;  ///< Underlying socket
 
     inline bool hton(const bool value) {
         return value;

main/node/Node.cpp

@@ -436,9 +436,7 @@ class PubNodeImpl final : public PubNode, public NodeImpl
         , repo(FileUtil::pathname(RunPar::pubRoot, "products"), lastTransmission->recall())
         , maxSegSize{RunPar::maxSegSize}
         , senderThread()
-    {
-        DataSeg::setMaxSegSize(maxSegSize);
-    }
+    {}
 
     ~PubNodeImpl() noexcept {
         //LOG_DEBUG("Publisher-node being destroyed");
@@ -676,7 +674,7 @@ class SubNodeImpl final : public SubNode, public NodeImpl
         , mcastSub{McastSub::create(subInfo.mcast.dstAddr, subInfo.mcast.srcAddr, this)}
         , client(client)
     {
-        DataSeg::setMaxSegSize(subInfo.maxSegSize);
+        RunPar::maxSegSize = subInfo.maxSegSize;
     }
 
     ~SubNodeImpl() noexcept {

main/p2p/DataSeg.cpp

@@ -4,25 +4,24 @@
  *  @file:  DataSeg.cpp
  * @author: Steven R. Emmerson <[email protected]>
  *
- *    Copyright 2021 University Corporation for Atmospheric Research
+ *    Copyright 2023 University Corporation for Atmospheric Research
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 #include "config.h"
 
 #include "BicastProto.h"
 #include "error.h"
+#include "RunPar.h"
 #include "Socket.h"
 #include "Xprt.h"
 
@@ -34,37 +33,13 @@ namespace bicast {
 /// An implementation of a data segment
 class DataSeg::Impl
 {
-    static std::atomic<SegSize> maxSegSize; ///< Maximum data-segment size in bytes
-
 public:
     DataSegId   segId;    ///< Data-segment identifier
     /// Product size in bytes (for when product notice is missed)
     ProdSize    prodSize;
     SegSize     bufSize;  ///< Size of buffer in bytes
     char*       buf;      ///< buffer for data
 
-    /**
-     * Sets the maximum size, in bytes, of a data segment. All segments except the last will be this
-     * size.
-     * @param[in] maxSegSize  Maximum size of a data segment
-     * @return                The previous maximum segment size
-     */
-    static SegSize setMaxSegSize(const SegSize maxSegSize) {
-        if (maxSegSize <= 0)
-            throw INVALID_ARGUMENT("Argument is not positive: " + std::to_string(maxSegSize));
-        SegSize prev = Impl::maxSegSize;
-        Impl::maxSegSize = maxSegSize;
-        return prev;
-    }
-
-    /**
-     * Returns the maximum size of a data segment.
-     * @return The maximum size of a data segment
-     */
-    static SegSize getMaxSegSize() {
-        return maxSegSize;
-    }
-
     /**
      * Returns the expected size of a data segment.
      * @param[in] prodSize  Size of the containing data product in bytes
@@ -75,9 +50,9 @@ class DataSeg::Impl
             const ProdSize  prodSize,
             const SegOffset offset) noexcept {
         const auto nbytes = prodSize - offset;
-        return (nbytes <= maxSegSize)
+        return (nbytes <= RunPar::maxSegSize)
                 ? nbytes
-                : static_cast<SegSize>(maxSegSize);
+                : RunPar::maxSegSize;
     }
 
     /**
@@ -86,7 +61,7 @@ class DataSeg::Impl
      * @return              The number of data segments in the product
      */
     static ProdSize numSegs(const ProdSize prodSize) noexcept {
-        return (prodSize + (maxSegSize - 1)) / maxSegSize;
+        return (prodSize + (RunPar::maxSegSize - 1)) / RunPar::maxSegSize;
     }
 
     /**
@@ -95,7 +70,7 @@ class DataSeg::Impl
      * @return            The origin-0 index of the data segment
      */
     static ProdSize getSegIndex(const ProdSize offset) {
-        return offset/maxSegSize;
+        return offset/RunPar::maxSegSize;
     }
 
     Impl()
@@ -232,18 +207,8 @@ class DataSeg::Impl
     }
 };
 
-std::atomic<SegSize> DataSeg::Impl::maxSegSize; ///< Maximum data-segment size in bytes
-
 /******************************************************************************/
 
-SegSize DataSeg::setMaxSegSize(const SegSize maxSegSize) noexcept {
-    return Impl::setMaxSegSize(maxSegSize);
-}
-
-SegSize DataSeg::getMaxSegSize() noexcept {
-    return Impl::getMaxSegSize();
-}
-
 SegSize DataSeg::size(
         const ProdSize  prodSize,
         const SegOffset offset) noexcept {