Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release/8.0-staging] Fix #91958: use mach_timebase_info to determine process time coefficient on macOS #100122

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

Merged
merged 8 commits into from
Apr 30, 2024
Merged

[release/8.0-staging] Fix #91958: use mach_timebase_info to determine process time coefficient on macOS #100122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e07e66
Fix #91958: use mach_timebase_info to determine process time coeffici…
ForNeVeR Sep 16, 2023
ead7ef8
(#91958) Process.OSX: fallback for non-zero exit code from mach_timeb…
ForNeVeR Sep 20, 2023
eaa1b63
(#91958) Process: move OSX-specific tests to a separate file
ForNeVeR Sep 23, 2023
2449f6f
(#91958) Process.OSX: calculate times lazily
ForNeVeR Sep 23, 2023
d7f0abc
(#91958) Process: include string resources properly in tests
ForNeVeR Sep 25, 2023
988689b
(#91958) Process: more overflow-safe logic
ForNeVeR Sep 25, 2023
73064c3
(#91958) Minimize diff
ForNeVeR Sep 25, 2023
a4bf228
Process.OSX: fix thread safety (#100260)
ForNeVeR Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
(#91958) Process: move OSX-specific tests to a separate file
  • Loading branch information
@ForNeVeR @jeffhandley
ForNeVeR authored and jeffhandley committed Mar 22, 2024
commit eaa1b6350ea4df942c8ffec71df49542ab10055e
56 changes: 56 additions & 0 deletions src/libraries/System.Diagnostics.Process/tests/ProcessTests.OSX.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using System.Security;
using Xunit;
using Microsoft.DotNet.RemoteExecutor;
using Microsoft.DotNet.XUnitExtensions;

namespace System.Diagnostics.Tests
{
public partial class ProcessTests : ProcessTestBase
{
[Fact]
[PlatformSpecific(TestPlatforms.OSX)]
public unsafe void TestTotalProcessorTimeMacOs()
{
var rUsage = Interop.libproc.proc_pid_rusage(Environment.ProcessId);
var timeBase = new Interop.libSystem.mach_timebase_info_data_t();
Interop.libSystem.mach_timebase_info(&timeBase);

var nativeUserNs = rUsage.ri_user_time * timeBase.numer / timeBase.denom;
var nativeSystemNs = rUsage.ri_system_time * timeBase.numer / timeBase.denom;
var nativeTotalNs = nativeSystemNs + nativeUserNs;

var nativeUserTime = TimeSpan.FromMicroseconds(nativeUserNs / 1000);
var nativeSystemTime = TimeSpan.FromMicroseconds(nativeSystemNs / 1000);
var nativeTotalTime = TimeSpan.FromMicroseconds(nativeTotalNs / 1000);

var process = Process.GetCurrentProcess();
var managedUserTime = process.UserProcessorTime;
var managedSystemTime = process.PrivilegedProcessorTime;
var managedTotalTime = process.TotalProcessorTime;

AssertTime(managedUserTime, nativeUserTime, "user");
AssertTime(managedSystemTime, nativeSystemTime, "system");
AssertTime(managedTotalTime, nativeTotalTime, "total");

void AssertTime(TimeSpan managed, TimeSpan native, string label)
{
Assert.True(
managed >= native,
$"Time '{label}' returned by managed API ({managed}) should be greated or equal to the time returned by native API ({native}).");
}
}
}
}
43 changes: 0 additions & 43 deletions src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,39 +851,6 @@ static void ExecuteChildProcess(string filename, string flags)
}
}

[Fact]
[PlatformSpecific(TestPlatforms.OSX)]
public unsafe void TestTotalProcessorTimeMacOs()
{
var rUsage = Interop.libproc.proc_pid_rusage(Environment.ProcessId);
var timeBase = new Interop.libSystem.mach_timebase_info_data_t();
Interop.libSystem.mach_timebase_info(&timeBase);

var nativeUserNs = rUsage.ri_user_time * timeBase.numer / timeBase.denom;
var nativeSystemNs = rUsage.ri_system_time * timeBase.numer / timeBase.denom;
var nativeTotalNs = nativeSystemNs + nativeUserNs;

var nativeUserTime = TimeSpan.FromMicroseconds(nativeUserNs / 1000);
var nativeSystemTime = TimeSpan.FromMicroseconds(nativeSystemNs / 1000);
var nativeTotalTime = TimeSpan.FromMicroseconds(nativeTotalNs / 1000);

var process = Process.GetCurrentProcess();
var managedUserTime = process.UserProcessorTime;
var managedSystemTime = process.PrivilegedProcessorTime;
var managedTotalTime = process.TotalProcessorTime;

AssertTime(managedUserTime, nativeUserTime, "user");
AssertTime(managedSystemTime, nativeSystemTime, "system");
AssertTime(managedTotalTime, nativeTotalTime, "total");

void AssertTime(TimeSpan managed, TimeSpan native, string label)
{
Assert.True(
managed >= native,
$"Time '{label}' returned by managed API ({managed}) should be greated or equal to the time returned by native API ({native}).");
}
}

[ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
[InlineData(true)]
[InlineData(false)]
Expand Down Expand Up @@ -1049,13 +1016,3 @@ private static string StartAndReadToEnd(string filename, string[] arguments)
}
}
}

// TODO: Use the actual localization data in here?
namespace System
{
internal static partial class SR
{
public const string CantGetAllPids = nameof(CantGetAllPids);
public const string RUsageFailure = nameof(RUsageFailure);
}
}
8 changes: 6 additions & 2 deletions src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-osx</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'browser'">true</IgnoreForCI>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<StringResourcesPath>$(MSBuildProjectDirectory)\..\src\Resources\Strings.resx</StringResourcesPath>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
Expand Down Expand Up @@ -57,12 +58,15 @@
<!-- Helpers -->
<Compile Include="$(CommonTestPath)TestUtilities\System\WindowsTestFileShare.cs" Link="Common\TestUtilities\System\WindowsTestFileShare.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'unix' or '$(TargetPlatformIdentifier)' == 'browser'">
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'unix' or '$(TargetPlatformIdentifier)' == 'browser' or '$(TargetPlatformIdentifier)' == 'osx'">
<Compile Include="Interop.Unix.cs" />
<Compile Include="ProcessTests.Unix.cs" />
<Compile Include="ProcessThreadTests.Unix.cs" />
<Compile Include="$(CoreLibSharedDir)System\PasteArguments.Unix.cs"
Link="System\PasteArguments.Unix.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'osx'">
<Compile Include="ProcessTests.OSX.cs" />
<Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs"
Link="Common\Interop\OSX\Interop.Libraries.cs" />
<Compile Include="$(CommonPath)Interop\OSX\Interop.libproc.cs"
Expand Down