Skip to content

System.Diagnostics.Tracing readonly annotation#51787

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

Closed
hrrrrustic wants to merge 1 commit into from
Closed

System.Diagnostics.Tracing readonly annotation #51787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class ActivityTagsCollection : System.Collections.Generic.IDictionary<str

public struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object?>>, System.Collections.IEnumerator
{
public System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
public readonly System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
object System.Collections.IEnumerator.Current { get { throw null; } }
public void Dispose() { throw null; }
public bool MoveNext() { throw null; }
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1674,7 +1674,7 @@ public Enumerator(LinkedListNode<T>? head)
_currentItem = default;
}

public T Current => _currentItem!;
public readonly T Current => _currentItem!;

object? IEnumerator.Current => Current;

Expand Down
2 changes: 1 addition & 1 deletion ...ries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityTagsCollection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ public struct Enumerator : IEnumerator<KeyValuePair<string, object?>>, IEnumerat
private List<KeyValuePair<string, object?>>.Enumerator _enumerator;
internal Enumerator(List<KeyValuePair<string, object?>> list) => _enumerator = list.GetEnumerator();

public KeyValuePair<string, object?> Current => _enumerator.Current;
public readonly KeyValuePair<string, object?> Current => _enumerator.Current;
object IEnumerator.Current => ((IEnumerator)_enumerator).Current;
public void Dispose() => _enumerator.Dispose();
public bool MoveNext() => _enumerator.MoveNext();
Expand Down
14 changes: 7 additions & 7 deletions src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -218,8 +218,8 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, System.Gu
protected internal partial struct EventData
{
private int _dummyPrimitive;
public System.IntPtr DataPointer { get { throw null; } set { } }
public int Size { get { throw null; } set { } }
public System.IntPtr DataPointer { readonly get { throw null; } set { } }
public int Size { readonly get { throw null; } set { } }
}
}
[System.AttributeUsageAttribute(System.AttributeTargets.Class)]
Expand All@@ -246,11 +246,11 @@ public EventSourceException(string? message, System.Exception? innerException) {
public partial struct EventSourceOptions
{
private int _dummyPrimitive;
public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { get { throw null; } set { } }
public System.Diagnostics.Tracing.EventKeywords Keywords { get { throw null; } set { } }
public System.Diagnostics.Tracing.EventLevel Level { get { throw null; } set { } }
public System.Diagnostics.Tracing.EventOpcode Opcode { get { throw null; } set { } }
public System.Diagnostics.Tracing.EventTags Tags { get { throw null; } set { } }
public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { readonly get { throw null; } set { } }
public System.Diagnostics.Tracing.EventKeywords Keywords { readonly get { throw null; } set { } }
public System.Diagnostics.Tracing.EventLevel Level { readonly get { throw null; } set { } }
public System.Diagnostics.Tracing.EventOpcode Opcode { readonly get { throw null; } set { } }
public System.Diagnostics.Tracing.EventTags Tags { readonly get { throw null; } set { } }
}
[System.FlagsAttribute]
public enum EventSourceSettings
Expand Down
22 changes: 11 additions & 11 deletions src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventDescriptor.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,23 +94,23 @@ long keywords
m_task = (ushort)task;
}

public int EventId => m_id;
public byte Version => m_version;
public byte Channel => m_channel;
public byte Level => m_level;
public byte Opcode => m_opcode;
public int Task => m_task;
public long Keywords => m_keywords;
public readonly int EventId => m_id;
public readonly byte Version => m_version;
public readonly byte Channel => m_channel;
public readonly byte Level => m_level;
public readonly byte Opcode => m_opcode;
public readonly int Task => m_task;
public readonly long Keywords => m_keywords;

internal int TraceLoggingId => m_traceloggingId;
internal readonly int TraceLoggingId => m_traceloggingId;

public override bool Equals([NotNullWhen(true)] object? obj) =>
public override readonly bool Equals([NotNullWhen(true)] object? obj) =>
obj is EventDescriptor ed && Equals(ed);

public override int GetHashCode() =>
public override readonly int GetHashCode() =>
m_id ^ m_version ^ m_channel ^ m_level ^ m_opcode ^ m_task ^ (int)m_keywords;

public bool Equals(EventDescriptor other) =>
public readonly bool Equals(EventDescriptor other) =>
m_id == other.m_id &&
m_version == other.m_version &&
m_channel == other.m_channel &&
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1178,7 +1178,7 @@ protected internal struct EventData
/// </summary>
public unsafe IntPtr DataPointer
{
get => (IntPtr)(void*)m_Ptr;
readonly get => (IntPtr)(void*)m_Ptr;
set => m_Ptr = unchecked((ulong)(void*)value);
}

Expand All@@ -1187,7 +1187,7 @@ public unsafe IntPtr DataPointer
/// </summary>
public int Size
{
get => m_Size;
readonly get => m_Size;
set => m_Size = value;
}

Expand All@@ -1197,7 +1197,7 @@ public int Size
/// </summary>
internal int Reserved
{
get => m_Reserved;
readonly get => m_Reserved;
set => m_Reserved = value;
}

Expand DownExpand Up@@ -5054,7 +5054,7 @@ public SessionMask(SessionMask m)
public SessionMask(uint mask = 0)
{ m_mask = mask & MASK; }

public bool IsEqualOrSupersetOf(SessionMask m)
public readonly bool IsEqualOrSupersetOf(SessionMask m)
{
return (this.m_mask | m.m_mask) == this.m_mask;
}
Expand All@@ -5067,7 +5067,7 @@ public static SessionMask FromId(int perEventSourceSessionId)
return new SessionMask((uint)1 << perEventSourceSessionId);
}

