Replace C++ CountDownLatch with std::promise

zeroc-ice · Feb 26, 2024 · 732fd08 · 732fd08
1 parent 885ad85
commit 732fd08
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 262 deletions.
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -5,7 +5,6 @@
 #include <Glacier2/SessionHelper.h>
 
 #include <IceUtil/IceUtil.h>
-#include <IceUtil/CountDownLatch.h>
 #include <Ice/Ice.h>
 
 #include <algorithm> // required by max
@@ -683,48 +682,21 @@ SessionHelperI::dispatchCallback(const Ice::DispatcherCallPtr& call, const Ice::
     }
 }
 
-namespace
-{
-
-class DispatcherCallWait : public Ice::DispatcherCall
-{
-
-public:
-
-    DispatcherCallWait(IceUtilInternal::CountDownLatch& cdl, const Ice::DispatcherCallPtr& call) :
-        _cdl(cdl),
-        _call(call)
-    {
-    }
-
-    virtual void
-    run()
-    {
-        _call->run();
-        _cdl.countDown();
-    }
-
-private:
-
-    IceUtilInternal::CountDownLatch& _cdl;
-    const Ice::DispatcherCallPtr _call;
-};
-
-}
-
 void
 SessionHelperI::dispatchCallbackAndWait(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr& conn)
 {
     if(_initData.dispatcher)
     {
-        IceUtilInternal::CountDownLatch cdl(1);
-        auto callWait = make_shared<DispatcherCallWait>(cdl, call);
-        _initData.dispatcher([callWait]()
+        promise<void> dispatchPromise;
+
+        _initData.dispatcher(
+            [&dispatchPromise, call = std::move(call)]()
             {
-                callWait->run();
+                call->run();
+                dispatchPromise.set_value();
             },
             conn);
-        cdl.await();
+        dispatchPromise.get_future().wait();
     }
     else
     {

diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -515,7 +515,6 @@
     <ClCompile Include="..\..\FixedRequestHandler.cpp" />
     <ClCompile Include="..\..\Connector.cpp" />
     <ClCompile Include="..\..\ConnectRequestHandler.cpp" />
-    <ClCompile Include="..\..\CountDownLatch.cpp" />
     <ClCompile Include="..\..\DefaultsAndOverrides.cpp" />
     <ClCompile Include="..\..\DispatchInterceptor.cpp" />
     <ClCompile Include="..\..\DLLMain.cpp" />

diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
@@ -285,9 +285,6 @@
     <ClCompile Include="..\..\ConnectRequestHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\CountDownLatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\DefaultsAndOverrides.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
@@ -102,7 +102,6 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\ConsoleUtil.h" />
-    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" />
@@ -119,7 +118,6 @@
     <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" />
-    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" />
@@ -128,4 +126,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
@@ -56,9 +56,6 @@
     <ClInclude Include="..\..\..\..\include\IceUtil\Config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -126,4 +123,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>