Skip to content

[release/8.0] Don't shut down event pipe in DLLs on Windows#92044

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

Merged
agocke merged 6 commits into from
Sep 14, 2023
Merged

[release/8.0] Don't shut down event pipe in DLLs on Windows #92044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90fcfb6
Revert "Error out when NativeLib has EventPipe enabled (#90811)"
MichalStrehovsky Sep 7, 2023
d4ae21f
Don't shut down event pipe in DLLs on Windows
MichalStrehovsky Sep 7, 2023
cfff081
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
agocke Sep 7, 2023
1f9f27b
Apply suggestions from code review
MichalStrehovsky Sep 8, 2023
0c62371
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
MichalStrehovsky Sep 13, 2023
47128e6
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
MichalStrehovsky Sep 14, 2023
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
10 changes: 8 additions & 2 deletions src/coreclr/nativeaot/Bootstrap/main.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand DownExpand Up@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
if (!RhInitialize())
if (!RhInitialize(
#ifdef NATIVEAOT_DLL
/* isDll */ true
#else
/* isDll */ false
#endif
))
return -1;

void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,7 @@
Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
<Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
<Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
<!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
<Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
<Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

<Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down
22 changes: 19 additions & 3 deletions src/coreclr/nativeaot/Runtime/startup.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
EventPipe_Shutdown();
DiagnosticServer_Shutdown();
#ifdef _WIN32
// We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
// If there was an active trace session, the trace will likely be corrupted without
// orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
if (g_safeToShutdownTracing)
#endif
{
EventPipe_Shutdown();
DiagnosticServer_Shutdown();
}
#endif
}

Expand DownExpand Up@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
if (!PalInit())
return false;
Expand All@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
g_safeToShutdownTracing = !isDll;
#endif

if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
return false;

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" + '
[release/8.0] Don't shut down event pipe in DLLs on Windows by github-actions[bot] · Pull Request #92044 · dotnet/runtime · GitHub
Skip to content
[release/8.0] Don't shut down event pipe in DLLs on Windows#92044

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

 Merged

agocke
merged 6 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Don't shut down event pipe in DLLs on Windows
#92044
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90fcfb6

Revert "Error out when NativeLib has EventPipe enabled (#90811)"


MichalStrehovsky Sep 7, 2023
d4ae21f

Don't shut down event pipe in DLLs on Windows


MichalStrehovsky Sep 7, 2023
cfff081

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


agocke Sep 7, 2023
1f9f27b

Apply suggestions from code review


MichalStrehovsky Sep 8, 2023
0c62371

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 13, 2023
47128e6

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 14, 2023

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


10 changes: 8 additions & 2 deletions
src/coreclr/nativeaot/Bootstrap/main.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand DownExpand Up@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
 if (!RhInitialize())
 if (!RhInitialize(
#ifdef NATIVEAOT_DLL
 /* isDll */ true
#else
 /* isDll */ false
#endif
 ))
 return -1;

 void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,7 @@
 Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
 <Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
 <Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
 <!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
 <Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
 <Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

 <Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down

22 changes: 19 additions & 3 deletions
src/coreclr/nativeaot/Runtime/startup.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
#ifdef _WIN32
 // We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
 // If there was an active trace session, the trace will likely be corrupted without
 // orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
 if (g_safeToShutdownTracing)
#endif
 {
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
 }
#endif
}

Expand DownExpand Up@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
 if (!PalInit())
 return false;
Expand All@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
 atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
 g_safeToShutdownTracing = !isDll;
#endif

 if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
 return false;

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('^' + ".*" + '
[release/8.0] Don't shut down event pipe in DLLs on Windows by github-actions[bot] · Pull Request #92044 · dotnet/runtime · GitHub
Skip to content
[release/8.0] Don't shut down event pipe in DLLs on Windows#92044

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

 Merged

agocke
merged 6 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Don't shut down event pipe in DLLs on Windows
#92044
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90fcfb6

Revert "Error out when NativeLib has EventPipe enabled (#90811)"


MichalStrehovsky Sep 7, 2023
d4ae21f

Don't shut down event pipe in DLLs on Windows


MichalStrehovsky Sep 7, 2023
cfff081

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


agocke Sep 7, 2023
1f9f27b

Apply suggestions from code review


MichalStrehovsky Sep 8, 2023
0c62371

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 13, 2023
47128e6

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 14, 2023

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


10 changes: 8 additions & 2 deletions
src/coreclr/nativeaot/Bootstrap/main.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand DownExpand Up@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
 if (!RhInitialize())
 if (!RhInitialize(
#ifdef NATIVEAOT_DLL
 /* isDll */ true
#else
 /* isDll */ false
#endif
 ))
 return -1;

 void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,7 @@
 Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
 <Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
 <Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
 <!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
 <Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
 <Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

 <Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down

22 changes: 19 additions & 3 deletions
src/coreclr/nativeaot/Runtime/startup.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
#ifdef _WIN32
 // We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
 // If there was an active trace session, the trace will likely be corrupted without
 // orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
 if (g_safeToShutdownTracing)
#endif
 {
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
 }
#endif
}

