From 1df8039650e33533be787164ff412bb949c0c71f Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Fri, 22 Jul 2022 08:20:57 +0800 Subject: [PATCH] fix pubtool --- src/ST.Tools.Publish/Steps/Step_cd.cs | 38 ++++++++----------- src/ST.Tools.Publish/Steps/Step_tgz_7z_tbr.cs | 24 +----------- 2 files changed, 17 insertions(+), 45 deletions(-) diff --git a/src/ST.Tools.Publish/Steps/Step_cd.cs b/src/ST.Tools.Publish/Steps/Step_cd.cs index 5ff6cca42..46fa0637c 100644 --- a/src/ST.Tools.Publish/Steps/Step_cd.cs +++ b/src/ST.Tools.Publish/Steps/Step_cd.cs @@ -195,31 +195,23 @@ namespace System.Application.Steps Console.WriteLine("7z Step 正在创建压缩包..."); // 创建压缩包 - var gs = publishDirs.Select(x => Task.Run(() => GenerateCompressedPackage(dev, x))); - foreach (var item in gs.ToArray()) + PerformanceCounter? ramCounter = null; + if (OperatingSystem2.IsWindows()) { - await item; + var processName = Process.GetCurrentProcess().ProcessName; + ramCounter = new PerformanceCounter("Process", "Working Set", processName); + } + void WriteRAMLine() + { + if (ramCounter != null) + Console.WriteLine($"Working Set: {IOPath.GetDisplayFileSizeString(ramCounter.NextValue())}"); + } + foreach (var item in publishDirs) + { + WriteRAMLine(); + GenerateCompressedPackage(dev, item); + WriteRAMLine(); } - //parallelTasks.AddRange(gs); - - //var processorCount = Environment.ProcessorCount; - //if (processorCount < 2) processorCount = 2; - //var parallelCount = processorCount; - //if (parallelTasks.Count > parallelCount) - //{ - // var count = 0; - // while (true) - // { - // var parallelTasksSplit = parallelTasks.Skip(count++ * parallelCount).Take(parallelCount).ToArray(); - // if (!parallelTasksSplit.Any()) break; - // await Task.WhenAll(parallelTasksSplit); - // } - //} - //else - //{ - // await Task.WhenAll(parallelTasks); - //} - //parallelTasks.Clear(); if (hasWindows) { diff --git a/src/ST.Tools.Publish/Steps/Step_tgz_7z_tbr.cs b/src/ST.Tools.Publish/Steps/Step_tgz_7z_tbr.cs index acdd212ed..7da4b1d98 100644 --- a/src/ST.Tools.Publish/Steps/Step_tgz_7z_tbr.cs +++ b/src/ST.Tools.Publish/Steps/Step_tgz_7z_tbr.cs @@ -86,8 +86,6 @@ namespace System.Application dirNames = dirNames.ThrowIsNull(nameof(dirNames)); - var parallelTasks = dirNames.Select(x => Task.Run(() => Step_cd.GenerateCompressedPackage(dev, x, type))).ToArray(); - PerformanceCounter? ramCounter = null; if (OperatingSystem2.IsWindows()) { @@ -99,30 +97,12 @@ namespace System.Application if (ramCounter != null) Console.WriteLine($"Working Set: {IOPath.GetDisplayFileSizeString(ramCounter.NextValue())}"); } - foreach (var item in parallelTasks) + foreach (var item in dirNames) { WriteRAMLine(); - await item; + Step_cd.GenerateCompressedPackage(dev, item, type); WriteRAMLine(); } - //var processorCount = Environment.ProcessorCount; - //if (processorCount < 2) processorCount = 2; - //var parallelCount = processorCount; - - //if (parallelTasks.Length > parallelCount) - //{ - // var count = 0; - // while (true) - // { - // var parallelTasksSplit = parallelTasks.Skip(count++ * parallelCount).Take(parallelCount).ToArray(); - // if (!parallelTasksSplit.Any()) break; - // await Task.WhenAll(parallelTasksSplit); - // } - //} - //else - //{ - // await Task.WhenAll(parallelTasks); - //} SavePublishJson(dirNames, removeFiles: false);