clang-format and remove debug
This commit is contained in:
parent
fa1fc810ea
commit
c30784895d
@ -15,7 +15,6 @@
|
|||||||
#include "extractor/query_node.hpp"
|
#include "extractor/query_node.hpp"
|
||||||
#include "storage/io.hpp"
|
#include "storage/io.hpp"
|
||||||
#include "storage/storage_config.hpp"
|
#include "storage/storage_config.hpp"
|
||||||
#include "storage/io.hpp"
|
|
||||||
#include "engine/geospatial_query.hpp"
|
#include "engine/geospatial_query.hpp"
|
||||||
#include "util/graph_loader.hpp"
|
#include "util/graph_loader.hpp"
|
||||||
#include "util/guidance/turn_bearing.hpp"
|
#include "util/guidance/turn_bearing.hpp"
|
||||||
@ -278,16 +277,13 @@ class InternalDataFacade final : public BaseDataFacade
|
|||||||
if (number_of_compressed_geometries > 0)
|
if (number_of_compressed_geometries > 0)
|
||||||
{
|
{
|
||||||
geometry_stream.read((char *)&(m_geometry_node_list[0]),
|
geometry_stream.read((char *)&(m_geometry_node_list[0]),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(NodeID));
|
||||||
sizeof(NodeID));
|
|
||||||
|
|
||||||
geometry_stream.read((char *)&(m_geometry_fwd_weight_list[0]),
|
geometry_stream.read((char *)&(m_geometry_fwd_weight_list[0]),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(EdgeWeight));
|
||||||
sizeof(EdgeWeight));
|
|
||||||
|
|
||||||
geometry_stream.read((char *)&(m_geometry_rev_weight_list[0]),
|
geometry_stream.read((char *)&(m_geometry_rev_weight_list[0]),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(EdgeWeight));
|
||||||
sizeof(EdgeWeight));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -753,8 +749,8 @@ class InternalDataFacade final : public BaseDataFacade
|
|||||||
* refences to where to find the beginning of the bi-
|
* refences to where to find the beginning of the bi-
|
||||||
* directional edge in the m_geometry_node_list vector.
|
* directional edge in the m_geometry_node_list vector.
|
||||||
* */
|
* */
|
||||||
const signed begin = m_geometry_indices.at(id);
|
const unsigned begin = m_geometry_indices.at(id);
|
||||||
const signed end = m_geometry_indices.at(id + 1);
|
const unsigned end = m_geometry_indices.at(id + 1);
|
||||||
|
|
||||||
std::vector<NodeID> result_nodes;
|
std::vector<NodeID> result_nodes;
|
||||||
|
|
||||||
@ -802,8 +798,8 @@ class InternalDataFacade final : public BaseDataFacade
|
|||||||
* reverse weights of bi-directional edges, edges 1 to
|
* reverse weights of bi-directional edges, edges 1 to
|
||||||
* n-1 of that edge need to be read in reverse.
|
* n-1 of that edge need to be read in reverse.
|
||||||
*/
|
*/
|
||||||
const signed begin = m_geometry_indices.at(id);
|
const unsigned begin = m_geometry_indices.at(id);
|
||||||
const signed end = m_geometry_indices.at(id + 1) - 1;
|
const unsigned end = m_geometry_indices.at(id + 1) - 1;
|
||||||
|
|
||||||
std::vector<EdgeWeight> result_weights;
|
std::vector<EdgeWeight> result_weights;
|
||||||
result_weights.resize(end - begin);
|
result_weights.resize(end - begin);
|
||||||
@ -845,8 +841,7 @@ class InternalDataFacade final : public BaseDataFacade
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::copy(
|
std::copy(m_datasource_list.begin() + begin,
|
||||||
m_datasource_list.begin() + begin,
|
|
||||||
m_datasource_list.begin() + end,
|
m_datasource_list.begin() + end,
|
||||||
result_datasources.begin());
|
result_datasources.begin());
|
||||||
}
|
}
|
||||||
@ -884,8 +879,7 @@ class InternalDataFacade final : public BaseDataFacade
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::copy(
|
std::copy(m_datasource_list.rbegin() + (m_datasource_list.size() - end),
|
||||||
m_datasource_list.rbegin() + (m_datasource_list.size() - end),
|
|
||||||
m_datasource_list.rbegin() + (m_datasource_list.size() - begin),
|
m_datasource_list.rbegin() + (m_datasource_list.size() - begin),
|
||||||
result_datasources.begin());
|
result_datasources.begin());
|
||||||
}
|
}
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
|
|
||||||
// implements all data storage when shared memory _IS_ used
|
// implements all data storage when shared memory _IS_ used
|
||||||
|
|
||||||
|
#include "storage/shared_barriers.hpp"
|
||||||
#include "storage/shared_datatype.hpp"
|
#include "storage/shared_datatype.hpp"
|
||||||
#include "storage/shared_memory.hpp"
|
#include "storage/shared_memory.hpp"
|
||||||
#include "storage/shared_barriers.hpp"
|
|
||||||
#include "engine/datafacade/datafacade_base.hpp"
|
#include "engine/datafacade/datafacade_base.hpp"
|
||||||
|
|
||||||
#include "extractor/compressed_edge_container.hpp"
|
#include "extractor/compressed_edge_container.hpp"
|
||||||
@ -27,12 +27,12 @@
|
|||||||
#include "util/typedefs.hpp"
|
#include "util/typedefs.hpp"
|
||||||
|
|
||||||
#include <boost/assert.hpp>
|
#include <boost/assert.hpp>
|
||||||
#include <boost/thread/tss.hpp>
|
|
||||||
#include <boost/interprocess/sync/named_sharable_mutex.hpp>
|
#include <boost/interprocess/sync/named_sharable_mutex.hpp>
|
||||||
#include <boost/interprocess/sync/sharable_lock.hpp>
|
#include <boost/interprocess/sync/sharable_lock.hpp>
|
||||||
|
#include <boost/thread/tss.hpp>
|
||||||
|
|
||||||
#include <cstddef>
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <cstddef>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@ -40,7 +40,6 @@
|
|||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|
||||||
namespace osrm
|
namespace osrm
|
||||||
{
|
{
|
||||||
namespace engine
|
namespace engine
|
||||||
@ -329,24 +328,21 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_INDEX]);
|
data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_INDEX]);
|
||||||
m_geometry_indices = std::move(geometry_begin_indices);
|
m_geometry_indices = std::move(geometry_begin_indices);
|
||||||
|
|
||||||
auto geometries_node_list_ptr =
|
auto geometries_node_list_ptr = data_layout->GetBlockPtr<NodeID>(
|
||||||
data_layout->GetBlockPtr<NodeID>(
|
|
||||||
shared_memory, storage::SharedDataLayout::GEOMETRIES_NODE_LIST);
|
shared_memory, storage::SharedDataLayout::GEOMETRIES_NODE_LIST);
|
||||||
util::ShM<NodeID, true>::vector geometry_node_list(
|
util::ShM<NodeID, true>::vector geometry_node_list(
|
||||||
geometries_node_list_ptr,
|
geometries_node_list_ptr,
|
||||||
data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_NODE_LIST]);
|
data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_NODE_LIST]);
|
||||||
m_geometry_node_list = std::move(geometry_node_list);
|
m_geometry_node_list = std::move(geometry_node_list);
|
||||||
|
|
||||||
auto geometries_fwd_weight_list_ptr =
|
auto geometries_fwd_weight_list_ptr = data_layout->GetBlockPtr<EdgeWeight>(
|
||||||
data_layout->GetBlockPtr<EdgeWeight>(
|
|
||||||
shared_memory, storage::SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
|
shared_memory, storage::SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
|
||||||
util::ShM<EdgeWeight, true>::vector geometry_fwd_weight_list(
|
util::ShM<EdgeWeight, true>::vector geometry_fwd_weight_list(
|
||||||
geometries_fwd_weight_list_ptr,
|
geometries_fwd_weight_list_ptr,
|
||||||
data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST]);
|
data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST]);
|
||||||
m_geometry_fwd_weight_list = std::move(geometry_fwd_weight_list);
|
m_geometry_fwd_weight_list = std::move(geometry_fwd_weight_list);
|
||||||
|
|
||||||
auto geometries_rev_weight_list_ptr =
|
auto geometries_rev_weight_list_ptr = data_layout->GetBlockPtr<EdgeWeight>(
|
||||||
data_layout->GetBlockPtr<EdgeWeight>(
|
|
||||||
shared_memory, storage::SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST);
|
shared_memory, storage::SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST);
|
||||||
util::ShM<EdgeWeight, true>::vector geometry_rev_weight_list(
|
util::ShM<EdgeWeight, true>::vector geometry_rev_weight_list(
|
||||||
geometries_rev_weight_list_ptr,
|
geometries_rev_weight_list_ptr,
|
||||||
@ -417,12 +413,12 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
// this function handle the deallocation of the shared memory it we can prove it will not be
|
||||||
// this function handle the deallocation of the shared memory it we can prove it will not be used anymore
|
// used anymore
|
||||||
virtual ~SharedDataFacade()
|
virtual ~SharedDataFacade()
|
||||||
{
|
{
|
||||||
boost::interprocess::scoped_lock<boost::interprocess::named_sharable_mutex>
|
boost::interprocess::scoped_lock<boost::interprocess::named_sharable_mutex> exclusive_lock(
|
||||||
exclusive_lock(data_region == storage::DATA_1 ? shared_barriers->regions_1_mutex
|
data_region == storage::DATA_1 ? shared_barriers->regions_1_mutex
|
||||||
: shared_barriers->regions_2_mutex,
|
: shared_barriers->regions_2_mutex,
|
||||||
boost::interprocess::defer_lock);
|
boost::interprocess::defer_lock);
|
||||||
|
|
||||||
@ -430,8 +426,8 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
if (exclusive_lock.try_lock())
|
if (exclusive_lock.try_lock())
|
||||||
{
|
{
|
||||||
// Now check if this is still the newest dataset
|
// Now check if this is still the newest dataset
|
||||||
const boost::interprocess::sharable_lock<boost::interprocess::named_upgradable_mutex> lock(
|
const boost::interprocess::sharable_lock<boost::interprocess::named_upgradable_mutex>
|
||||||
shared_barriers->current_regions_mutex);
|
lock(shared_barriers->current_regions_mutex);
|
||||||
|
|
||||||
auto shared_regions = storage::makeSharedMemory(storage::CURRENT_REGIONS);
|
auto shared_regions = storage::makeSharedMemory(storage::CURRENT_REGIONS);
|
||||||
const auto current_timestamp =
|
const auto current_timestamp =
|
||||||
@ -439,7 +435,8 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
|
|
||||||
if (current_timestamp->timestamp == shared_timestamp)
|
if (current_timestamp->timestamp == shared_timestamp)
|
||||||
{
|
{
|
||||||
util::SimpleLogger().Write(logDEBUG) << "Retaining data with shared timestamp " << shared_timestamp;
|
util::SimpleLogger().Write(logDEBUG) << "Retaining data with shared timestamp "
|
||||||
|
<< shared_timestamp;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -577,8 +574,8 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
* refences to where to find the beginning of the bi-
|
* refences to where to find the beginning of the bi-
|
||||||
* directional edge in the m_geometry_node_list vector.
|
* directional edge in the m_geometry_node_list vector.
|
||||||
* */
|
* */
|
||||||
const signed begin = m_geometry_indices.at(id);
|
const unsigned begin = m_geometry_indices.at(id);
|
||||||
const signed end = m_geometry_indices.at(id + 1);
|
const unsigned end = m_geometry_indices.at(id + 1);
|
||||||
|
|
||||||
std::vector<NodeID> result_nodes;
|
std::vector<NodeID> result_nodes;
|
||||||
|
|
||||||
@ -626,8 +623,8 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
* reverse weights of bi-directional edges, edges 1 to
|
* reverse weights of bi-directional edges, edges 1 to
|
||||||
* n-1 of that edge need to be read in reverse.
|
* n-1 of that edge need to be read in reverse.
|
||||||
*/
|
*/
|
||||||
const signed begin = m_geometry_indices.at(id);
|
const unsigned begin = m_geometry_indices.at(id);
|
||||||
const signed end = m_geometry_indices.at(id + 1) - 1;
|
const unsigned end = m_geometry_indices.at(id + 1) - 1;
|
||||||
|
|
||||||
std::vector<EdgeWeight> result_weights;
|
std::vector<EdgeWeight> result_weights;
|
||||||
result_weights.resize(end - begin);
|
result_weights.resize(end - begin);
|
||||||
@ -636,10 +633,6 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
m_geometry_rev_weight_list.rbegin() + (m_geometry_rev_weight_list.size() - begin),
|
m_geometry_rev_weight_list.rbegin() + (m_geometry_rev_weight_list.size() - begin),
|
||||||
result_weights.begin());
|
result_weights.begin());
|
||||||
|
|
||||||
std::cout << "Should be: " << end - begin << std::endl;
|
|
||||||
std::cout << "Result weights length: " << result_weights.size() << std::endl;
|
|
||||||
std::cout << "Beginning weights length: " << m_geometry_rev_weight_list.size() << std::endl;
|
|
||||||
|
|
||||||
return result_weights;
|
return result_weights;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -870,8 +863,7 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::copy(
|
std::copy(m_datasource_list.begin() + begin,
|
||||||
m_datasource_list.begin() + begin,
|
|
||||||
m_datasource_list.begin() + end,
|
m_datasource_list.begin() + end,
|
||||||
result_datasources.begin());
|
result_datasources.begin());
|
||||||
}
|
}
|
||||||
@ -909,8 +901,7 @@ class SharedDataFacade final : public BaseDataFacade
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::copy(
|
std::copy(m_datasource_list.rbegin() + (m_datasource_list.size() - end),
|
||||||
m_datasource_list.rbegin() + (m_datasource_list.size() - end),
|
|
||||||
m_datasource_list.rbegin() + (m_datasource_list.size() - begin),
|
m_datasource_list.rbegin() + (m_datasource_list.size() - begin),
|
||||||
result_datasources.begin());
|
result_datasources.begin());
|
||||||
}
|
}
|
||||||
|
@ -543,16 +543,13 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
|
|||||||
if (number_of_compressed_geometries > 0)
|
if (number_of_compressed_geometries > 0)
|
||||||
{
|
{
|
||||||
geometry_stream.read((char *)&(m_geometry_node_list[0]),
|
geometry_stream.read((char *)&(m_geometry_node_list[0]),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(NodeID));
|
||||||
sizeof(NodeID));
|
|
||||||
|
|
||||||
geometry_stream.read((char *)&(m_geometry_fwd_weight_list[0]),
|
geometry_stream.read((char *)&(m_geometry_fwd_weight_list[0]),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(EdgeWeight));
|
||||||
sizeof(EdgeWeight));
|
|
||||||
|
|
||||||
geometry_stream.read((char *)&(m_geometry_rev_weight_list[0]),
|
geometry_stream.read((char *)&(m_geometry_rev_weight_list[0]),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(EdgeWeight));
|
||||||
sizeof(EdgeWeight));
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -611,10 +608,10 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
|
|||||||
m_geometry_fwd_weight_list[forward_begin + leaf_object.fwd_segment_position];
|
m_geometry_fwd_weight_list[forward_begin + leaf_object.fwd_segment_position];
|
||||||
|
|
||||||
u = &(internal_to_external_node_map
|
u = &(internal_to_external_node_map
|
||||||
[m_geometry_node_list[forward_begin +
|
[m_geometry_node_list[forward_begin + leaf_object.fwd_segment_position]]);
|
||||||
leaf_object.fwd_segment_position]]);
|
|
||||||
v = &(internal_to_external_node_map
|
v = &(internal_to_external_node_map
|
||||||
[m_geometry_node_list[forward_begin + leaf_object.fwd_segment_position + 1]]);
|
[m_geometry_node_list[forward_begin + leaf_object.fwd_segment_position +
|
||||||
|
1]]);
|
||||||
|
|
||||||
const double segment_length = util::coordinate_calculation::greatCircleDistance(
|
const double segment_length = util::coordinate_calculation::greatCircleDistance(
|
||||||
util::Coordinate{u->lon, u->lat}, util::Coordinate{v->lon, v->lat});
|
util::Coordinate{u->lon, u->lat}, util::Coordinate{v->lon, v->lat});
|
||||||
@ -629,7 +626,8 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
|
|||||||
current_fwd_weight,
|
current_fwd_weight,
|
||||||
log_edge_updates_factor);
|
log_edge_updates_factor);
|
||||||
|
|
||||||
m_geometry_fwd_weight_list[forward_begin + 1 + leaf_object.fwd_segment_position] =
|
m_geometry_fwd_weight_list[forward_begin + 1 +
|
||||||
|
leaf_object.fwd_segment_position] =
|
||||||
new_segment_weight;
|
new_segment_weight;
|
||||||
m_geometry_datasource[forward_begin + 1 + leaf_object.fwd_segment_position] =
|
m_geometry_datasource[forward_begin + 1 + leaf_object.fwd_segment_position] =
|
||||||
forward_speed_iter->speed_source.source;
|
forward_speed_iter->speed_source.source;
|
||||||
@ -714,14 +712,11 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
|
|||||||
geometry_stream.write(reinterpret_cast<const char *>(&number_of_compressed_geometries),
|
geometry_stream.write(reinterpret_cast<const char *>(&number_of_compressed_geometries),
|
||||||
sizeof(unsigned));
|
sizeof(unsigned));
|
||||||
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_node_list[0])),
|
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_node_list[0])),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(NodeID));
|
||||||
sizeof(NodeID));
|
|
||||||
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_fwd_weight_list[0])),
|
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_fwd_weight_list[0])),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(EdgeWeight));
|
||||||
sizeof(EdgeWeight));
|
|
||||||
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_rev_weight_list[0])),
|
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_rev_weight_list[0])),
|
||||||
number_of_compressed_geometries *
|
number_of_compressed_geometries * sizeof(EdgeWeight));
|
||||||
sizeof(EdgeWeight));
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const auto save_datasource_indexes = [&] {
|
const auto save_datasource_indexes = [&] {
|
||||||
|
@ -81,7 +81,8 @@ void CompressedEdgeContainer::SerializeInternalVector(const std::string &path) c
|
|||||||
BOOST_ASSERT(std::numeric_limits<unsigned>::max() != compressed_geometry_indices);
|
BOOST_ASSERT(std::numeric_limits<unsigned>::max() != compressed_geometry_indices);
|
||||||
geometry_out_stream.write((char *)&compressed_geometry_indices, sizeof(unsigned));
|
geometry_out_stream.write((char *)&compressed_geometry_indices, sizeof(unsigned));
|
||||||
|
|
||||||
geometry_out_stream.write((char *)(m_compressed_geometry_index.data()), sizeof(unsigned) * m_compressed_geometry_index.size());
|
geometry_out_stream.write((char *)(m_compressed_geometry_index.data()),
|
||||||
|
sizeof(unsigned) * m_compressed_geometry_index.size());
|
||||||
|
|
||||||
// sentinel element
|
// sentinel element
|
||||||
geometry_out_stream.write((char *)&(compressed_geometries), sizeof(unsigned));
|
geometry_out_stream.write((char *)&(compressed_geometries), sizeof(unsigned));
|
||||||
@ -90,13 +91,16 @@ void CompressedEdgeContainer::SerializeInternalVector(const std::string &path) c
|
|||||||
geometry_out_stream.write((char *)&(compressed_geometries), sizeof(unsigned));
|
geometry_out_stream.write((char *)&(compressed_geometries), sizeof(unsigned));
|
||||||
|
|
||||||
// write compressed geometry node id's
|
// write compressed geometry node id's
|
||||||
geometry_out_stream.write((char *)(m_compressed_geometry_nodes.data()), sizeof(NodeID) * m_compressed_geometry_nodes.size());
|
geometry_out_stream.write((char *)(m_compressed_geometry_nodes.data()),
|
||||||
|
sizeof(NodeID) * m_compressed_geometry_nodes.size());
|
||||||
|
|
||||||
// write compressed geometry forward weights
|
// write compressed geometry forward weights
|
||||||
geometry_out_stream.write((char *)(m_compressed_geometry_fwd_weights.data()), sizeof(EdgeWeight) * m_compressed_geometry_fwd_weights.size());
|
geometry_out_stream.write((char *)(m_compressed_geometry_fwd_weights.data()),
|
||||||
|
sizeof(EdgeWeight) * m_compressed_geometry_fwd_weights.size());
|
||||||
|
|
||||||
// write compressed geometry reverse weights
|
// write compressed geometry reverse weights
|
||||||
geometry_out_stream.write((char *)(m_compressed_geometry_rev_weights.data()), sizeof(EdgeWeight) * m_compressed_geometry_rev_weights.size());
|
geometry_out_stream.write((char *)(m_compressed_geometry_rev_weights.data()),
|
||||||
|
sizeof(EdgeWeight) * m_compressed_geometry_rev_weights.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adds info for a compressed edge to the container. edge_id_2
|
// Adds info for a compressed edge to the container. edge_id_2
|
||||||
|
@ -329,12 +329,12 @@ Storage::ReturnCode Storage::Run(int max_wait)
|
|||||||
boost::iostreams::seek(
|
boost::iostreams::seek(
|
||||||
geometry_input_stream, number_of_geometries_indices * sizeof(unsigned), BOOST_IOS::cur);
|
geometry_input_stream, number_of_geometries_indices * sizeof(unsigned), BOOST_IOS::cur);
|
||||||
geometry_input_stream.read((char *)&number_of_compressed_geometries, sizeof(unsigned));
|
geometry_input_stream.read((char *)&number_of_compressed_geometries, sizeof(unsigned));
|
||||||
shared_layout_ptr->SetBlockSize<NodeID>(
|
shared_layout_ptr->SetBlockSize<NodeID>(SharedDataLayout::GEOMETRIES_NODE_LIST,
|
||||||
SharedDataLayout::GEOMETRIES_NODE_LIST, number_of_compressed_geometries);
|
number_of_compressed_geometries);
|
||||||
shared_layout_ptr->SetBlockSize<EdgeWeight>(
|
shared_layout_ptr->SetBlockSize<EdgeWeight>(SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST,
|
||||||
SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST, number_of_compressed_geometries);
|
number_of_compressed_geometries);
|
||||||
shared_layout_ptr->SetBlockSize<EdgeWeight>(
|
shared_layout_ptr->SetBlockSize<EdgeWeight>(SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST,
|
||||||
SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST, number_of_compressed_geometries);
|
number_of_compressed_geometries);
|
||||||
|
|
||||||
// load datasource sizes. This file is optional, and it's non-fatal if it doesn't
|
// load datasource sizes. This file is optional, and it's non-fatal if it doesn't
|
||||||
// exist.
|
// exist.
|
||||||
@ -605,8 +605,7 @@ Storage::ReturnCode Storage::Run(int max_wait)
|
|||||||
(char *)geometries_index_ptr,
|
(char *)geometries_index_ptr,
|
||||||
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_INDEX));
|
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_INDEX));
|
||||||
}
|
}
|
||||||
NodeID *geometries_node_id_list_ptr =
|
NodeID *geometries_node_id_list_ptr = shared_layout_ptr->GetBlockPtr<NodeID, true>(
|
||||||
shared_layout_ptr->GetBlockPtr<NodeID, true>(
|
|
||||||
shared_memory_ptr, SharedDataLayout::GEOMETRIES_NODE_LIST);
|
shared_memory_ptr, SharedDataLayout::GEOMETRIES_NODE_LIST);
|
||||||
|
|
||||||
geometry_input_stream.read((char *)&temporary_value, sizeof(unsigned));
|
geometry_input_stream.read((char *)&temporary_value, sizeof(unsigned));
|
||||||
@ -619,8 +618,7 @@ Storage::ReturnCode Storage::Run(int max_wait)
|
|||||||
(char *)geometries_node_id_list_ptr,
|
(char *)geometries_node_id_list_ptr,
|
||||||
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_NODE_LIST));
|
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_NODE_LIST));
|
||||||
}
|
}
|
||||||
EdgeWeight *geometries_fwd_weight_list_ptr =
|
EdgeWeight *geometries_fwd_weight_list_ptr = shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
|
||||||
shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
|
|
||||||
shared_memory_ptr, SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
|
shared_memory_ptr, SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
|
||||||
|
|
||||||
BOOST_ASSERT(temporary_value ==
|
BOOST_ASSERT(temporary_value ==
|
||||||
@ -632,8 +630,7 @@ Storage::ReturnCode Storage::Run(int max_wait)
|
|||||||
(char *)geometries_fwd_weight_list_ptr,
|
(char *)geometries_fwd_weight_list_ptr,
|
||||||
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST));
|
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST));
|
||||||
}
|
}
|
||||||
EdgeWeight *geometries_rev_weight_list_ptr =
|
EdgeWeight *geometries_rev_weight_list_ptr = shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
|
||||||
shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
|
|
||||||
shared_memory_ptr, SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST);
|
shared_memory_ptr, SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST);
|
||||||
|
|
||||||
BOOST_ASSERT(temporary_value ==
|
BOOST_ASSERT(temporary_value ==
|
||||||
@ -816,6 +813,7 @@ Storage::ReturnCode Storage::Run(int max_wait)
|
|||||||
static_cast<SharedDataTimestamp *>(data_type_memory->Ptr());
|
static_cast<SharedDataTimestamp *>(data_type_memory->Ptr());
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
boost::interprocess::scoped_lock<boost::interprocess::named_upgradable_mutex>
|
boost::interprocess::scoped_lock<boost::interprocess::named_upgradable_mutex>
|
||||||
current_regions_exclusive_lock;
|
current_regions_exclusive_lock;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user