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

Don't copy the node/way/segment/turn function objects for every call. 12-13% speedup for lua processing right there.

Browse Source
This commit is contained in:
Daniel Patterson 2017-06-12 18:40:17 +02:00 committed by Patrick Niklaus
parent 9d30817294
commit 5c8e2b6f78
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/extractor/scripting_environment_lua.hpp
View File

@ -31,6 +31,11 @@ struct LuaScriptingContext final
bool has_way_function; bool has_way_function;
bool has_segment_function; bool has_segment_function;
sol::function turn_function;
sol::function way_function;
sol::function node_function;
sol::function segment_function;
int api_version; int api_version;
}; };

32
src/extractor/scripting_environment_lua.cpp
View File

@ -427,15 +427,16 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
context.state.script_file(file_name); context.state.script_file(file_name);
sol::function turn_function = context.state["turn_function"]; // cache references to functions for faster execution
sol::function node_function = context.state["node_function"]; context.turn_function = context.state["turn_function"];
sol::function way_function = context.state["way_function"]; context.node_function = context.state["node_function"];
sol::function segment_function = context.state["segment_function"]; context.way_function = context.state["way_function"];
context.segment_function = context.state["segment_function"];
context.has_turn_penalty_function = turn_function.valid(); context.has_turn_penalty_function = context.turn_function.valid();
context.has_node_function = node_function.valid(); context.has_node_function = context.node_function.valid();
context.has_way_function = way_function.valid(); context.has_way_function = context.way_function.valid();
context.has_segment_function = segment_function.valid(); context.has_segment_function = context.segment_function.valid();
// Check profile API version // Check profile API version
auto maybe_version = context.state.get<sol::optional<int>>("api_version"); auto maybe_version = context.state.get<sol::optional<int>>("api_version");
@ -590,13 +591,12 @@ void Sol2ScriptingEnvironment::ProcessTurn(ExtractionTurn &turn)
{ {
auto &context = GetSol2Context(); auto &context = GetSol2Context();
sol::function turn_function = context.state["turn_function"];
switch (context.api_version) switch (context.api_version)
{ {
case 1: case 1:
if (context.has_turn_penalty_function) if (context.has_turn_penalty_function)
{ {
turn_function(turn); context.turn_function(turn);
// Turn weight falls back to the duration value in deciseconds // Turn weight falls back to the duration value in deciseconds
// or uses the extracted unit-less weight value // or uses the extracted unit-less weight value
@ -611,7 +611,7 @@ void Sol2ScriptingEnvironment::ProcessTurn(ExtractionTurn &turn)
if (turn.turn_type != guidance::TurnType::NoTurn) if (turn.turn_type != guidance::TurnType::NoTurn)
{ {
// Get turn duration and convert deci-seconds to seconds // Get turn duration and convert deci-seconds to seconds
turn.duration = static_cast<double>(turn_function(turn.angle)) / 10.; turn.duration = static_cast<double>(context.turn_function(turn.angle)) / 10.;
BOOST_ASSERT(turn.weight == 0); BOOST_ASSERT(turn.weight == 0);
// add U-turn penalty // add U-turn penalty
@ -642,14 +642,14 @@ void Sol2ScriptingEnvironment::ProcessSegment(ExtractionSegment &segment)
if (context.has_segment_function) if (context.has_segment_function)
{ {
sol::function segment_function = context.state["segment_function"];
switch (context.api_version) switch (context.api_version)
{ {
case 1: case 1:
segment_function(segment); context.segment_function(segment);
break; break;
case 0: case 0:
segment_function(segment.source, segment.target, segment.distance, segment.duration); context.segment_function(
segment.source, segment.target, segment.distance, segment.duration);
segment.weight = segment.duration; // back-compatibility fallback to duration segment.weight = segment.duration; // back-compatibility fallback to duration
break; break;
} }
@ -660,8 +660,6 @@ void LuaScriptingContext::ProcessNode(const osmium::Node &node, ExtractionNode &
{ {
BOOST_ASSERT(state.lua_state() != nullptr); BOOST_ASSERT(state.lua_state() != nullptr);
sol::function node_function = state["node_function"];
node_function(node, result); node_function(node, result);
} }
@ -669,8 +667,6 @@ void LuaScriptingContext::ProcessWay(const osmium::Way &way, ExtractionWay &resu
{ {
BOOST_ASSERT(state.lua_state() != nullptr); BOOST_ASSERT(state.lua_state() != nullptr);
sol::function way_function = state["way_function"];
way_function(way, result); way_function(way, result);
} }
} }