[sshfs] Yield and move include

canonical · Dec 17, 2024 · 5a8e954 · 5a8e954
1 parent 2c6bbdb
commit 5a8e954
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/platform/platform_unix.cpp b/src/platform/platform_unix.cpp
@@ -17,6 +17,7 @@
 #include <multipass/format.h>
 #include <multipass/platform.h>
 #include <multipass/platform_unix.h>
+#include <multipass/timer.h>
 #include <multipass/utils.h>
 
 #include <grp.h>
@@ -25,7 +26,6 @@
 #include <unistd.h>
 
 #include <libssh/sftp.h>
-#include <multipass/timer.h>
 
 namespace mp = multipass;
 

diff --git a/tests/unix/test_platform_unix.cpp b/tests/unix/test_platform_unix.cpp
@@ -27,6 +27,8 @@
 #include <multipass/format.h>
 #include <multipass/platform.h>
 
+#include <thread>
+
 namespace mp = multipass;
 namespace mpt = multipass::test;
 
@@ -262,8 +264,10 @@ TEST_F(TestPlatformUnix, quit_watchdog_signals_itself_asynchronously)
     EXPECT_CALL(*mock_signals, wait(_, _))
         .WillRepeatedly(DoAll(
             [&signaled, &times] {
+                // busy wait until signaled
                 while (!signaled.load(std::memory_order_acquire))
                 {
+                    std::this_thread::yield();
                 }
                 times.fetch_add(1, std::memory_order_release);
                 signaled.store(false, std::memory_order_release);