Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ZjzMisaka/DataTransformer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.1
Choose a base ref
...
head repository: ZjzMisaka/DataTransformer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.2
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Nov 11, 2023

  1. update PowerThreadPool

    @ZjzMisaka
    ZjzMisaka committed Nov 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7b6e272 View commit details
Showing with 7 additions and 7 deletions.
  1. +1 −1 DataTransformer/DataTransformer.csproj
  2. +5 −5 DataTransformer/ViewModel/MainWindowViewModel.cs
  3. +1 −1 GlobalObjects/GlobalObjects.csproj
2 changes: 1 addition & 1 deletion DataTransformer/DataTransformer.csproj
View file
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="PowerThreadPool" Version="1.5.1" />
<PackageReference Include="PowerThreadPool" Version="2.1.4" />
<PackageReference Include="RoslynPad.Editor.Windows" Version="4.4.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.410601">
10 changes: 5 additions & 5 deletions DataTransformer/ViewModel/MainWindowViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -698,7 +698,7 @@ private void WindowLoaded(RoutedEventArgs eventArgs)
});
runningThread.Start();

powerPool = new PowerPool(new ThreadPoolOption());
powerPool = new PowerPool(new PowerPoolOption());
Running.Controller = new PowerPoolController(powerPool);
}
private void WindowClosing(CancelEventArgs eventArgs)
@@ -2674,7 +2674,7 @@ private async Task<bool> StartLogic(List<CsvExplainer> csvExplainers, List<Analy

long startSs = GetNowSs();
// powerPool.Wait();
while (powerPool.ThreadPoolRunning)
while (powerPool.PoolRunning)
{
try
{
@@ -2914,7 +2914,7 @@ private void WhenRunning()

if (this.powerPool != null)
{
if (Running.NowRunning || this.powerPool.ThreadPoolRunning)
if (Running.NowRunning || this.powerPool.PoolRunning)
{
BtnStartIsEnabled = false;
BtnStopIsEnabled = true;
@@ -3102,13 +3102,13 @@ private void RenewSmartThreadPoolAnalyze()
powerPool.Stop();
}

ThreadPoolOption threadPoolOption = new ThreadPoolOption();
PowerPoolOption threadPoolOption = new PowerPoolOption();
if (maxThreadCount > 0)
{
threadPoolOption.MaxThreads = maxThreadCount;
}
threadPoolOption.DestroyThreadOption = new DestroyThreadOption() { MinThreads = 0 };
powerPool.ThreadPoolOption = threadPoolOption;
powerPool.PowerPoolOption = threadPoolOption;
}

private void SetAutoStatusAll()
2 changes: 1 addition & 1 deletion GlobalObjects/GlobalObjects.csproj
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<PackageReference Include="ModernWpfUI">
<Version>0.9.6</Version>
</PackageReference>
<PackageReference Include="PowerThreadPool" Version="1.5.1" />
<PackageReference Include="PowerThreadPool" Version="2.1.4" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.410601">
<PrivateAssets>all</PrivateAssets>