Skip to content

Commit 96dea87

Browse files
buyaa-nbuyaa-n
committed
Merge conflicts
2 parents 11d8d92 + 7bc9292 commit 96dea87

File tree

851 files changed

+54824
-16639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

851 files changed

+54824
-16639
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "9.0.0-prerelease.24311.2",
18+
"version": "9.0.0-prerelease.24312.3",
1919
"commands": [
2020
"xharness"
2121
]

‎THIRD-PARTY-NOTICES.TXT

+27
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,33 @@ Altered source versions must be plainly marked as such, and must not be misrepre
115115

116116
This notice may not be removed or altered from any source distribution.
117117

118+
License notice for LinuxTracepoints
119+
-----------------------------------
120+
121+
https://github.com/microsoft/LinuxTracepoints/blob/main/LICENSE
122+
123+
Copyright (c) Microsoft Corporation.
124+
125+
MIT License
126+
127+
Permission is hereby granted, free of charge, to any person obtaining a copy
128+
of this software and associated documentation files (the "Software"), to deal
129+
in the Software without restriction, including without limitation the rights
130+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
131+
copies of the Software, and to permit persons to whom the Software is
132+
furnished to do so, subject to the following conditions:
133+
134+
The above copyright notice and this permission notice shall be included in all
135+
copies or substantial portions of the Software.
136+
137+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
138+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
139+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
140+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
141+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
142+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
143+
SOFTWARE
144+
118145
License notice for Mono
119146
-------------------------------
120147