Expand DownExpand Up@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
 if (!PalInit())
 return false;
Expand All@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
 atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
 g_safeToShutdownTracing = !isDll;
#endif

 if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
 return false;

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('^' + ".*" + '
[release/8.0] Don't shut down event pipe in DLLs on Windows by github-actions[bot] · Pull Request #92044 · dotnet/runtime · GitHub
Skip to content
[release/8.0] Don't shut down event pipe in DLLs on Windows#92044

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

 Merged

agocke
merged 6 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Don't shut down event pipe in DLLs on Windows
#92044
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90fcfb6

Revert "Error out when NativeLib has EventPipe enabled (#90811)"


MichalStrehovsky Sep 7, 2023
d4ae21f

Don't shut down event pipe in DLLs on Windows


MichalStrehovsky Sep 7, 2023
cfff081

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


agocke Sep 7, 2023
1f9f27b

Apply suggestions from code review


MichalStrehovsky Sep 8, 2023
0c62371

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 13, 2023
47128e6

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 14, 2023

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


10 changes: 8 additions & 2 deletions
src/coreclr/nativeaot/Bootstrap/main.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand DownExpand Up@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
 if (!RhInitialize())
 if (!RhInitialize(
#ifdef NATIVEAOT_DLL
 /* isDll */ true
#else
 /* isDll */ false
#endif
 ))
 return -1;

 void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,7 @@
 Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
 <Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
 <Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
 <!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
 <Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
 <Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

 <Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down

22 changes: 19 additions & 3 deletions
src/coreclr/nativeaot/Runtime/startup.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
#ifdef _WIN32
 // We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
 // If there was an active trace session, the trace will likely be corrupted without
 // orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
 if (g_safeToShutdownTracing)
#endif
 {
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
 }
#endif
}

Expand DownExpand Up@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
 if (!PalInit())
 return false;
Expand All@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
 atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
 g_safeToShutdownTracing = !isDll;
#endif

 if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
 return false;

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" + '
[release/8.0] Don't shut down event pipe in DLLs on Windows by github-actions[bot] · Pull Request #92044 · dotnet/runtime · GitHub
Skip to content
[release/8.0] Don't shut down event pipe in DLLs on Windows#92044

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

 Merged

agocke
merged 6 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Don't shut down event pipe in DLLs on Windows
#92044
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90fcfb6

Revert "Error out when NativeLib has EventPipe enabled (#90811)"


MichalStrehovsky Sep 7, 2023
d4ae21f

Don't shut down event pipe in DLLs on Windows


MichalStrehovsky Sep 7, 2023
cfff081

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


agocke Sep 7, 2023
1f9f27b

Apply suggestions from code review


MichalStrehovsky Sep 8, 2023
0c62371

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 13, 2023
47128e6

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 14, 2023

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


10 changes: 8 additions & 2 deletions
src/coreclr/nativeaot/Bootstrap/main.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand DownExpand Up@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
 if (!RhInitialize())
 if (!RhInitialize(
#ifdef NATIVEAOT_DLL
 /* isDll */ true
#else
 /* isDll */ false
#endif
 ))
 return -1;

 void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,7 @@
 Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
 <Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
 <Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
 <!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
 <Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
 <Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

 <Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down

22 changes: 19 additions & 3 deletions
src/coreclr/nativeaot/Runtime/startup.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
#ifdef _WIN32
 // We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
 // If there was an active trace session, the trace will likely be corrupted without
 // orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
 if (g_safeToShutdownTracing)
#endif
 {
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
 }
#endif
}

Expand DownExpand Up@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
 if (!PalInit())
 return false;
Expand All@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
 atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
 g_safeToShutdownTracing = !isDll;
#endif

 if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
 return false;

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('^' + ".*" + '
[release/8.0] Don't shut down event pipe in DLLs on Windows by github-actions[bot] · Pull Request #92044 · dotnet/runtime · GitHub
Skip to content
[release/8.0] Don't shut down event pipe in DLLs on Windows#92044

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

 Merged

agocke
merged 6 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Don't shut down event pipe in DLLs on Windows
#92044
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90fcfb6

Revert "Error out when NativeLib has EventPipe enabled (#90811)"


MichalStrehovsky Sep 7, 2023
d4ae21f

Don't shut down event pipe in DLLs on Windows


MichalStrehovsky Sep 7, 2023
cfff081

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


agocke Sep 7, 2023
1f9f27b

Apply suggestions from code review


MichalStrehovsky Sep 8, 2023
0c62371

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 13, 2023
47128e6

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 14, 2023

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


10 changes: 8 additions & 2 deletions
src/coreclr/nativeaot/Bootstrap/main.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand DownExpand Up@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
 if (!RhInitialize())
 if (!RhInitialize(
#ifdef NATIVEAOT_DLL
 /* isDll */ true
#else
 /* isDll */ false
#endif
 ))
 return -1;

 void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,7 @@
 Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
 <Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
 <Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
 <!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
 <Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
 <Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

 <Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down

22 changes: 19 additions & 3 deletions
src/coreclr/nativeaot/Runtime/startup.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
#ifdef _WIN32
 // We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
 // If there was an active trace session, the trace will likely be corrupted without
 // orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
 if (g_safeToShutdownTracing)
#endif
 {
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
 }
#endif
}

