Add random timestamp-based id for xsi_key

boostorg · Jan 12, 2024 · 0614661 · 0614661
1 parent 4465a67
commit 0614661
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/include/boost/interprocess/detail/os_thread_functions.hpp b/include/boost/interprocess/detail/os_thread_functions.hpp
@@ -161,6 +161,12 @@ inline OS_highres_count_t get_current_system_highres_count()
    return (OS_highres_count_t)count;
 }
 
+inline unsigned get_current_system_highres_rand()
+{
+   unsigned __int64 count = (unsigned __int64) get_current_system_highres_count();
+   return static_cast<unsigned>(count + (count >> 32u));
+}
+
 inline void zero_highres_count(OS_highres_count_t &count)
 {  count = 0;  }
 
@@ -354,6 +360,16 @@ inline OS_highres_count_t get_current_system_highres_count()
    #endif
 }
 
+inline unsigned get_current_system_highres_rand()
+{
+   OS_highres_count_t count = get_current_system_highres_count();
+   #if defined(BOOST_INTERPROCESS_CLOCK_MONOTONIC)
+      return static_cast<unsigned>(count.tv_sec + count.tv_nsec);
+   #elif defined(BOOST_INTERPROCESS_MATCH_ABSOLUTE_TIME)
+      return static_cast<unsigned>(count);
+   #endif
+}
+
 #ifndef BOOST_INTERPROCESS_MATCH_ABSOLUTE_TIME
 
 inline void zero_highres_count(OS_highres_count_t &count)

diff --git a/test/managed_xsi_shared_memory_test.cpp b/test/managed_xsi_shared_memory_test.cpp
@@ -56,7 +56,8 @@ int main ()
 
    file_mapping::remove(ShmemName);
    {  ipcdetail::file_wrapper(create_only, ShmemName, read_write); }
-   xsi_key key(ShmemName, 1);
+
+   xsi_key key(ShmemName, static_cast<int>(boost::interprocess::ipcdetail::get_current_system_highres_rand()));
    file_mapping::remove(ShmemName);
    int shmid;
 

diff --git a/test/xsi_shared_memory_mapping_test.cpp b/test/xsi_shared_memory_mapping_test.cpp
@@ -18,6 +18,7 @@
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/interprocess/file_mapping.hpp>
 #include <boost/interprocess/detail/file_wrapper.hpp>
+#include <boost/interprocess/detail/os_thread_functions.hpp>
 #include <string>
 #include <iostream>
 #include "get_process_id_name.hpp"
@@ -57,7 +58,7 @@ int main ()
    file_mapping::remove(names[0]);
    {  ipcdetail::file_wrapper(create_only, names[0], read_write); }
 
-   xsi_key key(names[0], 1);
+   xsi_key key(names[0], static_cast<int>(boost::interprocess::ipcdetail::get_current_system_highres_rand()));
    file_mapping::remove(names[0]);
    remove_shared_memory(key);