‎docs/area-owners.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
7373
| area-System.Composition | @ericstj | @dotnet/area-system-composition | |
7474
| area-System.Configuration | @ericstj | @dotnet/area-system-configuration | |
7575
| area-System.Console | @jeffhandley | @dotnet/area-system-console | |
76-
| area-System.Data | @sammonort | @ajcvickers @davoudeshtehari @david-engel @roji | <ul><li>Odbc, OleDb - @saurabh500</li></ul> |
77-
| area-System.Data.Odbc | @sammonort | @ajcvickers @roji | |
78-
| area-System.Data.OleDB | @sammonort | @ajcvickers @roji | |
76+
| area-System.Data | @sammonort | @ajcvickers @davoudeshtehari @david-engel @roji | <ul><li>Odbc, OleDb - @saurabh500</li></ul> |
77+
| area-System.Data.Odbc | @sammonort | @ajcvickers @roji | |
78+
| area-System.Data.OleDB | @sammonort | @ajcvickers @roji | |
7979
| area-System.Data.SqlClient | @David-Engel | @davoudeshtehari @david-engel @jrahnama | Archived component - limited churn/contributions (see https://devblogs.microsoft.com/dotnet/introducing-the-new-microsoftdatasqlclient/) |
8080
| area-System.DateTime | @ericstj | @dotnet/area-system-datetime | System namespace APIs related to dates and times, including DateOnly, DateTime, DateTimeKind, DateTimeOffset, DayOfWeek, TimeOnly, TimeSpan, TimeZone, and TimeZoneInfo |
8181
| area-System.Diagnostics | @tommcdon | @dotnet/area-system-diagnostics | |
@@ -93,6 +93,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
9393
| area-System.Dynamic.Runtime | @jaredpar | @cston @333fred | Archived component - limited churn/contributions (see [#27790](https://github.com/dotnet/runtime/issues/27790)) |
9494
| area-System.Formats.Asn1 | @jeffhandley | @dotnet/area-system-formats-asn1 | Consultants: @bartonjs @vcsjones |
9595
| area-System.Formats.Cbor | @jeffhandley | @dotnet/area-system-formats-cbor | Consultants: @bartonjs @vcsjones |
96+
| area-System.Formats.Nrbf | @jeffhandley | @dotnet/area-system-formats-nrbf | Consultants: @bartonjs @grabyourpitchforks |
9697
| area-System.Formats.Tar | @jeffhandley | @dotnet/area-system-formats-tar | |
9798
| area-System.Globalization | @ericstj | @dotnet/area-system-globalization | |
9899
| area-System.IO | @jeffhandley | @dotnet/area-system-io | |

‎docs/design/datacontracts/Thread.md

+6-55
Original file line numberDiff line numberDiff line change
@@ -19,61 +19,12 @@ record struct ThreadStoreCounts (
1919

2020
enum ThreadState
2121
{
22-
TS_Unknown = 0x00000000, // threads are initialized this way
23-
24-
TS_AbortRequested = 0x00000001, // Abort the thread
25-
26-
TS_GCSuspendRedirected = 0x00000004, // ThreadSuspend::SuspendRuntime has redirected the thread to suspention routine.
27-
28-
TS_DebugSuspendPending = 0x00000008, // Is the debugger suspending threads?
29-
TS_GCOnTransitions = 0x00000010, // Force a GC on stub transitions (GCStress only)
30-
31-
TS_LegalToJoin = 0x00000020, // Is it now legal to attempt a Join()
32-
33-
TS_ExecutingOnAltStack = 0x00000040, // Runtime is executing on an alternate stack located anywhere in the memory
34-
35-
TS_Hijacked = 0x00000080, // Return address has been hijacked
36-
37-
// unused = 0x00000100,
38-
TS_Background = 0x00000200, // Thread is a background thread
39-
TS_Unstarted = 0x00000400, // Thread has never been started
40-
TS_Dead = 0x00000800, // Thread is dead
41-
42-
TS_WeOwn = 0x00001000, // Exposed object initiated this thread
43-
TS_CoInitialized = 0x00002000, // CoInitialize has been called for this thread
44-
45-
TS_InSTA = 0x00004000, // Thread hosts an STA
46-
TS_InMTA = 0x00008000, // Thread is part of the MTA
47-
48-
// Some bits that only have meaning for reporting the state to clients.
49-
TS_ReportDead = 0x00010000, // in WaitForOtherThreads()
50-
TS_FullyInitialized = 0x00020000, // Thread is fully initialized and we are ready to broadcast its existence to external clients
51-
52-
TS_TaskReset = 0x00040000, // The task is reset
53-
54-
TS_SyncSuspended = 0x00080000, // Suspended via WaitSuspendEvent
55-
TS_DebugWillSync = 0x00100000, // Debugger will wait for this thread to sync
56-
57-
TS_StackCrawlNeeded = 0x00200000, // A stackcrawl is needed on this thread, such as for thread abort
58-
// See comment for s_pWaitForStackCrawlEvent for reason.
59-
60-
// unused = 0x00400000,
61-
62-
// unused = 0x00800000,
63-
TS_TPWorkerThread = 0x01000000, // is this a threadpool worker thread?
64-
65-
TS_Interruptible = 0x02000000, // sitting in a Sleep(), Wait(), Join()
66-
TS_Interrupted = 0x04000000, // was awakened by an interrupt APC. !!! This can be moved to TSNC
67-
68-
TS_CompletionPortThread = 0x08000000, // Completion port thread
69-
70-
TS_AbortInitiated = 0x10000000, // set when abort is begun
71-
72-
TS_Finalized = 0x20000000, // The associated managed Thread object has been finalized.
73-
// We can clean up the unmanaged part now.
74-
75-
TS_FailStarted = 0x40000000, // The thread fails during startup.
76-
TS_Detached = 0x80000000, // Thread was detached by DllMain
22+
Unknown = 0x00000000, // threads are initialized this way
23+
Hijacked = 0x00000080, // Return address has been hijacked
24+
Background = 0x00000200, // Thread is a background thread
25+
Unstarted = 0x00000400, // Thread has never been started
26+
Dead = 0x00000800, // Thread is dead
27+
ThreadPoolWorker = 0x01000000, // is this a threadpool worker thread?
7728
}
7829

7930
record struct ThreadData (

‎docs/design/features/user-events.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# user_events support in the runtime
2+
3+
Historically only kernelspace code was allowed to emit events in the Linux kernel, meaning that programs like Perf could only collect system events. Over the years various libraries such as LTTng have been created to allow userspace applications to write to the same trace as the kernel code. The runtime has supported LTTng since very early on, but LTTng has some limitations that are problematic. LTTng requires that all providers and events are known at compile time rather than runtime, and has also recently broken their ABI in a way that is difficult to recover from.
4+
5+
Starting with kernel version 6.4 the user_events feature is available. user_events allows userspace applications to write events to the same traces as kernel events but does not have the limitations of LTTng. It allows dynamic event creation at runtime and has a stable ABI. For this reason we are adding support for user_events to the runtime in .net 9.
6+
7+
# Limitations
8+
9+
Currently the support for user_events is experimental and does not support managed EventSources, it only supports native runtime events such as JIT, GC, class loads, etc.
10+
11+
# How to enable
12+
13+
The support for user_events is off by default and can be enabled in one of two ways.
14+
15+
1. Setting the `DOTNET_EnableUserEvents` environment variable to the value `1`.
16+
2. Setting the `System.Diagnostics.Tracing.UserEvents` configuration value to `true` in either your project file or in your `runtimeconfig.json` file.
17+
18+
# Format
19+
20+
The events are written with the EventHeader format specified at https://github.com/microsoft/LinuxTracepoints/blob/main/libeventheader-tracepoint/include/eventheader/eventheader.h

0 commit comments

Comments
 (0)