Restore --max-wait and file_lock for osrm-datastore

include/storage/shared_barriers.hpp

@@ -4,6 +4,8 @@
 #include <boost/interprocess/sync/named_condition.hpp>
 #include <boost/interprocess/sync/named_mutex.hpp>
 
+#include "util/retry_lock.hpp"
+
 namespace osrm
 {
 namespace storage
@@ -13,8 +15,8 @@ struct SharedBarriers
 {
 
     SharedBarriers()
-        : region_mutex(boost::interprocess::open_or_create, "osrm-region")
-        , region_condition(boost::interprocess::open_or_create, "osrm-region-cv")
+        : region_mutex(boost::interprocess::open_or_create, "osrm-region"),
+          region_condition(boost::interprocess::open_or_create, "osrm-region-cv")
     {
     }
 
@@ -24,6 +26,11 @@ struct SharedBarriers
         boost::interprocess::named_condition::remove("osrm-region-cv");
     }
 
+    static RetryLock getLockWithRetry(int timeout_seconds)
+    {
+        return RetryLock(timeout_seconds, "osrm-region");
+    }
+
     boost::interprocess::named_mutex region_mutex;
     boost::interprocess::named_condition region_condition;
 };

include/storage/shared_memory.hpp

@@ -23,6 +23,7 @@
 
 #include <algorithm>
 #include <exception>
+#include <thread>
 
 namespace osrm
 {
@@ -106,6 +107,20 @@ class SharedMemory
         return Remove(key);
     }
 
+    void WaitForDetach()
+    {
+        auto shmid = shm.get_shmid();
+        ::shmid_ds xsi_ds;
+        do
+        {
+            int ret = ::shmctl(shmid, IPC_STAT, &xsi_ds);
+            (void)ret; // no unused warning
+            BOOST_ASSERT(ret >= 0);
+
+            std::this_thread::sleep_for(std::chrono::microseconds(100));
+        } while (xsi_ds.shm_nattch > 1);
+    }
+
   private:
     static bool RegionExists(const boost::interprocess::xsi_key &key)
     {
@@ -147,17 +162,13 @@ class SharedMemory
   public:
     void *Ptr() const { return region.get_address(); }
 
-    SharedMemory(const boost::filesystem::path &lock_file,
-                 const int id,
-                 const uint64_t size = 0)
+    SharedMemory(const boost::filesystem::path &lock_file, const int id, const uint64_t size = 0)
     {
         sprintf(key, "%s.%d", "osrm.lock", id);
         if (0 == size)
         { // read_only
             shm = boost::interprocess::shared_memory_object(
-                boost::interprocess::open_only,
-                key,
-                boost::interprocess::read_only);
+                boost::interprocess::open_only, key, boost::interprocess::read_only);
             region = boost::interprocess::mapped_region(shm, boost::interprocess::read_only);
         }
         else
@@ -225,8 +236,7 @@ class SharedMemory
 #endif
 
 template <typename IdentifierT, typename LockFileT = OSRMLockFile>
-std::unique_ptr<SharedMemory>
-makeSharedMemory(const IdentifierT &id, const uint64_t size = 0)
+std::unique_ptr<SharedMemory> makeSharedMemory(const IdentifierT &id, const uint64_t size = 0)
 {
     try
     {

include/storage/storage.hpp

@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "storage/shared_datatype.hpp"
 #include "storage/storage_config.hpp"
 
-#include <boost/interprocess/sync/named_mutex.hpp>
 #include <boost/filesystem/path.hpp>
 
 #include <string>
@@ -45,14 +44,13 @@ class Storage
   public:
     Storage(StorageConfig config);
 
-    int Run();
+    int Run(int max_wait);
 
     void PopulateLayout(DataLayout &layout);
     void PopulateData(const DataLayout &layout, char *memory_ptr);
 
   private:
     StorageConfig config;
-    boost::interprocess::named_mutex datastore_mutex;
 };
 }
 }