Fixes #840: removes manual reference counting

.gitignore

@@ -40,4 +40,4 @@ doc/src/examples/makefile/main
 *.pyc
 /build*
 .vscode/
-.venv/
+.venv/

framework/include/cppmicroservices/ServiceReferenceBase.h

@@ -25,6 +25,7 @@
 
 #include "cppmicroservices/Any.h"
 #include <functional>
+#include "cppmicroservices/detail/Threads.h"
 
 #include <atomic>
 #include <memory>
@@ -232,13 +233,16 @@ namespace cppmicroservices
          */
         ServiceReferenceBase();
 
-        ServiceReferenceBase(ServiceRegistrationBasePrivate* reg);
+        ServiceReferenceBase(std::shared_ptr<ServiceRegistrationBasePrivate> reg);
 
         void SetInterfaceId(std::string const& interfaceId);
 
         // This class is not thread-safe, but we support thread-safe
-        // copying and assignment.
-        std::atomic<ServiceReferenceBasePrivate*> d;
+        // copying and assignment
+        // This was changed to a std::shared_ptr and is accessed through
+        // Load(), but when this repository uses c++20,
+        // this will be changed to std::atomic<shared_ptr>
+        cppmicroservices::detail::Atomic<std::shared_ptr<ServiceReferenceBasePrivate>> d;
     };
 
     /**

framework/include/cppmicroservices/ServiceRegistrationBase.h

@@ -1,22 +1,22 @@
- /*=============================================================================
+/*=============================================================================
 
-  Library: CppMicroServices
+ Library: CppMicroServices
 
-  Copyright (c) The CppMicroServices developers. See the COPYRIGHT
-  file at the top-level directory of this distribution and at
-  https://github.com/CppMicroServices/CppMicroServices/COPYRIGHT .
+ Copyright (c) The CppMicroServices developers. See the COPYRIGHT
+ file at the top-level directory of this distribution and at
+ https://github.com/CppMicroServices/CppMicroServices/COPYRIGHT .
 
-  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
+   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.
 
 =============================================================================*/
 
@@ -30,6 +30,7 @@
 namespace cppmicroservices
 {
 
+    class RegistrationLocks;
     class BundlePrivate;
     class ServiceRegistrationBasePrivate;
     class Properties;
@@ -196,11 +197,13 @@ namespace cppmicroservices
          */
         ServiceRegistrationBase();
 
-        ServiceRegistrationBase(ServiceRegistrationBasePrivate* registrationPrivate);
+        ServiceRegistrationBase(std::shared_ptr<ServiceRegistrationBasePrivate> registrationPrivate);
 
         ServiceRegistrationBase(BundlePrivate* bundle, InterfaceMapConstPtr const& service, Properties&& props);
 
-        ServiceRegistrationBasePrivate* d { nullptr };
+        std::shared_ptr<RegistrationLocks> LockRegistration() const;
+
+        std::shared_ptr<ServiceRegistrationBasePrivate> d;
     };
 
     /**
@@ -224,7 +227,7 @@ namespace cppmicroservices
  */
 
 US_HASH_FUNCTION_BEGIN(cppmicroservices::ServiceRegistrationBase)
-return std::hash<cppmicroservices::ServiceRegistrationBasePrivate*>()(arg.d);
+return std::hash<std::shared_ptr<cppmicroservices::ServiceRegistrationBasePrivate>>()(arg.d);
 US_HASH_FUNCTION_END
 
 #endif // CPPMICROSERVICES_SERVICEREGISTRATIONBASE_H

framework/src/CMakeLists.txt

