authenticatedChannelFactory use eventscheduler from application

Signed-off-by: Emelia Lei <[email protected]>

Author: emelialei88

src/groups/bmq/bmqimp/bmqimp_application.cpp

@@ -606,10 +606,12 @@ Application::Application(
       allocator)
 , d_authenticatedChannelFactory(
       AuthenticatedChannelFactoryConfig(&d_statChannelFactory,
+                                        &d_scheduler,
                                         sessionOptions.authnCredentialCb(),
                                         sessionOptions.connectTimeout(),
                                         d_blobSpPool_sp.get(),
-                                        allocator))
+                                        allocator),
+      allocator)
 , d_negotiatedChannelFactory(
       NegotiatedChannelFactoryConfig(&d_authenticatedChannelFactory,
                                      negotiationMessage,

src/groups/bmq/bmqimp/bmqimp_authenticatedchannelfactory.cpp

@@ -73,24 +73,29 @@ enum RcEnum {
 
 AuthenticatedChannelFactoryConfig::AuthenticatedChannelFactoryConfig(
     bmqio::ChannelFactory*    base,
+    bdlmt::EventScheduler*    scheduler,
     AuthnCredentialCb         authnCredentialCb,
     const bsls::TimeInterval& authenticationTimeout,
     BlobSpPool*               blobSpPool_p,
     bslma::Allocator*         basicAllocator)
 : d_baseFactory_p(base)
+, d_scheduler_p(scheduler)
 , d_authnCredentialCb(authnCredentialCb)
 , d_authenticationTimeout(authenticationTimeout)
 , d_blobSpPool_p(blobSpPool_p)
 , d_allocator_p(bslma::Default::allocator(basicAllocator))
 {
     // PRECONDITIONS
     BSLS_ASSERT(base);
+    BSLS_ASSERT_SAFE(d_scheduler_p->clockType() ==
+                     bsls::SystemClockType::e_MONOTONIC);
 }
 
 AuthenticatedChannelFactoryConfig::AuthenticatedChannelFactoryConfig(
     const AuthenticatedChannelFactoryConfig& original,
     bslma::Allocator*                        basicAllocator)
 : d_baseFactory_p(original.d_baseFactory_p)
+, d_scheduler_p(original.d_scheduler_p)
 , d_authnCredentialCb(original.d_authnCredentialCb)
 , d_authenticationTimeout(original.d_authenticationTimeout)
 , d_blobSpPool_p(original.d_blobSpPool_p)
@@ -342,8 +347,8 @@ void AuthenticatedChannelFactory::onBrokerAuthenticationResponse(
         const int intervalMs           = bsl::min(intervalMsWithRatio,
                                         intervalMsWithBuffer);
 
-        d_scheduler.scheduleRecurringEvent(
-            &d_authnEventHandle,
+        // Pening events will be cancelled when Application stops.
+        d_config.d_scheduler_p->scheduleRecurringEvent(
             bsls::TimeInterval(intervalMs),
             bdlf::BindUtil::bind(
                 bmqu::WeakMemFnUtil::weakMemFn(
@@ -361,8 +366,6 @@ AuthenticatedChannelFactory::AuthenticatedChannelFactory(
     const Config&     config,
     bslma::Allocator* basicAllocator)
 : d_config(config, basicAllocator)
-, d_scheduler(bsls::SystemClockType::e_MONOTONIC, basicAllocator)
-, d_authnEventHandle()
 , d_self(this)  // use default allocator
 {
     // NOTHING
@@ -375,22 +378,6 @@ AuthenticatedChannelFactory::~AuthenticatedChannelFactory()
     d_self.invalidate();
 }
 
-int AuthenticatedChannelFactory::start()
-{
-    int rc = d_scheduler.start();
-    if (rc != 0) {
-        BALL_LOG_ERROR << "Failed to start event scheduler [rc: " << rc << "]";
-    }
-    return rc;
-}
-
-void AuthenticatedChannelFactory::stop()
-{
-    // Cancel any scheduled reauthentication events
-    d_scheduler.cancelEvent(&d_authnEventHandle);
-    d_scheduler.stop();
-}
-
 // MANIPULATORS
 void AuthenticatedChannelFactory::listen(
     BSLA_UNUSED bmqio::Status* status,

src/groups/bmq/bmqimp/bmqimp_authenticatedchannelfactory.h

@@ -67,10 +67,15 @@ class AuthenticatedChannelFactoryConfig {
   private:
     // PRIVATE DATA
     bmqio::ChannelFactory* d_baseFactory_p;
-    AuthnCredentialCb      d_authnCredentialCb;
-    bsls::TimeInterval     d_authenticationTimeout;
-    BlobSpPool*            d_blobSpPool_p;
-    bslma::Allocator*      d_allocator_p;
+
+    /// Used to schedule events for sending reauthentication requests.
+    /// Held, not owned.
+    bdlmt::EventScheduler* d_scheduler_p;
+
+    AuthnCredentialCb  d_authnCredentialCb;
+    bsls::TimeInterval d_authenticationTimeout;
+    BlobSpPool*        d_blobSpPool_p;
+    bslma::Allocator*  d_allocator_p;
 
     // FRIENDS
     friend class AuthenticatedChannelFactory;
@@ -83,6 +88,7 @@ class AuthenticatedChannelFactoryConfig {
     // CREATORS
     AuthenticatedChannelFactoryConfig(
         bmqio::ChannelFactory*    base,
+        bdlmt::EventScheduler*    scheduler,
         AuthnCredentialCb         authnCredentialCb,
         const bsls::TimeInterval& authenticationTimeout,
         BlobSpPool*               blobSpPool_p,
@@ -118,13 +124,7 @@ class AuthenticatedChannelFactory : public bmqio::ChannelFactory {
     // PRIVATE DATA
     Config d_config;
 
-    // Used to schedule events for sending reauthentication requests.
-    bdlmt::EventScheduler d_scheduler;
-
-    // Event handle for reauthentication events.
-    EventHandle d_authnEventHandle;
-
-    // Used to make sure no callback is invoked on a destroyed object.
+    /// Used to make sure no callback is invoked on a destroyed object.
     mutable bmqu::SharedResource<AuthenticatedChannelFactory> d_self;
 
     // NOT IMPLEMENTED
@@ -176,10 +176,6 @@ class AuthenticatedChannelFactory : public bmqio::ChannelFactory {
 
   public:
     // MANIPULATORS
-    int start();
-
-    void stop();
-
     void listen(bmqio::Status*               status,
                 bslma::ManagedPtr<OpHandle>* handle,
                 const bmqio::ListenOptions&  options,