From 7f0fefddcfbf4b16f22ec58b5cf3eac794ded43e Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 10 Mar 2019 19:20:11 +0000 Subject: Change: [Linkgraph] Only acquire thread join performance measurements on network clients Network servers and single player clients do not block on thread joins due to instead pausing shortly before the join is due. --- src/linkgraph/linkgraphschedule.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/linkgraph') diff --git a/src/linkgraph/linkgraphschedule.cpp b/src/linkgraph/linkgraphschedule.cpp index 2638b77ea..87ab4818a 100644 --- a/src/linkgraph/linkgraphschedule.cpp +++ b/src/linkgraph/linkgraphschedule.cpp @@ -15,6 +15,7 @@ #include "flowmapper.h" #include "../framerate_type.h" #include "../command_func.h" +#include "../network/network.h" #include "../safeguards.h" @@ -206,8 +207,13 @@ void OnTick_LinkGraph() if (offset == 0) { LinkGraphSchedule::instance.SpawnNext(); } else if (offset == _settings_game.linkgraph.recalc_interval / 2) { - PerformanceMeasurer framerate(PFE_GL_LINKGRAPH); - LinkGraphSchedule::instance.JoinNext(); + if (!_networking || _network_server) { + PerformanceMeasurer::SetInactive(PFE_GL_LINKGRAPH); + LinkGraphSchedule::instance.JoinNext(); + } else { + PerformanceMeasurer framerate(PFE_GL_LINKGRAPH); + LinkGraphSchedule::instance.JoinNext(); + } } } -- cgit v1.2.3-54-g00ecf