Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Sync PerformanceCounterLib #26475

Merged
stephentoub merged 11 commits into from
Mar 23, 2018
Merged

Sync PerformanceCounterLib #26475

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9c820bb
sync PerformanceCounterLib
MarcoRossignoli Jan 20, 2018
6af6105
add enclosing braces
MarcoRossignoli Feb 22, 2018
f18a355
address PR feedback
MarcoRossignoli Mar 7, 2018
33b961c
address PR feedback
MarcoRossignoli Mar 7, 2018
b39a24d
address PR feedback
MarcoRossignoli Mar 14, 2018
fe0b5e3
nit: trim spaces
MarcoRossignoli Mar 14, 2018
a9b3372
address PR feedback
MarcoRossignoli Mar 14, 2018
b0c84b7
address stephentoub PR feedback
MarcoRossignoli Mar 16, 2018
c24cf83
nit: tab
MarcoRossignoli Mar 16, 2018
eec8624
nit: tab
MarcoRossignoli Mar 16, 2018
fd0fb85
address PR feedback
MarcoRossignoli Mar 22, 2018
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
66 changes: 39 additions & 27 deletions src/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ internal class PerformanceCounterLib
private string _machineName;
private string _perfLcid;

private Hashtable _customCategoryTable;

private static volatile Hashtable s_libraryTable;
private Hashtable _customCategoryTable;
private Hashtable _categoryTable;
private Hashtable _nameTable;
private Hashtable _helpTable;
Expand Down Expand Up @@ -299,10 +300,17 @@ internal static void CloseAllLibraries()
{
if (s_libraryTable != null)
{
foreach (PerformanceCounterLib library in s_libraryTable.Values)
library.Close();
//race with GetPerformanceCounterLib
lock (InternalSyncObject)
{
if (s_libraryTable != null)
{
foreach (PerformanceCounterLib library in s_libraryTable.Values)
library.Close();

s_libraryTable = null;
s_libraryTable = null;
}
}
}
}

Expand Down Expand Up @@ -638,14 +646,14 @@ internal bool FindCustomCategory(string category, out PerformanceCounterCategory
RegistryKey baseKey = null;
categoryType = PerformanceCounterCategoryType.Unknown;

if (_customCategoryTable == null)
{
Interlocked.CompareExchange(ref _customCategoryTable, new Hashtable(StringComparer.OrdinalIgnoreCase), null);
}
Hashtable table =
_customCategoryTable ??
Interlocked.CompareExchange(ref _customCategoryTable, new Hashtable(StringComparer.OrdinalIgnoreCase), null) ??
_customCategoryTable;

if (_customCategoryTable.ContainsKey(category))
if (table.ContainsKey(category))
{
categoryType = (PerformanceCounterCategoryType)_customCategoryTable[category];
categoryType = (PerformanceCounterCategoryType)table[category];
return true;
}
else
Expand Down Expand Up @@ -674,7 +682,10 @@ internal bool FindCustomCategory(string category, out PerformanceCounterCategory
// In this case we return an 'Unknown' category type and 'false' to indicate the category is *not* custom.
//
categoryType = PerformanceCounterCategoryType.Unknown;
_customCategoryTable[category] = categoryType;
lock (table)
{
table[category] = categoryType;
}
return false;
}
}
Expand Down Expand Up @@ -702,8 +713,10 @@ internal bool FindCustomCategory(string category, out PerformanceCounterCategory
if (objectID != null)
{
int firstID = (int)objectID;

_customCategoryTable[category] = categoryType;
lock (table)
{
table[category] = categoryType;
}
return true;
}
}
Expand All @@ -717,6 +730,7 @@ internal bool FindCustomCategory(string category, out PerformanceCounterCategory
baseKey.Close();
}
}

return false;
}

Expand Down Expand Up @@ -974,24 +988,22 @@ internal static PerformanceCounterLib GetPerformanceCounterLib(string machineNam

machineName = (machineName == "." ? ComputerName : machineName).ToLowerInvariant();

if (PerformanceCounterLib.s_libraryTable == null)
//race with CloseAllLibraries
lock (InternalSyncObject)
{
lock (InternalSyncObject)
if (PerformanceCounterLib.s_libraryTable == null)
PerformanceCounterLib.s_libraryTable = new Hashtable();

string libraryKey = machineName + ":" + lcidString;
if (PerformanceCounterLib.s_libraryTable.Contains(libraryKey))
return (PerformanceCounterLib)PerformanceCounterLib.s_libraryTable[libraryKey];
else
{
if (PerformanceCounterLib.s_libraryTable == null)
PerformanceCounterLib.s_libraryTable = new Hashtable();
PerformanceCounterLib library = new PerformanceCounterLib(machineName, lcidString);
PerformanceCounterLib.s_libraryTable[libraryKey] = library;
return library;
}
}

string libraryKey = machineName + ":" + lcidString;
if (PerformanceCounterLib.s_libraryTable.Contains(libraryKey))
return (PerformanceCounterLib)PerformanceCounterLib.s_libraryTable[libraryKey];
else
{
PerformanceCounterLib library = new PerformanceCounterLib(machineName, lcidString);
PerformanceCounterLib.s_libraryTable[libraryKey] = library;
return library;
}
}

internal byte[] GetPerformanceData(string item)
Expand Down