Merge branch 'bloomberg:main' into ci-debug

src/groups/mqb/mqba/mqba_clientsession.cpp

@@ -188,6 +188,7 @@
 #include <bdld_datummapbuilder.h>
 #include <bdld_manageddatum.h>
 #include <bdlf_bind.h>
+#include <bdlf_noop.h>
 #include <bdlf_placeholder.h>
 #include <bdlma_localsequentialallocator.h>
 #include <bdlt_timeunitratio.h>
@@ -1079,7 +1080,7 @@ void ClientSession::finishCheckUnconfirmedDispatched(
             mwcu::WeakMemFnUtil::weakMemFn(&ClientSession::checkUnconfirmed,
                                            d_self.acquireWeak()),
             shutdownCtx,
-            mwcu::NoOp()));
+            bdlf::noOp));
 }
 
 void ClientSession::closeChannel()

src/groups/mqb/mqbblp/mqbblp_queue.cpp

@@ -395,9 +395,7 @@ void Queue::convertToLocalDispatched()
 
 void Queue::updateStats()
 {
-    d_state.stats()
-        .setReaderCount(d_state.handleParameters().readCount())
-        .setWriterCount(d_state.handleParameters().writeCount());
+    d_state.updateStats();
 }
 
 void Queue::listMessagesDispatched(mqbcmd::QueueResult* result,

src/groups/mqb/mqbblp/mqbblp_queuestate.cpp

@@ -132,6 +132,13 @@ QueueState::subtract(const bmqp_ctrlmsg::QueueHandleParameters& params)
     return mqbi::QueueCounts(it->second.readCount(), it->second.writeCount());
 }
 
+void QueueState::updateStats()
+{
+    stats()
+        .setReaderCount(handleParameters().readCount())
+        .setWriterCount(handleParameters().writeCount());
+}
+
 mqbi::QueueCounts QueueState::consumerAndProducerCounts(
     const bmqp_ctrlmsg::QueueHandleParameters& params) const
 {

src/groups/mqb/mqbblp/mqbblp_queuestate.h

@@ -282,6 +282,9 @@ class QueueState {
     /// Return reference to the structures for the queue engine routing.
     Routers::QueueRoutingContext& routingContext();
 
+    /// Update the stats to the current values in the handleParamaters
+    void updateStats();
+
     // ACCESSORS
 
     /// Return true if the queue has upstream parameters for the specified

src/groups/mqb/mqbblp/mqbblp_remotequeue.cpp

@@ -732,6 +732,8 @@ void RemoteQueue::onHandleReleased(
     BSLS_ASSERT_SAFE(d_state_p->queue()->dispatcher()->inDispatcherThread(
         d_state_p->queue()));
 
+    d_state_p->updateStats();
+
     mqbi::Cluster* cluster = d_state_p->domain()->cluster();
     if (result.hasNoHandleStreamConsumers()) {
         // Lost last reader for the specified subStream for the handle

src/groups/mqb/mqbnet/mqbnet_tcpsessionfactory.cpp

@@ -680,9 +680,9 @@ void TCPSessionFactory::channelStateCallback(
                            << "rejecting empty peer URI: '" << channel.get()
                            << "'";
 
-            mwcio::Status status(mwcio::StatusCategory::e_GENERIC_ERROR,
-                                 d_allocator_p);
-            channel->close(status);
+            mwcio::Status closeStatus(mwcio::StatusCategory::e_GENERIC_ERROR,
+                                      d_allocator_p);
+            channel->close(closeStatus);
         }
         else {
             // Keep track of active channels, for logging purposes
@@ -958,13 +958,6 @@ int TCPSessionFactory::start(bsl::ostream& errorDescription)
 
     int rc = 0;
 
-    const mqbcfg::AppConfig& appConfig = mqbcfg::BrokerConfig::get();
-
-    if (!appConfig.networkInterfaces().tcpInterface().value().useNtf()) {
-        BALL_LOG_WARN << "Ignoring interface property 'useNtf' (false) "
-                      << "and using ntf, because only ntf supported";
-    }
-
     ntca::InterfaceConfig interfaceConfig = ntcCreateInterfaceConfig(d_config);
 
     bslma::ManagedPtr<mwcio::NtcChannelFactory> channelFactory;

src/groups/mwc/mwcu/doc/mwcu.txt

@@ -9,7 +9,7 @@ reused through various applications.
 
 /Hierarchical Synopsis
 /---------------------
-The 'mwcu' package currently has 20 components having 2 level of physical
+The 'mwcu' package currently has 19 components having 2 level of physical
 dependency.  The list below shows the hierarchal ordering of the components.
 ..
   2. mwcu_blobiterator
@@ -22,7 +22,6 @@ dependency.  The list below shows the hierarchal ordering of the components.
      mwcu_atomicvalidator
      mwcu_blob
      mwcu_memoutstream
-     mwcu_noop
      mwcu_objectplaceholder
      mwcu_outstreamformatsaver
      mwcu_sharedresource
@@ -58,9 +57,6 @@ dependency.  The list below shows the hierarchal ordering of the components.
 : 'mwcu_objectplaceholder':
 :      Provide a placeholder for any object.
 :
-: 'mwcu_noop':
-:      Provide a no-op functor taking an arbitrary number of arguments.
-:
 : 'mwcu_operationchain':
 :      Provide a mechanism to serialize execution of async operations.
 :