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

Remove dependency on PerfCounter.dll #45142

Merged
merged 3 commits into from
Dec 1, 2020
Merged

Remove dependency on PerfCounter.dll #45142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f589278
Remove dependency on PerfCounter.dll
ericstj Nov 24, 2020
027161a
Update conditions on performance counter tests.
ericstj Nov 25, 2020
924770c
Condition more perf counter tests
ericstj Nov 30, 2020
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
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ internal static partial class Libraries
internal const string Odbc32 = "odbc32.dll";
internal const string Ole32 = "ole32.dll";
internal const string OleAut32 = "oleaut32.dll";
internal const string PerfCounter = "perfcounter.dll";
internal const string Pdh = "pdh.dll";
internal const string Secur32 = "secur32.dll";
internal const string Shell32 = "shell32.dll";
internal const string SspiCli = "sspicli.dll";
Expand Down
6 changes: 3 additions & 3 deletions ...PerfCounter/Interop.FormatFromRawValue.cs → ...dows/Pdh/Interop.PdhFormatFromRawValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

internal partial class Interop
{
internal partial class PerfCounter
internal partial class Pdh
{
[DllImport(Libraries.PerfCounter, CharSet = CharSet.Unicode)]
public static extern int FormatFromRawValue(
[DllImport(Libraries.Pdh, CharSet = CharSet.Unicode)]
public static extern int PdhFormatFromRawValue(
uint dwCounterType,
uint dwFormat,
ref long pTimeBase,
Expand Down
4 changes: 2 additions & 2 deletions ...es/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@
Link="Common\Interop\Windows\Kernel32\Interop.VirtualQuery.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs"
Link="Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs" />
<Compile Include="$(CommonPath)Interop\Windows\PerfCounter\Interop.FormatFromRawValue.cs"
Link="Common\Interop\Windows\PerfCounter\Interop.FormatFromRawValue.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Pdh\Interop.PdhFormatFromRawValue.cs"
Link="Common\Interop\Windows\Pdh\Interop.PdhFormatFromRawValue.cs" />
<Compile Include="$(CommonPath)Interop\Windows\PerfCounter\Interop.PerformanceData.cs"
Link="Common\Interop\Windows\PerfCounter\Interop.PerformanceData.cs" />
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs"
Expand Down
22 changes: 1 addition & 21 deletions ...s/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/CounterSampleCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ namespace System.Diagnostics
/// </summary>
public static class CounterSampleCalculator
{
private static volatile bool s_perfCounterDllLoaded;

/// <summary>
/// Converts 100NS elapsed time to fractional seconds
/// </summary>
Expand Down Expand Up @@ -89,11 +87,9 @@ public static float ComputeCounterValue(CounterSample oldSample, CounterSample n

FillInValues(oldSample, newSample, ref oldPdhValue, ref newPdhValue);

LoadPerfCounterDll();

Interop.Kernel32.PerformanceCounterOptions.PDH_FMT_COUNTERVALUE pdhFormattedValue = default;
long timeBase = newSample.SystemFrequency;
int result = Interop.PerfCounter.FormatFromRawValue((uint)newCounterType, Interop.Kernel32.PerformanceCounterOptions.PDH_FMT_DOUBLE | Interop.Kernel32.PerformanceCounterOptions.PDH_FMT_NOSCALE | Interop.Kernel32.PerformanceCounterOptions.PDH_FMT_NOCAP100,
int result = Interop.Pdh.PdhFormatFromRawValue((uint)newCounterType, Interop.Kernel32.PerformanceCounterOptions.PDH_FMT_DOUBLE | Interop.Kernel32.PerformanceCounterOptions.PDH_FMT_NOSCALE | Interop.Kernel32.PerformanceCounterOptions.PDH_FMT_NOCAP100,
ref timeBase, ref newPdhValue, ref oldPdhValue, ref pdhFormattedValue);

if (result != Interop.Errors.ERROR_SUCCESS)
Expand Down Expand Up @@ -227,21 +223,5 @@ private static void FillInValues(CounterSample oldSample, CounterSample newSampl
break;
}
}

private static void LoadPerfCounterDll()
{
if (s_perfCounterDllLoaded)
return;

string installPath = NetFrameworkUtils.GetLatestBuildDllDirectory(".");

string perfcounterPath = Path.Combine(installPath, "perfcounter.dll");
if (Interop.Kernel32.LoadLibrary(perfcounterPath) == IntPtr.Zero)
{
throw new Win32Exception(Marshal.GetLastWin32Error());
}

s_perfCounterDllLoaded = true;
}
}
}
16 changes: 8 additions & 8 deletions ...braries/System.Diagnostics.PerformanceCounter/tests/CounterCreationDataCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ namespace System.Diagnostics.Tests
{
public static class CounterCreationDataCollectionTests
{
[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationDataCollection_CreateCounterCreationDataCollection_Empty()
{
CounterCreationDataCollection ccdc = new CounterCreationDataCollection();
Assert.Equal(0, ccdc.Count);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationDataCollection_CreateCounterCreationDataCollection_CCDC()
{
CounterCreationData[] ccds = { new CounterCreationData("Simple1", "Simple Help", PerformanceCounterType.RawBase), new CounterCreationData("Simple2", "Simple Help", PerformanceCounterType.RawBase) };
Expand All @@ -27,7 +27,7 @@ public static void CounterCreationDataCollection_CreateCounterCreationDataCollec
Assert.Equal(2, ccdc2.Count);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationDataCollection_CreateCounterCreationDataCollection_Array()
{
CounterCreationData[] ccds = { new CounterCreationData("Simple1", "Simple Help", PerformanceCounterType.RawBase), new CounterCreationData("Simple2", "Simple Help", PerformanceCounterType.RawBase) };
Expand All @@ -37,7 +37,7 @@ public static void CounterCreationDataCollection_CreateCounterCreationDataCollec
Assert.Equal(0, ccdc.IndexOf(ccds[0]));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationDataCollection_CreateCounterCreationDataCollection_Invalid()
{
CounterCreationData[] ccds = null;
Expand All @@ -46,7 +46,7 @@ public static void CounterCreationDataCollection_CreateCounterCreationDataCollec
Assert.Throws<ArgumentNullException>(() => new CounterCreationDataCollection(ccdc));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationDataCollection_SetIndex2()
{
CounterCreationData[] ccds = { new CounterCreationData("Simple1", "Simple Help", PerformanceCounterType.RawBase), new CounterCreationData("Simple2", "Simple Help", PerformanceCounterType.RawBase) };
Expand All @@ -59,7 +59,7 @@ public static void CounterCreationDataCollection_SetIndex2()
Assert.Equal(ccd, ccdc[1]);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationDataCollection_Remove()
{
CounterCreationData[] ccds = { new CounterCreationData("Simple1", "Simple Help", PerformanceCounterType.RawBase), new CounterCreationData("Simple2", "Simple Help", PerformanceCounterType.RawBase) };
Expand All @@ -69,7 +69,7 @@ public static void CounterCreationDataCollection_Remove()
Assert.False(ccdc.Contains(ccds[0]));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationDataCollection_Insert()
{
CounterCreationData[] ccds = { new CounterCreationData("Simple1", "Simple Help", PerformanceCounterType.RawBase), new CounterCreationData("Simple2", "Simple Help", PerformanceCounterType.RawBase) };
Expand All @@ -82,7 +82,7 @@ public static void CounterCreationDataCollection_Insert()
Assert.Equal(1, ccdc.IndexOf(ccd));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationDataCollection_CopyTo()
{
CounterCreationData[] ccds = { new CounterCreationData("Simple1", "Simple Help", PerformanceCounterType.RawBase), new CounterCreationData("Simple2", "Simple Help", PerformanceCounterType.RawBase) };
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Diagnostics.PerformanceCounter/tests/CounterCreationDataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace System.Diagnostics.Tests
{
public static class CounterCreationDataTests
{
[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationData_CreateCounterCreationData_SimpleSimpleHelpRawBase()
{
CounterCreationData ccd = new CounterCreationData("Simple", "Simple Help", PerformanceCounterType.RawBase);
Expand All @@ -21,7 +21,7 @@ public static void CounterCreationData_CreateCounterCreationData_SimpleSimpleHel
Assert.Equal(PerformanceCounterType.RawBase, ccd.CounterType);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterCreationData_SetCounterType_Invalud()
{
CounterCreationData ccd = new CounterCreationData("Simple", "Simple Help", PerformanceCounterType.RawBase);
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Diagnostics.PerformanceCounter/tests/CounterSampleCalculatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace System.Diagnostics.Tests
{
public static class CounterSampleCalculatorTests
{
[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteAndReadNetPerfCounters))]
public static void CounterSampleCalculator_ElapsedTime()
{
var name = nameof(CounterSampleCalculator_ElapsedTime) + "_Counter";
Expand Down
18 changes: 8 additions & 10 deletions src/libraries/System.Diagnostics.PerformanceCounter/tests/CounterSampleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace System.Diagnostics.Tests
{
public static class CounterSampleTests
{
[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterSample_Constructor_EmptyCounterSample()
{
CounterSample counterSample = new CounterSample();
Expand All @@ -24,7 +24,7 @@ public static void CounterSample_Constructor_EmptyCounterSample()
Assert.Equal(0, counterSample.TimeStamp100nSec);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterSample_Constructor_CounterSample()
{
long timeStamp = DateTime.Now.ToFileTime();
Expand All @@ -39,17 +39,15 @@ public static void CounterSample_Constructor_CounterSample()
Assert.Equal(timeStamp, counterSample.TimeStamp100nSec);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34409", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[Fact]
public static void CounterSample_Calculate_CalculateCounterSample()
{
CounterSample counterSample = new CounterSample(5, 0, 0, 0, 0, 0, PerformanceCounterType.NumberOfItems32);

Assert.Equal(5, CounterSample.Calculate(counterSample));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34409", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[Fact]
public static void CounterSample_Calculate_CalculateCounterSampleCounterSample()
{
CounterSample counterSample1 = new CounterSample(5, 0, 0, 1, 0, 0, PerformanceCounterType.CounterDelta32);
Expand All @@ -58,7 +56,7 @@ public static void CounterSample_Calculate_CalculateCounterSampleCounterSample()
Assert.Equal(10, CounterSample.Calculate(counterSample1, counterSample2));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterSample_Equal()
{
CounterSample counterSample1 = new CounterSample(5, 0, 0, 1, 0, 0, PerformanceCounterType.CounterDelta32);
Expand All @@ -67,7 +65,7 @@ public static void CounterSample_Equal()
Assert.Equal(counterSample1, counterSample2);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterSample_opInequality()
{
CounterSample counterSample1 = new CounterSample(5, 0, 0, 1, 0, 0, PerformanceCounterType.CounterDelta32);
Expand All @@ -76,7 +74,7 @@ public static void CounterSample_opInequality()
Assert.True(counterSample1 != counterSample2);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterSample_opEquality()
{
CounterSample counterSample1 = new CounterSample(5, 0, 0, 1, 0, 0, PerformanceCounterType.CounterDelta32);
Expand All @@ -85,7 +83,7 @@ public static void CounterSample_opEquality()
Assert.True(counterSample1 == counterSample2);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void CounterSample_GetHashCode()
{
CounterSample counterSample1 = new CounterSample(5, 0, 0, 1, 0, 0, PerformanceCounterType.CounterDelta32);
Expand Down
5 changes: 4 additions & 1 deletion src/libraries/System.Diagnostics.PerformanceCounter/tests/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
using System.IO;
using System.Threading;
using Xunit;

Expand All @@ -12,7 +13,9 @@ namespace System.Diagnostics.Tests
internal class Helpers
{
public static bool IsElevatedAndCanWriteToPerfCounters { get => AdminHelpers.IsProcessElevated() && CanWriteToPerfCounters; }
public static bool CanWriteToPerfCounters { get => PlatformDetection.IsNotWindowsNanoServer && PlatformDetection.IsNotArmNorArm64Process; }
public static bool IsElevatedAndCanWriteAndReadNetPerfCounters { get => AdminHelpers.IsProcessElevated() && CanWriteToPerfCounters && CanReadNetPerfCounters; }
public static bool CanWriteToPerfCounters { get => PlatformDetection.IsNotWindowsNanoServer; }
public static bool CanReadNetPerfCounters { get => File.Exists(Environment.SystemDirectory + Path.DirectorySeparatorChar + "netfxperf.dll"); }

public static string CreateCategory(string name, PerformanceCounterCategoryType categoryType)
{
Expand Down
22 changes: 11 additions & 11 deletions src/libraries/System.Diagnostics.PerformanceCounter/tests/InstanceDataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace System.Diagnostics.Tests
{
public static class InstanceDataTests
{
[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceData_CreateInstanceData_FromCounterSample()
{
long timestamp = DateTime.Now.ToFileTime();
Expand All @@ -22,7 +22,7 @@ public static void InstanceData_CreateInstanceData_FromCounterSample()
Assert.Equal(1, id.RawValue);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollection_GetItem_ExistingCounter()
{
InstanceDataCollection idc = GetInstanceDataCollection();
Expand All @@ -41,7 +41,7 @@ public static void InstanceDataCollection_GetItem_ExistingCounter()
}
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollection_NullTest()
{
InstanceDataCollection idc = GetInstanceDataCollection();
Expand All @@ -50,7 +50,7 @@ public static void InstanceDataCollection_NullTest()
Assert.Throws<ArgumentNullException>(() => idc.Contains(null));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollection_GetKeys()
{
InstanceDataCollection idc = GetInstanceDataCollection();
Expand All @@ -61,7 +61,7 @@ public static void InstanceDataCollection_GetKeys()
Assert.True(keys.Length > 0);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollection_GetValues()
{
InstanceDataCollection idc = GetInstanceDataCollection();
Expand All @@ -72,47 +72,47 @@ public static void InstanceDataCollection_GetValues()
Assert.True(values.Length > 0);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollectionCollection_GetItem_Invalid()
{
InstanceDataCollectionCollection idcc = GetInstanceDataCollectionCollection();

Assert.Throws<ArgumentNullException>(() => idcc[null]);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollectionCollection_GetKeys()
{
InstanceDataCollectionCollection idcc = GetInstanceDataCollectionCollection();

Assert.True(idcc.Keys.Count > 0);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollectionCollection_GetValues()
{
InstanceDataCollectionCollection idcc = GetInstanceDataCollectionCollection();

Assert.True(idcc.Values.Count > 0);
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollectionCollection_Contains_Valid()
{
InstanceDataCollectionCollection idcc = GetInstanceDataCollectionCollection();

Assert.False(idcc.Contains("Not a real instance"));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollectionCollection_Contains_inValid()
{
InstanceDataCollectionCollection idcc = GetInstanceDataCollectionCollection();

Assert.Throws<ArgumentNullException>(() => idcc.Contains(null));
}

[ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndCanWriteToPerfCounters))]
[Fact]
public static void InstanceDataCollectionCollection_CopyTo()
{
InstanceDataCollectionCollection idcc = GetInstanceDataCollectionCollection();
Expand Down
Loading