diff options
author | Mike McLaughlin <mikem@microsoft.com> | 2019-05-22 21:28:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-22 21:28:49 -0700 |
commit | c9e4542b708304ce6ae9ecb5fc1c74a42d37d5b1 (patch) | |
tree | d57b49f64c1f76ad2d7715870715c998737b2f74 | |
parent | 7ea44a3d50963747d0471741d37e59ad1428f2ea (diff) | |
parent | 3195e80e0fa4171692a037b1e1b03963b3579fd9 (diff) | |
download | coreclr-c9e4542b708304ce6ae9ecb5fc1c74a42d37d5b1.tar.gz coreclr-c9e4542b708304ce6ae9ecb5fc1c74a42d37d5b1.tar.bz2 coreclr-c9e4542b708304ce6ae9ecb5fc1c74a42d37d5b1.zip |
Merge pull request #24734 from mikem8361/sosincs2
Add warning banner and sos threads -special fix
-rw-r--r-- | src/inc/predeftlsslot.h | 9 | ||||
-rw-r--r-- | src/inc/tls.h | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/inc/predeftlsslot.h b/src/inc/predeftlsslot.h index d8b53fd24d..919407f47a 100644 --- a/src/inc/predeftlsslot.h +++ b/src/inc/predeftlsslot.h @@ -7,6 +7,11 @@ #ifndef __PREDEFTLSSLOT_H__ #define __PREDEFTLSSLOT_H__ +// ****************************************************************************** +// WARNING!!!: These enums are used by SOS in the diagnostics repo. Values should +// added or removed in a backwards and forwards compatible way. +// See: https://github.com/dotnet/diagnostics/blob/master/src/inc/predeftlsslot.h +// ****************************************************************************** // And here are the predefined slots for accessing TLS from various DLLs of the CLR. // Note that we want to support combinations of Debug and Retail DLLs for testing @@ -20,6 +25,7 @@ enum PredefinedTlsSlots TlsIdx_JitLogEnv, TlsIdx_IceCap, TlsIdx_StressLog, + TlsIdx_CantStopCount, // Can't-stop counter for any thread TlsIdx_Check, TlsIdx_ForbidGCLoaderUseCount, TlsIdx_ClrDebugState, // Pointer to ClrDebugState* structure @@ -27,7 +33,6 @@ enum PredefinedTlsSlots // Add more indices here. TlsIdx_ThreadType, // bit flags to indicate special thread's type - TlsIdx_CantStopCount, // Can't-stop counter for any thread TlsIdx_OwnedCrstsChain, // slot to store the Crsts owned by this thread TlsIdx_AppDomainAgilePendingTable, TlsIdx_CantAllocCount, //Can't allocate memory on heap in this thread @@ -77,5 +82,7 @@ enum TlsThreadTypeFlag // flag used for thread type in Tls data ThreadType_GenericInstantiationCompare= 0x00020000, // Used to indicate that the thread is determining if a generic instantiation in an ngen image matches a lookup. }; +static_assert(TlsIdx_ThreadType == 11, "SOS in diagnostics repo has a dependency on this value."); + #endif diff --git a/src/inc/tls.h b/src/inc/tls.h index 429e41c151..e359a990e1 100644 --- a/src/inc/tls.h +++ b/src/inc/tls.h @@ -8,7 +8,10 @@ // Encapsulates TLS access for maximum performance. // - +// ************************************************************************************** +// WARNING!!!: These values are used by SOS in the diagnostics repo and need to the same. +// See: https://github.com/dotnet/diagnostics/blob/master/src/inc/tls.h +// ************************************************************************************** #ifndef __tls_h__ #define __tls_h__ |