Expand DownExpand Up@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
 if (!PalInit())
 return false;
Expand All@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
 atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
 g_safeToShutdownTracing = !isDll;
#endif

 if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
 return false;

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('^' + ".*" + '
[release/8.0] Don't shut down event pipe in DLLs on Windows by github-actions[bot] · Pull Request #92044 · dotnet/runtime · GitHub
Skip to content
[release/8.0] Don't shut down event pipe in DLLs on Windows#92044

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

 Merged

agocke
merged 6 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Don't shut down event pipe in DLLs on Windows
#92044
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90fcfb6

Revert "Error out when NativeLib has EventPipe enabled (#90811)"


MichalStrehovsky Sep 7, 2023
d4ae21f

Don't shut down event pipe in DLLs on Windows


MichalStrehovsky Sep 7, 2023
cfff081

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


agocke Sep 7, 2023
1f9f27b

Apply suggestions from code review


MichalStrehovsky Sep 8, 2023
0c62371

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 13, 2023
47128e6

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 14, 2023

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


10 changes: 8 additions & 2 deletions
src/coreclr/nativeaot/Bootstrap/main.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand DownExpand Up@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
 if (!RhInitialize())
 if (!RhInitialize(
#ifdef NATIVEAOT_DLL
 /* isDll */ true
#else
 /* isDll */ false
#endif
 ))
 return -1;

 void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,7 @@
 Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
 <Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
 <Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
 <!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
 <Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
 <Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

 <Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down

22 changes: 19 additions & 3 deletions
src/coreclr/nativeaot/Runtime/startup.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
#ifdef _WIN32
 // We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
 // If there was an active trace session, the trace will likely be corrupted without
 // orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
 if (g_safeToShutdownTracing)
#endif
 {
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
 }
#endif
}

Expand DownExpand Up@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
 if (!PalInit())
 return false;
Expand All@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
 atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
 g_safeToShutdownTracing = !isDll;
#endif

 if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
 return false;

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); }
})();
})();
[release/8.0] Don't shut down event pipe in DLLs on Windows by github-actions[bot] · Pull Request #92044 · dotnet/runtime · GitHub
Skip to content
[release/8.0] Don't shut down event pipe in DLLs on Windows#92044

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

 Merged

agocke
merged 6 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Don't shut down event pipe in DLLs on Windows
#92044
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90fcfb6

Revert "Error out when NativeLib has EventPipe enabled (#90811)"


MichalStrehovsky Sep 7, 2023
d4ae21f

Don't shut down event pipe in DLLs on Windows


MichalStrehovsky Sep 7, 2023
cfff081

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


agocke Sep 7, 2023
1f9f27b

Apply suggestions from code review


MichalStrehovsky Sep 8, 2023
0c62371

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 13, 2023
47128e6

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…


MichalStrehovsky Sep 14, 2023

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


10 changes: 8 additions & 2 deletions
src/coreclr/nativeaot/Bootstrap/main.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand DownExpand Up@@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
 if (!RhInitialize())
 if (!RhInitialize(
#ifdef NATIVEAOT_DLL
 /* isDll */ true
#else
 /* isDll */ false
#endif
 ))
 return -1;

 void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down

3 changes: 1 addition & 2 deletions
src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,7 @@
 Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
 <Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
 <Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
 <!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
 <Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
 <Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

 <Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down

22 changes: 19 additions & 3 deletions
src/coreclr/nativeaot/Runtime/startup.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,6 +297,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All@@ -309,8 +313,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
#ifdef _WIN32
 // We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
 // If there was an active trace session, the trace will likely be corrupted without
 // orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
 if (g_safeToShutdownTracing)
#endif
 {
 EventPipe_Shutdown();
 DiagnosticServer_Shutdown();
 }
#endif
}

Expand DownExpand Up@@ -348,7 +360,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
 if (!PalInit())
 return false;
Expand All@@ -357,6 +369,10 @@ extern "C" bool RhInitialize()
 atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
 g_safeToShutdownTracing = !isDll;
#endif

 if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
 return false;

Expand Down