Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reset map cache between games #16944

Merged
merged 1 commit into from Aug 25, 2019
Merged

Reset map cache between games #16944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion OpenRA.Game/Game.cs
View file
Open in desktop
Expand Up @@ -626,7 +626,7 @@ static void InnerLogicTick(OrderManager orderManager)

static void LogicTick()
{
delayedActions.PerformActions(RunTime);
PerformDelayedActions();

if (OrderManager.Connection.ConnectionState != lastConnectionState)
{
Expand All @@ -639,6 +639,11 @@ static void LogicTick()
InnerLogicTick(worldRenderer.World.OrderManager);
}

public static void PerformDelayedActions()
{
delayedActions.PerformActions(RunTime);
}

public static void TakeScreenshot()
{
takeScreenshot = true;
Expand Down
4 changes: 4 additions & 0 deletions OpenRA.Game/Server/Server.cs
View file
Open in desktop
Expand Up @@ -215,6 +215,10 @@ public Server(IPEndPoint endpoint, ServerSettings settings, ModData modData, boo

delayedActions.PerformActions(0);

// PERF: Dedicated servers need to drain the action queue to remove references blocking the GC from cleaning up disposed objects.
if (dedicated)
teinarss marked this conversation as resolved.
Show resolved Hide resolved
Game.PerformDelayedActions();

foreach (var t in serverTraits.WithInterface<ITick>())
t.Tick(this);

Expand Down
15 changes: 8 additions & 7 deletions OpenRA.Server/Program.cs
View file
Open in desktop
Expand Up @@ -56,17 +56,17 @@ static void Main(string[] args)

var mods = new InstalledMods(modSearchPaths, explicitModPaths);

// HACK: The engine code *still* assumes that Game.ModData is set
var modData = Game.ModData = new ModData(mods[modID], mods);
modData.MapCache.LoadMaps();

settings.Map = modData.MapCache.ChooseInitialMap(settings.Map, new MersenneTwister());

Console.WriteLine("[{0}] Starting dedicated server for mod: {1}", DateTime.Now.ToString(settings.TimestampFormat), modID);
while (true)
{
var server = new Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, modData, true);
// HACK: The engine code *still* assumes that Game.ModData is set
var modData = Game.ModData = new ModData(mods[modID], mods);
modData.MapCache.LoadMaps();

settings.Map = modData.MapCache.ChooseInitialMap(settings.Map, new MersenneTwister());

var server = new Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, modData, true);
GC.Collect();
while (true)
{
Thread.Sleep(1000);
Expand All @@ -78,6 +78,7 @@ static void Main(string[] args)
}
}

modData.Dispose();
Console.WriteLine("[{0}] Starting a new server instance...", DateTime.Now.ToString(settings.TimestampFormat));
}
}
Expand Down