remove ifdefs from BundleRegistry, abide by rule of (0,3,5), and add …

…comments
CppMicroServices · May 18, 2023 · c602217 · c602217
1 parent f957cd8
commit c602217
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/framework/src/bundle/BundleRegistry.cpp b/framework/src/bundle/BundleRegistry.cpp
@@ -249,10 +249,8 @@ namespace cppmicroservices
                 {
                     // Wait for the install thread to notify this thread that it is safe
                     // to install the current bundle
-                    l.UnLock();
-#ifdef US_ENABLE_THREADING_SUPPORT
                     auto& p = initialBundleInstallMap[location];
-
+                    l.UnLock();
                     std::unique_lock<std::mutex> lock(*(p.second.m));
 
                     // This while loop exists to prevent a known race condition. If the installing thread notifies
@@ -262,7 +260,6 @@ namespace cppmicroservices
                     // is reached, wait_for exits and the statement is re-evaluated since it would have returned false.
                     while (!p.second.cv->wait_for(lock, 0.1ms, [&p] { return !p.second.waitFlag; }))
                         ;
-#endif
                 }
 
                 // Re-acquire the range because while this thread was waiting, the installing

diff --git a/framework/src/service/ServiceRegistrationCoreInfo.h b/framework/src/service/ServiceRegistrationCoreInfo.h
@@ -38,13 +38,16 @@ namespace cppmicroservices
     /**
      * \ingroup MicroServices
      */
-    class ServiceRegistrationCoreInfo : public detail::MultiThreaded<>
+    class ServiceRegistrationCoreInfo final: public detail::MultiThreaded<>
     {
 
       public:
         ServiceRegistrationCoreInfo(BundlePrivate* bundle, InterfaceMapConstPtr service, Properties&& props);
         ~ServiceRegistrationCoreInfo() = default;
 
+        ServiceRegistrationCoreInfo(ServiceRegistrationCoreInfo &&) = delete;
+        ServiceRegistrationCoreInfo& operator=(ServiceRegistrationCoreInfo &&) = delete;
+
         ServiceRegistrationCoreInfo(ServiceRegistrationCoreInfo const&) = delete;
         ServiceRegistrationCoreInfo& operator=(ServiceRegistrationCoreInfo const&) = delete;
 

diff --git a/framework/src/util/ServiceRegistrationLocks.h b/framework/src/util/ServiceRegistrationLocks.h
@@ -32,14 +32,12 @@ namespace cppmicroservices
      *
      * This is an RAII object, construct it in scope and when it goes out of scope the locks will be released.
      */
-    class ServiceRegistrationLocks
+    class ServiceRegistrationLocks final
     {
       public:
         ServiceRegistrationLocks(std::shared_ptr<ServiceRegistrationBasePrivate> reg,
                                  std::shared_ptr<ServiceRegistrationCoreInfo> coreInfo);
 
-        ~ServiceRegistrationLocks() = default;
-
       private:
         cppmicroservices::detail::MutexLockingStrategy<>::UniqueLock coreInfoL;
         cppmicroservices::detail::MutexLockingStrategy<>::UniqueLock regL;