From c2a5c278e91fa35958976e32fa5bb239f212b89a Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 17 Oct 2018 13:08:10 -0400 Subject: [PATCH] Increase parallelism in workspace loading. --- .../spark/core/Settings/ISavedWindowFactory.cs | 1 + .../view/Shell/Workspaces/WorkspacesModel.cs | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/client/spark/core/Settings/ISavedWindowFactory.cs b/src/client/spark/core/Settings/ISavedWindowFactory.cs index 809c75ad0..6d20d49df 100644 --- a/src/client/spark/core/Settings/ISavedWindowFactory.cs +++ b/src/client/spark/core/Settings/ISavedWindowFactory.cs @@ -29,6 +29,7 @@ namespace mbts.ui.settings } public Task restore(WindowState window) { + Log.Ui.info("Loading window '{0}'".fmt(window.title)); bool changed; int count = 0; do { diff --git a/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs b/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs index 55daf51ca..1c4c59126 100644 --- a/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs +++ b/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs @@ -222,16 +222,15 @@ namespace mbts.ui.shell } } if (def.windows != null) { - foreach (var window in def.windows) { - Log.Ui.info("Loading window '{0}'".fmt(window.title)); - var new_shell_window = await _window_restore.restore(window); - // user can close the launcher from the taskbar while a workspace is loading - if (_closing) { - return; - } else if (new_shell_window != null) { - await _wm.add(new_shell_window); + async Task restore(WindowState window) { + var w = await _window_restore.restore(window); + if (!_closing) { + await _wm.add(w); } } + var loading = def.windows.Select(restore); + await Task.WhenAll(loading); + if (_closing) return; } sw.Stop(); Log.Ui.info($"Time to load workspace '{name}': {sw.Elapsed}");