osr without memory mapped routing data (#507)

motis-project · May 15, 2024 · f5739ca · f5739ca
1 parent 8116730
commit f5739ca
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.clang-tidy.in b/.clang-tidy.in
@@ -79,7 +79,8 @@ Checks: "*,\
 -bugprone-reserved-identifier,\
 -cert-dcl51-cpp,\
 -misc-confusable-identifiers,\
--misc-include-cleaner"
+-misc-include-cleaner,
+-bugprone-switch-missing-default-case"
 WarningsAsErrors: '*'
 HeaderFilterRegex: '^${RELATIVE_SOURCE_DIR}(base|modules|test)/'
 AnalyzeTemporaryDtors: false

diff --git a/.pkg b/.pkg
@@ -81,7 +81,7 @@
 [osr]
   url=git@github.com:motis-project/osr.git
   branch=master
-  commit=24179ff45f27eaee6c0b989854c86b20dfe8d1dd
+  commit=40ceb65b3653198f652c7a2bcce6c910c64980bd
 [adr]
   url=git@github.com:triptix-tech/adr.git
   branch=master

diff --git a/.pkg.lock b/.pkg.lock
@@ -1,7 +1,7 @@
-13013300562948116047
+15309377864696168365
 cista ed9ea61e4d3e287546f778729fafb5caca574658
 zlib fe8e13ffca867612951bc6baf114e5ac8b00f305
-boost 1c3f21c1fa8b149da89e2f6bcb48b28fff30fa5e
+boost 60cae66449fa3c9599b2b7d3d5d44c65301ed3a3
 conf f9bf4bd83bf55a2170725707e526cbacc45dcc66
 context 797dd16e2b5e959997ddcd5bdeac4f80931169b6
 fmt 3503709ac2ba2a938676e6b2071f1362294e278b
@@ -25,7 +25,7 @@ protobuf d8136b9c6a62db6ce09900ecdeb82bb793096cbd
 unordered_dense c11595a7743d20622637584bddf77243d72ae152
 wyhash 1e012b57fc2227a9e583a57e2eacb3da99816d99
 nigiri 0c51ee82bbc06174df28a25bfb7380322b813da2
-expat b8c26c40f1900899b95c795705e0252fc0c1350c
+expat 20b3b3e7dde39ee18c27c238b8d1246019ecb147
 libosmium d5cc2a02d997c2b464d37d37c3a75cd9efa23dc4
 protozero 8c9f3fa97c2cfdceef86d0b61818ae98e9328f29
 rapidjson 9ece673b648b19d0f1995b82d402c9a6fc0eb277
@@ -37,7 +37,7 @@ sol2 fdb0f8a60e48aa737f0a8d73edede48627f0c984
 variant 5aa73631dc969087c77433a5cdef246303051f69
 tiles 64f297ea0f782d04c89e82c6d478a1dd453e5f70
 rtree.c 6ed73a7dc4f1184f2b5b2acd8ac1c2b28a273057
-osr 24179ff45f27eaee6c0b989854c86b20dfe8d1dd
+osr 40ceb65b3653198f652c7a2bcce6c910c64980bd
 luabind b5d39b6f7511930115964304a423f0e6336e0eb2
 tbb b3011be5060ec1be43c76d4a8cc80d5550adb31d
 osrm-backend a7fe58cf3b6a54968d1248e0b4299d49db02ff2e

diff --git a/modules/osr/src/osr.cc b/modules/osr/src/osr.cc
@@ -345,9 +345,6 @@ void osr::import(mm::import_dispatcher& reg) {
         }
 
         auto w = std::make_unique<o::ways>(dir, cista::mmap::protection::READ);
-        if (lock_) {
-          w->lock();
-        }
         auto l = std::make_unique<o::lookup>(*w);
         impl_ = std::make_unique<impl>(std::move(w), std::move(l));