Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Cleanup some unnecessary logs & comments

Browse Source
This commit is contained in:
Cosmin Tudorache 2022-04-10 20:08:05 +03:00
parent 803dded5ad
commit 9ebb4278a3
5 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/storage/shared_memory.hpp
View File

@ -163,9 +163,7 @@ class SharedMemory
}
BOOST_ASSERT(ret >= 0);
//std::this_thread::sleep_for(std::chrono::microseconds(100));
util::Log(logWARNING) << "CTudorache WaitForDetach, nattach: " << xsi_ds.shm_nattch;
std::this_thread::sleep_for(std::chrono::seconds(1));
std::this_thread::sleep_for(std::chrono::microseconds(100));
} while (xsi_ds.shm_nattch > 1);
}
#else

19
include/storage/shared_monitor.hpp
View File

@ -40,24 +40,6 @@ template <typename Data> struct SharedMonitor
{
using mutex_type = bi::interprocess_mutex;
// private:
// static SharedMonitor* g_instance;
// public:
// static SharedMonitor& instance() {
// if (!g_instance) {
// g_instance = new SharedMonitor();
// }
// return *g_instance;
// }
// static SharedMonitor& instance(const Data &initial_data) {
// if (!g_instance) {
// g_instance = new SharedMonitor(initial_data);
// }
// return *g_instance;
// }
// private:
SharedMonitor(const Data &initial_data)
{
util::Log(logWARNING) << "CTudorache sharedMonitor OPEN or CREATE: " << (const char*)Data::name;
@ -109,7 +91,6 @@ template <typename Data> struct SharedMonitor
}
}
// public:
Data &data() const
{
auto region_pointer = reinterpret_cast<char *>(region.get_address());

1
src/engine/datafacade/shared_memory_allocator.cpp
View File

@ -22,7 +22,6 @@ SharedMemoryAllocator::SharedMemoryAllocator(
{
util::Log(logDEBUG) << "Loading new data for region " << (int)shm_key;
BOOST_ASSERT(storage::SharedMemory::RegionExists(shm_key));
util::Log(logWARNING) << "CTudorache SharedMemoryAllocator, shm_key: " << shm_key;
auto mem = storage::makeSharedMemory(shm_key);
storage::io::BufferReader reader(reinterpret_cast<char *>(mem->Ptr()), mem->Size());

3
src/storage/storage.cpp
View File

@ -87,12 +87,10 @@ RegionHandle setupRegion(SharedRegionRegister &shared_register,
util::Log(logWARNING) << "CTudorache setupRegion, shm_key: " << shm_key << ", regions_size: " << regions_size << ", mem: " << memory->ToString();
// Copy memory static_layout to shared memory and populate data
//util::Log(logWARNING) << "CTudorache setupRegion, copy data, size: " << encoded_static_layout.size();
char *shared_memory_ptr = static_cast<char *>(memory->Ptr());
auto data_ptr =
std::copy_n(encoded_static_layout.data(), encoded_static_layout.size(), shared_memory_ptr);
//util::Log(logWARNING) << "CTudorache setupRegion, copy data DONE";
return RegionHandle{std::move(memory), data_ptr, shm_key};
}
@ -101,7 +99,6 @@ bool swapData(Monitor &monitor,
const std::map<std::string, RegionHandle> &handles,
int max_wait)
{
util::Log(logWARNING) << "CTudorache swapData, max_wait: " << max_wait << ", shared_register: " << shared_register.ToString() << ", handles: " << osrm::util::ToStringMap(handles);
std::vector<RegionHandle> old_handles;
{ // Lock for write access shared region mutex

2
src/tools/store.cpp
View File

@ -37,7 +37,7 @@ void deleteRegion(const storage::SharedRegionRegister::ShmKey key)
void listRegions(bool show_blocks)
{
osrm::util::Log() << "name\tshm key\ttimestamp\tsize\tkey\tshmid";
osrm::util::Log() << "name\tshm key\ttimestamp\tsize";
if (!storage::SharedMonitor<storage::SharedRegionRegister>::exists())
{
util::Log(logWARNING) << "CTudorache sharedMonitor DOES NOT EXIST: " << (const char *)storage::SharedRegionRegister::name;