public ulong ToEventKeywords()
public readonly ulong ToEventKeywords()
{
return (ulong)m_mask << SHIFT_SESSION_TO_KEYWORD;
}
Expand Down
2 changes: 1 addition & 1 deletion ...aries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ internal struct ConcurrentSet<KeyType, ItemType>
{
private ItemType[]? items;

public ItemType? TryGet(KeyType key)
public readonly ItemType? TryGet(KeyType key)
{
ItemType? item;
ItemType[]? oldItems = this.items;
Expand Down
12 changes: 6 additions & 6 deletions .../System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public struct EventSourceOptions
/// </summary>
public EventLevel Level
{
get => (EventLevel)this.level;
readonly get => (EventLevel)this.level;
set
{
this.level = checked((byte)value);
Expand All@@ -51,23 +51,23 @@ public EventLevel Level
/// </summary>
public EventOpcode Opcode
{
get => (EventOpcode)this.opcode;
readonly get => (EventOpcode)this.opcode;
set
{
this.opcode = checked((byte)value);
this.valuesSet |= opcodeSet;
}
}

internal bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;
internal readonly bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;

/// <summary>
/// Gets or sets the keywords to use for the specified event. If this
/// property is unset, the event's keywords will be 0.
/// </summary>
public EventKeywords Keywords
{
get => this.keywords;
readonly get => this.keywords;
set
{
this.keywords = value;
Expand All@@ -81,7 +81,7 @@ public EventKeywords Keywords
/// </summary>
public EventTags Tags
{
get => this.tags;
readonly get => this.tags;
set
{
this.tags = value;
Expand All@@ -95,7 +95,7 @@ public EventTags Tags
/// </summary>
public EventActivityOptions ActivityOptions
{
get => this.activityOptions;
readonly get => this.activityOptions;
set
{
this.activityOptions = value;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
System.Diagnostics.Tracing readonly annotation by hrrrrustic · Pull Request #51787 · dotnet/runtime · GitHub
Skip to content
System.Diagnostics.Tracing readonly annotation#51787

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Diagnostics.Tracing readonly annotation
#51787
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class ActivityTagsCollection : System.Collections.Generic.IDictionary<str

 public struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object?>>, System.Collections.IEnumerator
 {
 public System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 public readonly System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 object System.Collections.IEnumerator.Current { get { throw null; } }
 public void Dispose() { throw null; }
 public bool MoveNext() { throw null; }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1674,7 +1674,7 @@ public Enumerator(LinkedListNode<T>? head)
 _currentItem = default;
 }

 public T Current => _currentItem!;
 public readonly T Current => _currentItem!;

 object? IEnumerator.Current => Current;

Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityTagsCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ public struct Enumerator : IEnumerator<KeyValuePair<string, object?>>, IEnumerat
 private List<KeyValuePair<string, object?>>.Enumerator _enumerator;
 internal Enumerator(List<KeyValuePair<string, object?>> list) => _enumerator = list.GetEnumerator();

 public KeyValuePair<string, object?> Current => _enumerator.Current;
 public readonly KeyValuePair<string, object?> Current => _enumerator.Current;
 object IEnumerator.Current => ((IEnumerator)_enumerator).Current;
 public void Dispose() => _enumerator.Dispose();
 public bool MoveNext() => _enumerator.MoveNext();
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -218,8 +218,8 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, System.Gu
 protected internal partial struct EventData
 {
 private int _dummyPrimitive;
 public System.IntPtr DataPointer { get { throw null; } set { } }
 public int Size { get { throw null; } set { } }
 public System.IntPtr DataPointer { readonly get { throw null; } set { } }
 public int Size { readonly get { throw null; } set { } }
 }
 }
 [System.AttributeUsageAttribute(System.AttributeTargets.Class)]
Expand All@@ -246,11 +246,11 @@ public EventSourceException(string? message, System.Exception? innerException) {
 public partial struct EventSourceOptions
 {
 private int _dummyPrimitive;
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { readonly get { throw null; } set { } }
 }
 [System.FlagsAttribute]
 public enum EventSourceSettings
Expand Down

22 changes: 11 additions & 11 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventDescriptor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,23 +94,23 @@ long keywords
 m_task = (ushort)task;
 }

 public int EventId => m_id;
 public byte Version => m_version;
 public byte Channel => m_channel;
 public byte Level => m_level;
 public byte Opcode => m_opcode;
 public int Task => m_task;
 public long Keywords => m_keywords;
 public readonly int EventId => m_id;
 public readonly byte Version => m_version;
 public readonly byte Channel => m_channel;
 public readonly byte Level => m_level;
 public readonly byte Opcode => m_opcode;
 public readonly int Task => m_task;
 public readonly long Keywords => m_keywords;

 internal int TraceLoggingId => m_traceloggingId;
 internal readonly int TraceLoggingId => m_traceloggingId;

 public override bool Equals([NotNullWhen(true)] object? obj) =>
 public override readonly bool Equals([NotNullWhen(true)] object? obj) =>
 obj is EventDescriptor ed && Equals(ed);

 public override int GetHashCode() =>
 public override readonly int GetHashCode() =>
 m_id ^ m_version ^ m_channel ^ m_level ^ m_opcode ^ m_task ^ (int)m_keywords;

 public bool Equals(EventDescriptor other) =>
 public readonly bool Equals(EventDescriptor other) =>
 m_id == other.m_id &&
 m_version == other.m_version &&
 m_channel == other.m_channel &&
Expand Down

10 changes: 5 additions & 5 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1178,7 +1178,7 @@ protected internal struct EventData
 /// </summary>
 public unsafe IntPtr DataPointer
 {
 get => (IntPtr)(void*)m_Ptr;
readonly get => (IntPtr)(void*)m_Ptr;
 set => m_Ptr = unchecked((ulong)(void*)value);
 }

Expand All@@ -1187,7 +1187,7 @@ public unsafe IntPtr DataPointer
 /// </summary>
 public int Size
 {
 get => m_Size;
readonly get => m_Size;
 set => m_Size = value;
 }

Expand All@@ -1197,7 +1197,7 @@ public int Size
 /// </summary>
 internal int Reserved
 {
 get => m_Reserved;
readonly get => m_Reserved;
 set => m_Reserved = value;
 }

Expand DownExpand Up@@ -5054,7 +5054,7 @@ public SessionMask(SessionMask m)
 public SessionMask(uint mask = 0)
 { m_mask = mask & MASK; }

 public bool IsEqualOrSupersetOf(SessionMask m)
 public readonly bool IsEqualOrSupersetOf(SessionMask m)
 {
 return (this.m_mask | m.m_mask) == this.m_mask;
 }
Expand All@@ -5067,7 +5067,7 @@ public static SessionMask FromId(int perEventSourceSessionId)
 return new SessionMask((uint)1 << perEventSourceSessionId);
 }

 public ulong ToEventKeywords()
 public readonly ulong ToEventKeywords()
 {
 return (ulong)m_mask << SHIFT_SESSION_TO_KEYWORD;
 }
Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ internal struct ConcurrentSet<KeyType, ItemType>
 {
 private ItemType[]? items;

 public ItemType? TryGet(KeyType key)
 public readonly ItemType? TryGet(KeyType key)
 {
 ItemType? item;
 ItemType[]? oldItems = this.items;
Expand Down

12 changes: 6 additions & 6 deletions
.../System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public struct EventSourceOptions
 /// </summary>
 public EventLevel Level
 {
 get => (EventLevel)this.level;
readonly get => (EventLevel)this.level;
 set
 {
 this.level = checked((byte)value);
Expand All@@ -51,23 +51,23 @@ public EventLevel Level
 /// </summary>
 public EventOpcode Opcode
 {
 get => (EventOpcode)this.opcode;
readonly get => (EventOpcode)this.opcode;
 set
 {
 this.opcode = checked((byte)value);
 this.valuesSet |= opcodeSet;
 }
 }

 internal bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;
 internal readonly bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;

 /// <summary>
 /// Gets or sets the keywords to use for the specified event. If this
 /// property is unset, the event's keywords will be 0.
 /// </summary>
 public EventKeywords Keywords
 {
 get => this.keywords;
readonly get => this.keywords;
 set
 {
 this.keywords = value;
Expand All@@ -81,7 +81,7 @@ public EventKeywords Keywords
 /// </summary>
 public EventTags Tags
 {
 get => this.tags;
readonly get => this.tags;
 set
 {
 this.tags = value;
Expand All@@ -95,7 +95,7 @@ public EventTags Tags
 /// </summary>
 public EventActivityOptions ActivityOptions
 {
 get => this.activityOptions;
readonly get => this.activityOptions;
 set
 {
 this.activityOptions = value;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
System.Diagnostics.Tracing readonly annotation by hrrrrustic · Pull Request #51787 · dotnet/runtime · GitHub
Skip to content
System.Diagnostics.Tracing readonly annotation#51787

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Diagnostics.Tracing readonly annotation
#51787
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class ActivityTagsCollection : System.Collections.Generic.IDictionary<str

 public struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object?>>, System.Collections.IEnumerator
 {
 public System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 public readonly System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 object System.Collections.IEnumerator.Current { get { throw null; } }
 public void Dispose() { throw null; }
 public bool MoveNext() { throw null; }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1674,7 +1674,7 @@ public Enumerator(LinkedListNode<T>? head)
 _currentItem = default;
 }

 public T Current => _currentItem!;
 public readonly T Current => _currentItem!;

 object? IEnumerator.Current => Current;

Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityTagsCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ public struct Enumerator : IEnumerator<KeyValuePair<string, object?>>, IEnumerat
 private List<KeyValuePair<string, object?>>.Enumerator _enumerator;
 internal Enumerator(List<KeyValuePair<string, object?>> list) => _enumerator = list.GetEnumerator();

 public KeyValuePair<string, object?> Current => _enumerator.Current;
 public readonly KeyValuePair<string, object?> Current => _enumerator.Current;
 object IEnumerator.Current => ((IEnumerator)_enumerator).Current;
 public void Dispose() => _enumerator.Dispose();
 public bool MoveNext() => _enumerator.MoveNext();
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -218,8 +218,8 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, System.Gu
 protected internal partial struct EventData
 {
 private int _dummyPrimitive;
 public System.IntPtr DataPointer { get { throw null; } set { } }
 public int Size { get { throw null; } set { } }
 public System.IntPtr DataPointer { readonly get { throw null; } set { } }
 public int Size { readonly get { throw null; } set { } }
 }
 }
 [System.AttributeUsageAttribute(System.AttributeTargets.Class)]
Expand All@@ -246,11 +246,11 @@ public EventSourceException(string? message, System.Exception? innerException) {
 public partial struct EventSourceOptions
 {
 private int _dummyPrimitive;
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { readonly get { throw null; } set { } }
 }
 [System.FlagsAttribute]
 public enum EventSourceSettings
Expand Down

22 changes: 11 additions & 11 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventDescriptor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,23 +94,23 @@ long keywords
 m_task = (ushort)task;
 }

 public int EventId => m_id;
 public byte Version => m_version;
 public byte Channel => m_channel;
 public byte Level => m_level;
 public byte Opcode => m_opcode;
 public int Task => m_task;
 public long Keywords => m_keywords;
 public readonly int EventId => m_id;
 public readonly byte Version => m_version;
 public readonly byte Channel => m_channel;
 public readonly byte Level => m_level;
 public readonly byte Opcode => m_opcode;
 public readonly int Task => m_task;
 public readonly long Keywords => m_keywords;

 internal int TraceLoggingId => m_traceloggingId;
 internal readonly int TraceLoggingId => m_traceloggingId;

 public override bool Equals([NotNullWhen(true)] object? obj) =>
 public override readonly bool Equals([NotNullWhen(true)] object? obj) =>
 obj is EventDescriptor ed && Equals(ed);

 public override int GetHashCode() =>
 public override readonly int GetHashCode() =>
 m_id ^ m_version ^ m_channel ^ m_level ^ m_opcode ^ m_task ^ (int)m_keywords;

 public bool Equals(EventDescriptor other) =>
 public readonly bool Equals(EventDescriptor other) =>
 m_id == other.m_id &&
 m_version == other.m_version &&
 m_channel == other.m_channel &&
Expand Down

10 changes: 5 additions & 5 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1178,7 +1178,7 @@ protected internal struct EventData
 /// </summary>
 public unsafe IntPtr DataPointer
 {
 get => (IntPtr)(void*)m_Ptr;
readonly get => (IntPtr)(void*)m_Ptr;
 set => m_Ptr = unchecked((ulong)(void*)value);
 }

Expand All@@ -1187,7 +1187,7 @@ public unsafe IntPtr DataPointer
 /// </summary>
 public int Size
 {
 get => m_Size;
readonly get => m_Size;
 set => m_Size = value;
 }

Expand All@@ -1197,7 +1197,7 @@ public int Size
 /// </summary>
 internal int Reserved
 {
 get => m_Reserved;
readonly get => m_Reserved;
 set => m_Reserved = value;
 }

Expand DownExpand Up@@ -5054,7 +5054,7 @@ public SessionMask(SessionMask m)
 public SessionMask(uint mask = 0)
 { m_mask = mask & MASK; }

 public bool IsEqualOrSupersetOf(SessionMask m)
 public readonly bool IsEqualOrSupersetOf(SessionMask m)
 {
 return (this.m_mask | m.m_mask) == this.m_mask;
 }
Expand All@@ -5067,7 +5067,7 @@ public static SessionMask FromId(int perEventSourceSessionId)
 return new SessionMask((uint)1 << perEventSourceSessionId);
 }

 public ulong ToEventKeywords()
 public readonly ulong ToEventKeywords()
 {
 return (ulong)m_mask << SHIFT_SESSION_TO_KEYWORD;
 }
Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ internal struct ConcurrentSet<KeyType, ItemType>
 {
 private ItemType[]? items;

 public ItemType? TryGet(KeyType key)
 public readonly ItemType? TryGet(KeyType key)
 {
 ItemType? item;
 ItemType[]? oldItems = this.items;
Expand Down

12 changes: 6 additions & 6 deletions
.../System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public struct EventSourceOptions
 /// </summary>
 public EventLevel Level
 {
 get => (EventLevel)this.level;
readonly get => (EventLevel)this.level;
 set
 {
 this.level = checked((byte)value);
Expand All@@ -51,23 +51,23 @@ public EventLevel Level
 /// </summary>
 public EventOpcode Opcode
 {
 get => (EventOpcode)this.opcode;
readonly get => (EventOpcode)this.opcode;
 set
 {
 this.opcode = checked((byte)value);
 this.valuesSet |= opcodeSet;
 }
 }

 internal bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;
 internal readonly bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;

 /// <summary>
 /// Gets or sets the keywords to use for the specified event. If this
 /// property is unset, the event's keywords will be 0.
 /// </summary>
 public EventKeywords Keywords
 {
 get => this.keywords;
readonly get => this.keywords;
 set
 {
 this.keywords = value;
Expand All@@ -81,7 +81,7 @@ public EventKeywords Keywords
 /// </summary>
 public EventTags Tags
 {
 get => this.tags;
readonly get => this.tags;
 set
 {
 this.tags = value;
Expand All@@ -95,7 +95,7 @@ public EventTags Tags
 /// </summary>
 public EventActivityOptions ActivityOptions
 {
 get => this.activityOptions;
readonly get => this.activityOptions;
 set
 {
 this.activityOptions = value;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
System.Diagnostics.Tracing readonly annotation by hrrrrustic · Pull Request #51787 · dotnet/runtime · GitHub
Skip to content
System.Diagnostics.Tracing readonly annotation#51787

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Diagnostics.Tracing readonly annotation
#51787
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class ActivityTagsCollection : System.Collections.Generic.IDictionary<str

 public struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object?>>, System.Collections.IEnumerator
 {
 public System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 public readonly System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 object System.Collections.IEnumerator.Current { get { throw null; } }
 public void Dispose() { throw null; }
 public bool MoveNext() { throw null; }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1674,7 +1674,7 @@ public Enumerator(LinkedListNode<T>? head)
 _currentItem = default;
 }

 public T Current => _currentItem!;
 public readonly T Current => _currentItem!;

 object? IEnumerator.Current => Current;

Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityTagsCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ public struct Enumerator : IEnumerator<KeyValuePair<string, object?>>, IEnumerat
 private List<KeyValuePair<string, object?>>.Enumerator _enumerator;
 internal Enumerator(List<KeyValuePair<string, object?>> list) => _enumerator = list.GetEnumerator();

 public KeyValuePair<string, object?> Current => _enumerator.Current;
 public readonly KeyValuePair<string, object?> Current => _enumerator.Current;
 object IEnumerator.Current => ((IEnumerator)_enumerator).Current;
 public void Dispose() => _enumerator.Dispose();
 public bool MoveNext() => _enumerator.MoveNext();
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -218,8 +218,8 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, System.Gu
 protected internal partial struct EventData
 {
 private int _dummyPrimitive;
 public System.IntPtr DataPointer { get { throw null; } set { } }
 public int Size { get { throw null; } set { } }
 public System.IntPtr DataPointer { readonly get { throw null; } set { } }
 public int Size { readonly get { throw null; } set { } }
 }
 }
 [System.AttributeUsageAttribute(System.AttributeTargets.Class)]
Expand All@@ -246,11 +246,11 @@ public EventSourceException(string? message, System.Exception? innerException) {
 public partial struct EventSourceOptions
 {
 private int _dummyPrimitive;
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { readonly get { throw null; } set { } }
 }
 [System.FlagsAttribute]
 public enum EventSourceSettings
Expand Down

22 changes: 11 additions & 11 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventDescriptor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,23 +94,23 @@ long keywords
 m_task = (ushort)task;
 }

 public int EventId => m_id;
 public byte Version => m_version;
 public byte Channel => m_channel;
 public byte Level => m_level;
 public byte Opcode => m_opcode;
 public int Task => m_task;
 public long Keywords => m_keywords;
 public readonly int EventId => m_id;
 public readonly byte Version => m_version;
 public readonly byte Channel => m_channel;
 public readonly byte Level => m_level;
 public readonly byte Opcode => m_opcode;
 public readonly int Task => m_task;
 public readonly long Keywords => m_keywords;

 internal int TraceLoggingId => m_traceloggingId;
 internal readonly int TraceLoggingId => m_traceloggingId;

 public override bool Equals([NotNullWhen(true)] object? obj) =>
 public override readonly bool Equals([NotNullWhen(true)] object? obj) =>
 obj is EventDescriptor ed && Equals(ed);

 public override int GetHashCode() =>
 public override readonly int GetHashCode() =>
 m_id ^ m_version ^ m_channel ^ m_level ^ m_opcode ^ m_task ^ (int)m_keywords;

 public bool Equals(EventDescriptor other) =>
 public readonly bool Equals(EventDescriptor other) =>
 m_id == other.m_id &&
 m_version == other.m_version &&
 m_channel == other.m_channel &&
Expand Down

10 changes: 5 additions & 5 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1178,7 +1178,7 @@ protected internal struct EventData
 /// </summary>
 public unsafe IntPtr DataPointer
 {
 get => (IntPtr)(void*)m_Ptr;
readonly get => (IntPtr)(void*)m_Ptr;
 set => m_Ptr = unchecked((ulong)(void*)value);
 }

Expand All@@ -1187,7 +1187,7 @@ public unsafe IntPtr DataPointer
 /// </summary>
 public int Size
 {
 get => m_Size;
readonly get => m_Size;
 set => m_Size = value;
 }

Expand All@@ -1197,7 +1197,7 @@ public int Size
 /// </summary>
 internal int Reserved
 {
 get => m_Reserved;
readonly get => m_Reserved;
 set => m_Reserved = value;
 }

Expand DownExpand Up@@ -5054,7 +5054,7 @@ public SessionMask(SessionMask m)
 public SessionMask(uint mask = 0)
 { m_mask = mask & MASK; }

 public bool IsEqualOrSupersetOf(SessionMask m)
 public readonly bool IsEqualOrSupersetOf(SessionMask m)
 {
 return (this.m_mask | m.m_mask) == this.m_mask;
 }
Expand All@@ -5067,7 +5067,7 @@ public static SessionMask FromId(int perEventSourceSessionId)
 return new SessionMask((uint)1 << perEventSourceSessionId);
 }

 public ulong ToEventKeywords()
 public readonly ulong ToEventKeywords()
 {
 return (ulong)m_mask << SHIFT_SESSION_TO_KEYWORD;
 }
Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ internal struct ConcurrentSet<KeyType, ItemType>
 {
 private ItemType[]? items;

 public ItemType? TryGet(KeyType key)
 public readonly ItemType? TryGet(KeyType key)
 {
 ItemType? item;
 ItemType[]? oldItems = this.items;
Expand Down

12 changes: 6 additions & 6 deletions
.../System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public struct EventSourceOptions
 /// </summary>
 public EventLevel Level
 {
 get => (EventLevel)this.level;
readonly get => (EventLevel)this.level;
 set
 {
 this.level = checked((byte)value);
Expand All@@ -51,23 +51,23 @@ public EventLevel Level
 /// </summary>
 public EventOpcode Opcode
 {
 get => (EventOpcode)this.opcode;
readonly get => (EventOpcode)this.opcode;
 set
 {
 this.opcode = checked((byte)value);
 this.valuesSet |= opcodeSet;
 }
 }

 internal bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;
 internal readonly bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;

 /// <summary>
 /// Gets or sets the keywords to use for the specified event. If this
 /// property is unset, the event's keywords will be 0.
 /// </summary>
 public EventKeywords Keywords
 {
 get => this.keywords;
readonly get => this.keywords;
 set
 {
 this.keywords = value;
Expand All@@ -81,7 +81,7 @@ public EventKeywords Keywords
 /// </summary>
 public EventTags Tags
 {
 get => this.tags;
readonly get => this.tags;
 set
 {
 this.tags = value;
Expand All@@ -95,7 +95,7 @@ public EventTags Tags
 /// </summary>
 public EventActivityOptions ActivityOptions
 {
 get => this.activityOptions;
readonly get => this.activityOptions;
 set
 {
 this.activityOptions = value;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
System.Diagnostics.Tracing readonly annotation by hrrrrustic · Pull Request #51787 · dotnet/runtime · GitHub
Skip to content
System.Diagnostics.Tracing readonly annotation#51787

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Diagnostics.Tracing readonly annotation
#51787
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class ActivityTagsCollection : System.Collections.Generic.IDictionary<str

 public struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object?>>, System.Collections.IEnumerator
 {
 public System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 public readonly System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 object System.Collections.IEnumerator.Current { get { throw null; } }
 public void Dispose() { throw null; }
 public bool MoveNext() { throw null; }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1674,7 +1674,7 @@ public Enumerator(LinkedListNode<T>? head)
 _currentItem = default;
 }

 public T Current => _currentItem!;
 public readonly T Current => _currentItem!;

 object? IEnumerator.Current => Current;

Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityTagsCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ public struct Enumerator : IEnumerator<KeyValuePair<string, object?>>, IEnumerat
 private List<KeyValuePair<string, object?>>.Enumerator _enumerator;
 internal Enumerator(List<KeyValuePair<string, object?>> list) => _enumerator = list.GetEnumerator();

 public KeyValuePair<string, object?> Current => _enumerator.Current;
 public readonly KeyValuePair<string, object?> Current => _enumerator.Current;
 object IEnumerator.Current => ((IEnumerator)_enumerator).Current;
 public void Dispose() => _enumerator.Dispose();
 public bool MoveNext() => _enumerator.MoveNext();
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -218,8 +218,8 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, System.Gu
 protected internal partial struct EventData
 {
 private int _dummyPrimitive;
 public System.IntPtr DataPointer { get { throw null; } set { } }
 public int Size { get { throw null; } set { } }
 public System.IntPtr DataPointer { readonly get { throw null; } set { } }
 public int Size { readonly get { throw null; } set { } }
 }
 }
 [System.AttributeUsageAttribute(System.AttributeTargets.Class)]
Expand All@@ -246,11 +246,11 @@ public EventSourceException(string? message, System.Exception? innerException) {
 public partial struct EventSourceOptions
 {
 private int _dummyPrimitive;
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { readonly get { throw null; } set { } }
 }
 [System.FlagsAttribute]
 public enum EventSourceSettings
Expand Down

22 changes: 11 additions & 11 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventDescriptor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,23 +94,23 @@ long keywords
 m_task = (ushort)task;
 }

 public int EventId => m_id;
 public byte Version => m_version;
 public byte Channel => m_channel;
 public byte Level => m_level;
 public byte Opcode => m_opcode;
 public int Task => m_task;
 public long Keywords => m_keywords;
 public readonly int EventId => m_id;
 public readonly byte Version => m_version;
 public readonly byte Channel => m_channel;
 public readonly byte Level => m_level;
 public readonly byte Opcode => m_opcode;
 public readonly int Task => m_task;
 public readonly long Keywords => m_keywords;

 internal int TraceLoggingId => m_traceloggingId;
 internal readonly int TraceLoggingId => m_traceloggingId;

 public override bool Equals([NotNullWhen(true)] object? obj) =>
 public override readonly bool Equals([NotNullWhen(true)] object? obj) =>
 obj is EventDescriptor ed && Equals(ed);

 public override int GetHashCode() =>
 public override readonly int GetHashCode() =>
 m_id ^ m_version ^ m_channel ^ m_level ^ m_opcode ^ m_task ^ (int)m_keywords;

 public bool Equals(EventDescriptor other) =>
 public readonly bool Equals(EventDescriptor other) =>
 m_id == other.m_id &&
 m_version == other.m_version &&
 m_channel == other.m_channel &&
Expand Down

10 changes: 5 additions & 5 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1178,7 +1178,7 @@ protected internal struct EventData
 /// </summary>
 public unsafe IntPtr DataPointer
 {
 get => (IntPtr)(void*)m_Ptr;
readonly get => (IntPtr)(void*)m_Ptr;
 set => m_Ptr = unchecked((ulong)(void*)value);
 }

Expand All@@ -1187,7 +1187,7 @@ public unsafe IntPtr DataPointer
 /// </summary>
 public int Size
 {
 get => m_Size;
readonly get => m_Size;
 set => m_Size = value;
 }

Expand All@@ -1197,7 +1197,7 @@ public int Size
 /// </summary>
 internal int Reserved
 {
 get => m_Reserved;
readonly get => m_Reserved;
 set => m_Reserved = value;
 }

Expand DownExpand Up@@ -5054,7 +5054,7 @@ public SessionMask(SessionMask m)
 public SessionMask(uint mask = 0)
 { m_mask = mask & MASK; }

 public bool IsEqualOrSupersetOf(SessionMask m)
 public readonly bool IsEqualOrSupersetOf(SessionMask m)
 {
 return (this.m_mask | m.m_mask) == this.m_mask;
 }
Expand All@@ -5067,7 +5067,7 @@ public static SessionMask FromId(int perEventSourceSessionId)
 return new SessionMask((uint)1 << perEventSourceSessionId);
 }

 public ulong ToEventKeywords()
 public readonly ulong ToEventKeywords()
 {
 return (ulong)m_mask << SHIFT_SESSION_TO_KEYWORD;
 }
Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ internal struct ConcurrentSet<KeyType, ItemType>
 {
 private ItemType[]? items;

 public ItemType? TryGet(KeyType key)
 public readonly ItemType? TryGet(KeyType key)
 {
 ItemType? item;
 ItemType[]? oldItems = this.items;
Expand Down

12 changes: 6 additions & 6 deletions
.../System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public struct EventSourceOptions
 /// </summary>
 public EventLevel Level
 {
 get => (EventLevel)this.level;
readonly get => (EventLevel)this.level;
 set
 {
 this.level = checked((byte)value);
Expand All@@ -51,23 +51,23 @@ public EventLevel Level
 /// </summary>
 public EventOpcode Opcode
 {
 get => (EventOpcode)this.opcode;
readonly get => (EventOpcode)this.opcode;
 set
 {
 this.opcode = checked((byte)value);
 this.valuesSet |= opcodeSet;
 }
 }

 internal bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;
 internal readonly bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;

 /// <summary>
 /// Gets or sets the keywords to use for the specified event. If this
 /// property is unset, the event's keywords will be 0.
 /// </summary>
 public EventKeywords Keywords
 {
 get => this.keywords;
readonly get => this.keywords;
 set
 {
 this.keywords = value;
Expand All@@ -81,7 +81,7 @@ public EventKeywords Keywords
 /// </summary>
 public EventTags Tags
 {
 get => this.tags;
readonly get => this.tags;
 set
 {
 this.tags = value;
Expand All@@ -95,7 +95,7 @@ public EventTags Tags
 /// </summary>
 public EventActivityOptions ActivityOptions
 {
 get => this.activityOptions;
readonly get => this.activityOptions;
 set
 {
 this.activityOptions = value;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
System.Diagnostics.Tracing readonly annotation by hrrrrustic · Pull Request #51787 · dotnet/runtime · GitHub
Skip to content
System.Diagnostics.Tracing readonly annotation#51787

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Diagnostics.Tracing readonly annotation
#51787
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class ActivityTagsCollection : System.Collections.Generic.IDictionary<str

 public struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object?>>, System.Collections.IEnumerator
 {
 public System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 public readonly System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 object System.Collections.IEnumerator.Current { get { throw null; } }
 public void Dispose() { throw null; }
 public bool MoveNext() { throw null; }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1674,7 +1674,7 @@ public Enumerator(LinkedListNode<T>? head)
 _currentItem = default;
 }

 public T Current => _currentItem!;
 public readonly T Current => _currentItem!;

 object? IEnumerator.Current => Current;

Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityTagsCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ public struct Enumerator : IEnumerator<KeyValuePair<string, object?>>, IEnumerat
 private List<KeyValuePair<string, object?>>.Enumerator _enumerator;
 internal Enumerator(List<KeyValuePair<string, object?>> list) => _enumerator = list.GetEnumerator();

 public KeyValuePair<string, object?> Current => _enumerator.Current;
 public readonly KeyValuePair<string, object?> Current => _enumerator.Current;
 object IEnumerator.Current => ((IEnumerator)_enumerator).Current;
 public void Dispose() => _enumerator.Dispose();
 public bool MoveNext() => _enumerator.MoveNext();
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -218,8 +218,8 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, System.Gu
 protected internal partial struct EventData
 {
 private int _dummyPrimitive;
 public System.IntPtr DataPointer { get { throw null; } set { } }
 public int Size { get { throw null; } set { } }
 public System.IntPtr DataPointer { readonly get { throw null; } set { } }
 public int Size { readonly get { throw null; } set { } }
 }
 }
 [System.AttributeUsageAttribute(System.AttributeTargets.Class)]
Expand All@@ -246,11 +246,11 @@ public EventSourceException(string? message, System.Exception? innerException) {
 public partial struct EventSourceOptions
 {
 private int _dummyPrimitive;
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { readonly get { throw null; } set { } }
 }
 [System.FlagsAttribute]
 public enum EventSourceSettings
Expand Down

22 changes: 11 additions & 11 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventDescriptor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,23 +94,23 @@ long keywords
 m_task = (ushort)task;
 }

 public int EventId => m_id;
 public byte Version => m_version;
 public byte Channel => m_channel;
 public byte Level => m_level;
 public byte Opcode => m_opcode;
 public int Task => m_task;
 public long Keywords => m_keywords;
 public readonly int EventId => m_id;
 public readonly byte Version => m_version;
 public readonly byte Channel => m_channel;
 public readonly byte Level => m_level;
 public readonly byte Opcode => m_opcode;
 public readonly int Task => m_task;
 public readonly long Keywords => m_keywords;

 internal int TraceLoggingId => m_traceloggingId;
 internal readonly int TraceLoggingId => m_traceloggingId;

 public override bool Equals([NotNullWhen(true)] object? obj) =>
 public override readonly bool Equals([NotNullWhen(true)] object? obj) =>
 obj is EventDescriptor ed && Equals(ed);

 public override int GetHashCode() =>
 public override readonly int GetHashCode() =>
 m_id ^ m_version ^ m_channel ^ m_level ^ m_opcode ^ m_task ^ (int)m_keywords;

 public bool Equals(EventDescriptor other) =>
 public readonly bool Equals(EventDescriptor other) =>
 m_id == other.m_id &&
 m_version == other.m_version &&
 m_channel == other.m_channel &&
Expand Down

10 changes: 5 additions & 5 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1178,7 +1178,7 @@ protected internal struct EventData
 /// </summary>
 public unsafe IntPtr DataPointer
 {
 get => (IntPtr)(void*)m_Ptr;
readonly get => (IntPtr)(void*)m_Ptr;
 set => m_Ptr = unchecked((ulong)(void*)value);
 }

Expand All@@ -1187,7 +1187,7 @@ public unsafe IntPtr DataPointer
 /// </summary>
 public int Size
 {
 get => m_Size;
readonly get => m_Size;
 set => m_Size = value;
 }

Expand All@@ -1197,7 +1197,7 @@ public int Size
 /// </summary>
 internal int Reserved
 {
 get => m_Reserved;
readonly get => m_Reserved;
 set => m_Reserved = value;
 }

Expand DownExpand Up@@ -5054,7 +5054,7 @@ public SessionMask(SessionMask m)
 public SessionMask(uint mask = 0)
 { m_mask = mask & MASK; }

 public bool IsEqualOrSupersetOf(SessionMask m)
 public readonly bool IsEqualOrSupersetOf(SessionMask m)
 {
 return (this.m_mask | m.m_mask) == this.m_mask;
 }
Expand All@@ -5067,7 +5067,7 @@ public static SessionMask FromId(int perEventSourceSessionId)
 return new SessionMask((uint)1 << perEventSourceSessionId);
 }

 public ulong ToEventKeywords()
 public readonly ulong ToEventKeywords()
 {
 return (ulong)m_mask << SHIFT_SESSION_TO_KEYWORD;
 }
Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ internal struct ConcurrentSet<KeyType, ItemType>
 {
 private ItemType[]? items;

 public ItemType? TryGet(KeyType key)
 public readonly ItemType? TryGet(KeyType key)
 {
 ItemType? item;
 ItemType[]? oldItems = this.items;
Expand Down

12 changes: 6 additions & 6 deletions
.../System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public struct EventSourceOptions
 /// </summary>
 public EventLevel Level
 {
 get => (EventLevel)this.level;
readonly get => (EventLevel)this.level;
 set
 {
 this.level = checked((byte)value);
Expand All@@ -51,23 +51,23 @@ public EventLevel Level
 /// </summary>
 public EventOpcode Opcode
 {
 get => (EventOpcode)this.opcode;
readonly get => (EventOpcode)this.opcode;
 set
 {
 this.opcode = checked((byte)value);
 this.valuesSet |= opcodeSet;
 }
 }

 internal bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;
 internal readonly bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;

 /// <summary>
 /// Gets or sets the keywords to use for the specified event. If this
 /// property is unset, the event's keywords will be 0.
 /// </summary>
 public EventKeywords Keywords
 {
 get => this.keywords;
readonly get => this.keywords;
 set
 {
 this.keywords = value;
Expand All@@ -81,7 +81,7 @@ public EventKeywords Keywords
 /// </summary>
 public EventTags Tags
 {
 get => this.tags;
readonly get => this.tags;
 set
 {
 this.tags = value;
Expand All@@ -95,7 +95,7 @@ public EventTags Tags
 /// </summary>
 public EventActivityOptions ActivityOptions
 {
 get => this.activityOptions;
readonly get => this.activityOptions;
 set
 {
 this.activityOptions = value;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
System.Diagnostics.Tracing readonly annotation by hrrrrustic · Pull Request #51787 · dotnet/runtime · GitHub
Skip to content
System.Diagnostics.Tracing readonly annotation#51787

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Diagnostics.Tracing readonly annotation
#51787
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class ActivityTagsCollection : System.Collections.Generic.IDictionary<str

 public struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object?>>, System.Collections.IEnumerator
 {
 public System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 public readonly System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 object System.Collections.IEnumerator.Current { get { throw null; } }
 public void Dispose() { throw null; }
 public bool MoveNext() { throw null; }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1674,7 +1674,7 @@ public Enumerator(LinkedListNode<T>? head)
 _currentItem = default;
 }

 public T Current => _currentItem!;
 public readonly T Current => _currentItem!;

 object? IEnumerator.Current => Current;

Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityTagsCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ public struct Enumerator : IEnumerator<KeyValuePair<string, object?>>, IEnumerat
 private List<KeyValuePair<string, object?>>.Enumerator _enumerator;
 internal Enumerator(List<KeyValuePair<string, object?>> list) => _enumerator = list.GetEnumerator();

 public KeyValuePair<string, object?> Current => _enumerator.Current;
 public readonly KeyValuePair<string, object?> Current => _enumerator.Current;
 object IEnumerator.Current => ((IEnumerator)_enumerator).Current;
 public void Dispose() => _enumerator.Dispose();
 public bool MoveNext() => _enumerator.MoveNext();
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -218,8 +218,8 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, System.Gu
 protected internal partial struct EventData
 {
 private int _dummyPrimitive;
 public System.IntPtr DataPointer { get { throw null; } set { } }
 public int Size { get { throw null; } set { } }
 public System.IntPtr DataPointer { readonly get { throw null; } set { } }
 public int Size { readonly get { throw null; } set { } }
 }
 }
 [System.AttributeUsageAttribute(System.AttributeTargets.Class)]
Expand All@@ -246,11 +246,11 @@ public EventSourceException(string? message, System.Exception? innerException) {
 public partial struct EventSourceOptions
 {
 private int _dummyPrimitive;
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { readonly get { throw null; } set { } }
 }
 [System.FlagsAttribute]
 public enum EventSourceSettings
Expand Down

22 changes: 11 additions & 11 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventDescriptor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,23 +94,23 @@ long keywords
 m_task = (ushort)task;
 }

 public int EventId => m_id;
 public byte Version => m_version;
 public byte Channel => m_channel;
 public byte Level => m_level;
 public byte Opcode => m_opcode;
 public int Task => m_task;
 public long Keywords => m_keywords;
 public readonly int EventId => m_id;
 public readonly byte Version => m_version;
 public readonly byte Channel => m_channel;
 public readonly byte Level => m_level;
 public readonly byte Opcode => m_opcode;
 public readonly int Task => m_task;
 public readonly long Keywords => m_keywords;

 internal int TraceLoggingId => m_traceloggingId;
 internal readonly int TraceLoggingId => m_traceloggingId;

 public override bool Equals([NotNullWhen(true)] object? obj) =>
 public override readonly bool Equals([NotNullWhen(true)] object? obj) =>
 obj is EventDescriptor ed && Equals(ed);

 public override int GetHashCode() =>
 public override readonly int GetHashCode() =>
 m_id ^ m_version ^ m_channel ^ m_level ^ m_opcode ^ m_task ^ (int)m_keywords;

 public bool Equals(EventDescriptor other) =>
 public readonly bool Equals(EventDescriptor other) =>
 m_id == other.m_id &&
 m_version == other.m_version &&
 m_channel == other.m_channel &&
Expand Down

10 changes: 5 additions & 5 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1178,7 +1178,7 @@ protected internal struct EventData
 /// </summary>
 public unsafe IntPtr DataPointer
 {
 get => (IntPtr)(void*)m_Ptr;
readonly get => (IntPtr)(void*)m_Ptr;
 set => m_Ptr = unchecked((ulong)(void*)value);
 }

Expand All@@ -1187,7 +1187,7 @@ public unsafe IntPtr DataPointer
 /// </summary>
 public int Size
 {
 get => m_Size;
readonly get => m_Size;
 set => m_Size = value;
 }

Expand All@@ -1197,7 +1197,7 @@ public int Size
 /// </summary>
 internal int Reserved
 {
 get => m_Reserved;
readonly get => m_Reserved;
 set => m_Reserved = value;
 }

Expand DownExpand Up@@ -5054,7 +5054,7 @@ public SessionMask(SessionMask m)
 public SessionMask(uint mask = 0)
 { m_mask = mask & MASK; }

 public bool IsEqualOrSupersetOf(SessionMask m)
 public readonly bool IsEqualOrSupersetOf(SessionMask m)
 {
 return (this.m_mask | m.m_mask) == this.m_mask;
 }
Expand All@@ -5067,7 +5067,7 @@ public static SessionMask FromId(int perEventSourceSessionId)
 return new SessionMask((uint)1 << perEventSourceSessionId);
 }

 public ulong ToEventKeywords()
 public readonly ulong ToEventKeywords()
 {
 return (ulong)m_mask << SHIFT_SESSION_TO_KEYWORD;
 }
Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ internal struct ConcurrentSet<KeyType, ItemType>
 {
 private ItemType[]? items;

 public ItemType? TryGet(KeyType key)
 public readonly ItemType? TryGet(KeyType key)
 {
 ItemType? item;
 ItemType[]? oldItems = this.items;
Expand Down

12 changes: 6 additions & 6 deletions
.../System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public struct EventSourceOptions
 /// </summary>
 public EventLevel Level
 {
 get => (EventLevel)this.level;
readonly get => (EventLevel)this.level;
 set
 {
 this.level = checked((byte)value);
Expand All@@ -51,23 +51,23 @@ public EventLevel Level
 /// </summary>
 public EventOpcode Opcode
 {
 get => (EventOpcode)this.opcode;
readonly get => (EventOpcode)this.opcode;
 set
 {
 this.opcode = checked((byte)value);
 this.valuesSet |= opcodeSet;
 }
 }

 internal bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;
 internal readonly bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;

 /// <summary>
 /// Gets or sets the keywords to use for the specified event. If this
 /// property is unset, the event's keywords will be 0.
 /// </summary>
 public EventKeywords Keywords
 {
 get => this.keywords;
readonly get => this.keywords;
 set
 {
 this.keywords = value;
Expand All@@ -81,7 +81,7 @@ public EventKeywords Keywords
 /// </summary>
 public EventTags Tags
 {
 get => this.tags;
readonly get => this.tags;
 set
 {
 this.tags = value;
Expand All@@ -95,7 +95,7 @@ public EventTags Tags
 /// </summary>
 public EventActivityOptions ActivityOptions
 {
 get => this.activityOptions;
readonly get => this.activityOptions;
 set
 {
 this.activityOptions = value;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
System.Diagnostics.Tracing readonly annotation by hrrrrustic · Pull Request #51787 · dotnet/runtime · GitHub
Skip to content
System.Diagnostics.Tracing readonly annotation#51787

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Diagnostics.Tracing readonly annotation
#51787
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
...es/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSourceActivity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@ public class ActivityTagsCollection : System.Collections.Generic.IDictionary<str

 public struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, object?>>, System.Collections.IEnumerator
 {
 public System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 public readonly System.Collections.Generic.KeyValuePair<string, object?> Current { get { throw null; } }
 object System.Collections.IEnumerator.Current { get { throw null; } }
 public void Dispose() { throw null; }
 public bool MoveNext() { throw null; }
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1674,7 +1674,7 @@ public Enumerator(LinkedListNode<T>? head)
 _currentItem = default;
 }

 public T Current => _currentItem!;
 public readonly T Current => _currentItem!;

 object? IEnumerator.Current => Current;

Expand Down

2 changes: 1 addition & 1 deletion
...ries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/ActivityTagsCollection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ public struct Enumerator : IEnumerator<KeyValuePair<string, object?>>, IEnumerat
 private List<KeyValuePair<string, object?>>.Enumerator _enumerator;
 internal Enumerator(List<KeyValuePair<string, object?>> list) => _enumerator = list.GetEnumerator();

 public KeyValuePair<string, object?> Current => _enumerator.Current;
 public readonly KeyValuePair<string, object?> Current => _enumerator.Current;
 object IEnumerator.Current => ((IEnumerator)_enumerator).Current;
 public void Dispose() => _enumerator.Dispose();
 public bool MoveNext() => _enumerator.MoveNext();
Expand Down

14 changes: 7 additions & 7 deletions
src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -218,8 +218,8 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, System.Gu
 protected internal partial struct EventData
 {
 private int _dummyPrimitive;
 public System.IntPtr DataPointer { get { throw null; } set { } }
 public int Size { get { throw null; } set { } }
 public System.IntPtr DataPointer { readonly get { throw null; } set { } }
 public int Size { readonly get { throw null; } set { } }
 }
 }
 [System.AttributeUsageAttribute(System.AttributeTargets.Class)]
Expand All@@ -246,11 +246,11 @@ public EventSourceException(string? message, System.Exception? innerException) {
 public partial struct EventSourceOptions
 {
 private int _dummyPrimitive;
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventActivityOptions ActivityOptions { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventKeywords Keywords { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventLevel Level { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventOpcode Opcode { readonly get { throw null; } set { } }
 public System.Diagnostics.Tracing.EventTags Tags { readonly get { throw null; } set { } }
 }
 [System.FlagsAttribute]
 public enum EventSourceSettings
Expand Down

22 changes: 11 additions & 11 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventDescriptor.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,23 +94,23 @@ long keywords
 m_task = (ushort)task;
 }

 public int EventId => m_id;
 public byte Version => m_version;
 public byte Channel => m_channel;
 public byte Level => m_level;
 public byte Opcode => m_opcode;
 public int Task => m_task;
 public long Keywords => m_keywords;
 public readonly int EventId => m_id;
 public readonly byte Version => m_version;
 public readonly byte Channel => m_channel;
 public readonly byte Level => m_level;
 public readonly byte Opcode => m_opcode;
 public readonly int Task => m_task;
 public readonly long Keywords => m_keywords;

 internal int TraceLoggingId => m_traceloggingId;
 internal readonly int TraceLoggingId => m_traceloggingId;

 public override bool Equals([NotNullWhen(true)] object? obj) =>
 public override readonly bool Equals([NotNullWhen(true)] object? obj) =>
 obj is EventDescriptor ed && Equals(ed);

 public override int GetHashCode() =>
 public override readonly int GetHashCode() =>
 m_id ^ m_version ^ m_channel ^ m_level ^ m_opcode ^ m_task ^ (int)m_keywords;

 public bool Equals(EventDescriptor other) =>
 public readonly bool Equals(EventDescriptor other) =>
 m_id == other.m_id &&
 m_version == other.m_version &&
 m_channel == other.m_channel &&
Expand Down

10 changes: 5 additions & 5 deletions
src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1178,7 +1178,7 @@ protected internal struct EventData
 /// </summary>
 public unsafe IntPtr DataPointer
 {
 get => (IntPtr)(void*)m_Ptr;
readonly get => (IntPtr)(void*)m_Ptr;
 set => m_Ptr = unchecked((ulong)(void*)value);
 }

Expand All@@ -1187,7 +1187,7 @@ public unsafe IntPtr DataPointer
 /// </summary>
 public int Size
 {
 get => m_Size;
readonly get => m_Size;
 set => m_Size = value;
 }

Expand All@@ -1197,7 +1197,7 @@ public int Size
 /// </summary>
 internal int Reserved
 {
 get => m_Reserved;
readonly get => m_Reserved;
 set => m_Reserved = value;
 }

Expand DownExpand Up@@ -5054,7 +5054,7 @@ public SessionMask(SessionMask m)
 public SessionMask(uint mask = 0)
 { m_mask = mask & MASK; }

 public bool IsEqualOrSupersetOf(SessionMask m)
 public readonly bool IsEqualOrSupersetOf(SessionMask m)
 {
 return (this.m_mask | m.m_mask) == this.m_mask;
 }
Expand All@@ -5067,7 +5067,7 @@ public static SessionMask FromId(int perEventSourceSessionId)
 return new SessionMask((uint)1 << perEventSourceSessionId);
 }

 public ulong ToEventKeywords()
 public readonly ulong ToEventKeywords()
 {
 return (ulong)m_mask << SHIFT_SESSION_TO_KEYWORD;
 }
Expand Down

2 changes: 1 addition & 1 deletion
...aries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ internal struct ConcurrentSet<KeyType, ItemType>
 {
 private ItemType[]? items;

 public ItemType? TryGet(KeyType key)
 public readonly ItemType? TryGet(KeyType key)
 {
 ItemType? item;
 ItemType[]? oldItems = this.items;
Expand Down

12 changes: 6 additions & 6 deletions
.../System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public struct EventSourceOptions
 /// </summary>
 public EventLevel Level
 {
 get => (EventLevel)this.level;
readonly get => (EventLevel)this.level;
 set
 {
 this.level = checked((byte)value);
Expand All@@ -51,23 +51,23 @@ public EventLevel Level
 /// </summary>
 public EventOpcode Opcode
 {
 get => (EventOpcode)this.opcode;
readonly get => (EventOpcode)this.opcode;
 set
 {
 this.opcode = checked((byte)value);
 this.valuesSet |= opcodeSet;
 }
 }

 internal bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;
 internal readonly bool IsOpcodeSet => (this.valuesSet & opcodeSet) != 0;

 /// <summary>
 /// Gets or sets the keywords to use for the specified event. If this
 /// property is unset, the event's keywords will be 0.
 /// </summary>
 public EventKeywords Keywords
 {
 get => this.keywords;
readonly get => this.keywords;
 set
 {
 this.keywords = value;
Expand All@@ -81,7 +81,7 @@ public EventKeywords Keywords
 /// </summary>
 public EventTags Tags
 {
 get => this.tags;
readonly get => this.tags;
 set
 {
 this.tags = value;
Expand All@@ -95,7 +95,7 @@ public EventTags Tags
 /// </summary>
 public EventActivityOptions ActivityOptions
 {
 get => this.activityOptions;
readonly get => this.activityOptions;
 set
 {
 this.activityOptions = value;
Expand Down