@@ -19,6 +19,7 @@ set(_srcs
   util/SharedLibrary.cpp
   util/SharedLibraryException.cpp
   util/Utils.cpp
+  util/RegistrationLocks.cpp
 
   service/ListenerToken.cpp
   service/ServiceException.cpp
@@ -34,6 +35,7 @@ set(_srcs
   service/ServiceReferenceBasePrivate.cpp
   service/ServiceRegistrationBase.cpp
   service/ServiceRegistrationBasePrivate.cpp
+  service/ServiceRegistrationCoreInfo.cpp
   service/ServiceRegistry.cpp
 
   bundle/Bundle.cpp
@@ -67,13 +69,15 @@ set(_private_headers
   util/Properties.h
   util/PropsCheck.h
   util/Utils.h
+  util/RegistrationLocks.h
 
   service/ServiceHooks.h
   service/ServiceListenerEntry.h
   service/ServiceListenerHookPrivate.h
   service/ServiceListeners.h
   service/ServiceReferenceBasePrivate.h
   service/ServiceRegistrationBasePrivate.h
+  service/ServiceRegistrationCoreInfo.h
   service/ServiceRegistry.h
 
   bundle/BundleArchive.h

framework/src/bundle/BundleContext.cpp

@@ -274,8 +274,7 @@ namespace cppmicroservices
         {
             try
             {
-                sref.d.load()->UngetService(b.lock(), true);
-                //sref.d.load()->UngetService(b.lock(), true);
+                sref.d.Load()->UngetService(b.lock(), true);
             }
             catch (...)
             {
@@ -312,7 +311,7 @@ namespace cppmicroservices
         auto b = GetAndCheckBundlePrivate(d);
 
         std::shared_ptr<ServiceHolder<void>> h(
-            new ServiceHolder<void>(b, reference, reference.d.load()->GetService(b.get())));
+            new ServiceHolder<void>(b, reference, reference.d.Load()->GetService(b.get())));
         return std::shared_ptr<void>(h, h->service.get());
     }
 
@@ -333,7 +332,7 @@ namespace cppmicroservices
         d->CheckValid();
         auto b = GetAndCheckBundlePrivate(d);
 
-        auto serviceInterfaceMap = reference.d.load()->GetServiceInterfaceMap(b.get());
+        auto serviceInterfaceMap = reference.d.Load()->GetServiceInterfaceMap(b.get());
         std::shared_ptr<ServiceHolder<InterfaceMap const>> h(
             new ServiceHolder<InterfaceMap const>(b, reference, serviceInterfaceMap));
         return InterfaceMapConstPtr(h, h->service.get());

framework/src/bundle/BundleHooks.cpp

@@ -73,8 +73,8 @@ namespace cppmicroservices
         for (auto srBaseIter = srl.rbegin(), srBaseEnd = srl.rend(); srBaseIter != srBaseEnd; ++srBaseIter)
         {
             ServiceReference<BundleFindHook> sr = srBaseIter->GetReference();
-            std::shared_ptr<BundleFindHook> fh
-                = std::static_pointer_cast<BundleFindHook>(sr.d.load()->GetService(GetPrivate(selfBundle).get()));
+            std::shared_ptr<BundleFindHook> fh = std::static_pointer_cast<BundleFindHook>(
+                sr.d.Load()->GetService(GetPrivate(selfBundle).get()));
             if (fh)
             {
                 try
@@ -139,7 +139,7 @@ namespace cppmicroservices
                 }
 
                 std::shared_ptr<BundleEventHook> eh = std::static_pointer_cast<BundleEventHook>(
-                    sr.d.load()->GetService(GetPrivate(GetBundleContext().GetBundle()).get()));
+                    sr.d.Load()->GetService(GetPrivate(GetBundleContext().GetBundle()).get()));
                 if (eh)
                 {
                     try

framework/src/bundle/BundlePrivate.cpp

@@ -823,7 +823,8 @@
         coreCtx->services.GetUsedByBundle(this, srs);
         for (std::vector<ServiceRegistrationBase>::const_iterator i = srs.begin(); i != srs.end(); ++i)
         {
-            i->GetReference(std::string()).d.load()->UngetService(this->shared_from_this(), false);
+            auto ref = i->GetReference(std::string());
+            ref.d.Load()->UngetService(this->shared_from_this(), false);
         }
     }
 

framework/src/service/ServiceHooks.cpp

@@ -124,8 +124,8 @@ namespace cppmicroservices
             for (auto fhrIter = srl.rbegin(), fhrEnd = srl.rend(); fhrIter != fhrEnd; ++fhrIter)
             {
                 ServiceReference<ServiceFindHook> sr = fhrIter->GetReference();
-                auto fh
-                    = std::static_pointer_cast<ServiceFindHook>(sr.d.load()->GetService(GetPrivate(selfBundle).get()));
+                auto fh = std::static_pointer_cast<ServiceFindHook>(
+                    sr.d.Load()->GetService(GetPrivate(selfBundle).get()));
                 if (fh)
                 {
                     try
@@ -177,7 +177,7 @@ namespace cppmicroservices
             {
                 ServiceReference<ServiceEventListenerHook> sr = sriIter->GetReference();
                 auto elh = std::static_pointer_cast<ServiceEventListenerHook>(
-                    sr.d.load()->GetService(GetPrivate(selfBundle).get()));
+                    sr.d.Load()->GetService(GetPrivate(selfBundle).get()));
                 if (elh)
                 {
                     try

framework/src/service/ServiceListeners.cpp

@@ -460,7 +460,7 @@ namespace cppmicroservices
         // Get a copy of the service reference and keep it until we are
         // done with its properties.
         auto ref = evt.GetServiceReference();
-        auto props = ref.d.load()->GetProperties();
+        auto props = ref.d.Load()->GetProperties();
 
         {
             auto l = this->Lock();

framework/src/service/ServiceObjects.cpp

@@ -60,11 +60,11 @@ namespace cppmicroservices
 
             if (isPrototypeScope)
             {
-                result = m_reference.d.load()->GetPrototypeService(MakeBundleContext(m_context).GetBundle());
+                result = m_reference.d.Load()->GetPrototypeService(MakeBundleContext(m_context).GetBundle());
             }
             else
             {
-                result = m_reference.d.load()->GetServiceInterfaceMap(
+                result = m_reference.d.Load()->GetServiceInterfaceMap(
                     GetPrivate(MakeBundleContext(m_context).GetBundle()).get());
             }
 
@@ -115,11 +115,11 @@ namespace cppmicroservices
 
                     if (isPrototypeScope)
                     {
-                        sref.d.load()->UngetPrototypeService(bundle, interfaceMap);
+                        sref.d.Load()->UngetPrototypeService(bundle, interfaceMap);
                     }
                     else
                     {
-                        sref.d.load()->UngetService(bundle, true);
+                        sref.d.Load()->UngetService(bundle, true);
                     }
                 }
             }