Skip to content

Backport PR#77480 to 7.0.#85309

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
mangod9 merged 1 commit into from
Apr 25, 2023
Merged

Backport PR#77480 to 7.0. #85309

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
76 changes: 14 additions & 62 deletions src/coreclr/gc/gc.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2334,9 +2334,6 @@ size_t gc_heap::heap_hard_limit_oh[total_oh_count];

size_t gc_heap::regions_range = 0;

size_t gc_heap::heap_hard_limit_for_heap = 0;
size_t gc_heap::heap_hard_limit_for_bookkeeping = 0;

#endif //USE_REGIONS

bool affinity_config_specified_p = false;
Expand DownExpand Up@@ -6944,34 +6941,16 @@ bool gc_heap::virtual_commit (void* address, size_t size, int bucket, int h_numb

if (heap_hard_limit_oh[soh] != 0)
{
#ifdef USE_REGIONS
assert (heap_hard_limit_for_heap == 0);
assert (heap_hard_limit_for_bookkeeping == 0);
#endif //USE_REGIONS
if ((bucket < total_oh_count) && (committed_by_oh[bucket] + size) > heap_hard_limit_oh[bucket])
{
exceeded_p = true;
}
}
else
{
size_t base;
size_t limit;
#ifdef USE_REGIONS
if (h_number < 0)
{
base = current_total_committed_bookkeeping;
limit = heap_hard_limit_for_bookkeeping;
}
else
{
base = current_total_committed - current_total_committed_bookkeeping;
limit = heap_hard_limit_for_heap;
}
#else
base = current_total_committed;
limit = heap_hard_limit;
#endif //USE_REGIONS
size_t base = current_total_committed;
size_t limit = heap_hard_limit;

if ((base + size) > limit)
{
dprintf (1, ("%Id + %Id = %Id > limit %Id ", base, size, (base + size), limit));
Expand DownExpand Up@@ -11282,12 +11261,6 @@ void gc_heap::clear_region_info (heap_segment* region)
seg_deleted);

bgc_verify_mark_array_cleared (region);

if (dt_high_memory_load_p())
{
decommit_mark_array_by_seg (region);
region->flags &= ~(heap_segment_flags_ma_committed);
}
#endif //BACKGROUND_GC
}

Expand DownExpand Up@@ -13607,26 +13580,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size,
#endif //BACKGROUND_GC
#endif //WRITE_WATCH

#ifdef USE_REGIONS
if (gc_heap::heap_hard_limit && gc_heap::heap_hard_limit_oh[soh] == 0)
{
size_t gc_region_size = (size_t)1 << min_segment_size_shr;
size_t sizes[total_bookkeeping_elements];
size_t bookkeeping_size_per_region = 0;
uint8_t* temp_lowest_address = (uint8_t*)gc_region_size;
gc_heap::get_card_table_element_sizes(temp_lowest_address, temp_lowest_address + gc_region_size, sizes);
for (int i = 0; i < total_bookkeeping_elements; i++)
{
bookkeeping_size_per_region += sizes[i];
}
size_t total_size_per_region = gc_region_size + bookkeeping_size_per_region;
size_t max_region_count = gc_heap::heap_hard_limit / total_size_per_region; // implictly rounded down
gc_heap::heap_hard_limit_for_heap = max_region_count * gc_region_size;
gc_heap::heap_hard_limit_for_bookkeeping = max_region_count * bookkeeping_size_per_region;
dprintf (REGIONS_LOG, ("bookkeeping_size_per_region = %Id", bookkeeping_size_per_region));
}
#endif //USE_REGIONS

#ifdef BACKGROUND_GC
// leave the first page to contain only segment info
// because otherwise we could need to revisit the first page frequently in
Expand DownExpand Up@@ -14390,6 +14343,8 @@ gc_heap::init_gc_heap (int h_number)
#endif //CARD_BUNDLE

#ifdef BACKGROUND_GC
background_saved_highest_address = nullptr;
background_saved_lowest_address = nullptr;
if (gc_can_use_concurrent)
mark_array = translate_mark_array (card_table_mark_array (&g_gc_card_table[card_word (card_of (g_gc_lowest_address))]));
else
Expand DownExpand Up@@ -20310,20 +20265,17 @@ bool gc_heap::try_get_new_free_region()
bool gc_heap::init_table_for_region (int gen_number, heap_segment* region)
{
#ifdef BACKGROUND_GC
if (is_bgc_in_progress())
dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
heap_segment_mem (region), mark_array));
if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
!commit_mark_array_new_seg (__this, region))
{
dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
heap_segment_mem (region), mark_array));
if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
!commit_mark_array_new_seg (__this, region))
{
dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
get_region_start (region), heap_segment_reserved (region)));
dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
get_region_start (region), heap_segment_reserved (region)));

// We don't have memory to commit the mark array so we cannot use the new region.
decommit_region (region, gen_to_oh (gen_number), heap_number);
return false;
}
// We don't have memory to commit the mark array so we cannot use the new region.
decommit_region (region, gen_to_oh (gen_number), heap_number);
return false;
}
if ((region->flags & heap_segment_flags_ma_committed) != 0)
{
Expand Down
6 changes: 0 additions & 6 deletions src/coreclr/gc/gcpriv.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4116,12 +4116,6 @@ class gc_heap
PER_HEAP_ISOLATED
size_t heap_hard_limit_oh[total_oh_count];

PER_HEAP_ISOLATED
size_t heap_hard_limit_for_heap;

PER_HEAP_ISOLATED
size_t heap_hard_limit_for_bookkeeping;

PER_HEAP_ISOLATED
CLRCriticalSection check_commit_cs;

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" + '
Backport PR#77480 to 7.0. by PeterSolMS · Pull Request #85309 · dotnet/runtime · GitHub
Skip to content
Backport PR#77480 to 7.0.#85309

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

mangod9
merged 1 commit into

from

Apr 25, 2023
 Merged


Backport PR#77480 to 7.0.
#85309
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


76 changes: 14 additions & 62 deletions
src/coreclr/gc/gc.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2334,9 +2334,6 @@ size_t gc_heap::heap_hard_limit_oh[total_oh_count];

size_t gc_heap::regions_range = 0;

size_t gc_heap::heap_hard_limit_for_heap = 0;
size_t gc_heap::heap_hard_limit_for_bookkeeping = 0;

#endif //USE_REGIONS

bool affinity_config_specified_p = false;
Expand DownExpand Up@@ -6944,34 +6941,16 @@ bool gc_heap::virtual_commit (void* address, size_t size, int bucket, int h_numb

 if (heap_hard_limit_oh[soh] != 0)
 {
#ifdef USE_REGIONS
 assert (heap_hard_limit_for_heap == 0);
 assert (heap_hard_limit_for_bookkeeping == 0);
#endif //USE_REGIONS
 if ((bucket < total_oh_count) && (committed_by_oh[bucket] + size) > heap_hard_limit_oh[bucket])
 {
 exceeded_p = true;
 }
 }
 else
 {
 size_t base;
 size_t limit;
#ifdef USE_REGIONS
 if (h_number < 0)
 {
 base = current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_bookkeeping;
 }
 else
 {
 base = current_total_committed - current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_heap;
 }
#else
 base = current_total_committed;
 limit = heap_hard_limit;
#endif //USE_REGIONS
 size_t base = current_total_committed;
 size_t limit = heap_hard_limit;

 if ((base + size) > limit)
 {
 dprintf (1, ("%Id + %Id = %Id > limit %Id ", base, size, (base + size), limit));
Expand DownExpand Up@@ -11282,12 +11261,6 @@ void gc_heap::clear_region_info (heap_segment* region)
 seg_deleted);

 bgc_verify_mark_array_cleared (region);

 if (dt_high_memory_load_p())
 {
 decommit_mark_array_by_seg (region);
 region->flags &= ~(heap_segment_flags_ma_committed);
 }
#endif //BACKGROUND_GC
}

Expand DownExpand Up@@ -13607,26 +13580,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size,
#endif //BACKGROUND_GC
#endif //WRITE_WATCH

#ifdef USE_REGIONS
 if (gc_heap::heap_hard_limit && gc_heap::heap_hard_limit_oh[soh] == 0)
 {
 size_t gc_region_size = (size_t)1 << min_segment_size_shr;
 size_t sizes[total_bookkeeping_elements];
 size_t bookkeeping_size_per_region = 0;
 uint8_t* temp_lowest_address = (uint8_t*)gc_region_size;
 gc_heap::get_card_table_element_sizes(temp_lowest_address, temp_lowest_address + gc_region_size, sizes);
 for (int i = 0; i < total_bookkeeping_elements; i++)
 {
 bookkeeping_size_per_region += sizes[i];
 }
 size_t total_size_per_region = gc_region_size + bookkeeping_size_per_region;
 size_t max_region_count = gc_heap::heap_hard_limit / total_size_per_region; // implictly rounded down
 gc_heap::heap_hard_limit_for_heap = max_region_count * gc_region_size;
 gc_heap::heap_hard_limit_for_bookkeeping = max_region_count * bookkeeping_size_per_region;
 dprintf (REGIONS_LOG, ("bookkeeping_size_per_region = %Id", bookkeeping_size_per_region));
 }
#endif //USE_REGIONS

#ifdef BACKGROUND_GC
 // leave the first page to contain only segment info
 // because otherwise we could need to revisit the first page frequently in
Expand DownExpand Up@@ -14390,6 +14343,8 @@ gc_heap::init_gc_heap (int h_number)
#endif //CARD_BUNDLE

#ifdef BACKGROUND_GC
 background_saved_highest_address = nullptr;
 background_saved_lowest_address = nullptr;
 if (gc_can_use_concurrent)
 mark_array = translate_mark_array (card_table_mark_array (&g_gc_card_table[card_word (card_of (g_gc_lowest_address))]));
 else
Expand DownExpand Up@@ -20310,20 +20265,17 @@ bool gc_heap::try_get_new_free_region()
bool gc_heap::init_table_for_region (int gen_number, heap_segment* region)
{
#ifdef BACKGROUND_GC
 if (is_bgc_in_progress())
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));

 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 if ((region->flags & heap_segment_flags_ma_committed) != 0)
 {
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/gc/gcpriv.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4116,12 +4116,6 @@ class gc_heap
 PER_HEAP_ISOLATED
 size_t heap_hard_limit_oh[total_oh_count];

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_heap;

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_bookkeeping;

 PER_HEAP_ISOLATED
 CLRCriticalSection check_commit_cs;

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('^' + ".*" + '
Backport PR#77480 to 7.0. by PeterSolMS · Pull Request #85309 · dotnet/runtime · GitHub
Skip to content
Backport PR#77480 to 7.0.#85309

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

mangod9
merged 1 commit into

from

Apr 25, 2023
 Merged


Backport PR#77480 to 7.0.
#85309
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


76 changes: 14 additions & 62 deletions
src/coreclr/gc/gc.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2334,9 +2334,6 @@ size_t gc_heap::heap_hard_limit_oh[total_oh_count];

size_t gc_heap::regions_range = 0;

size_t gc_heap::heap_hard_limit_for_heap = 0;
size_t gc_heap::heap_hard_limit_for_bookkeeping = 0;

#endif //USE_REGIONS

bool affinity_config_specified_p = false;
Expand DownExpand Up@@ -6944,34 +6941,16 @@ bool gc_heap::virtual_commit (void* address, size_t size, int bucket, int h_numb

 if (heap_hard_limit_oh[soh] != 0)
 {
#ifdef USE_REGIONS
 assert (heap_hard_limit_for_heap == 0);
 assert (heap_hard_limit_for_bookkeeping == 0);
#endif //USE_REGIONS
 if ((bucket < total_oh_count) && (committed_by_oh[bucket] + size) > heap_hard_limit_oh[bucket])
 {
 exceeded_p = true;
 }
 }
 else
 {
 size_t base;
 size_t limit;
#ifdef USE_REGIONS
 if (h_number < 0)
 {
 base = current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_bookkeeping;
 }
 else
 {
 base = current_total_committed - current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_heap;
 }
#else
 base = current_total_committed;
 limit = heap_hard_limit;
#endif //USE_REGIONS
 size_t base = current_total_committed;
 size_t limit = heap_hard_limit;

 if ((base + size) > limit)
 {
 dprintf (1, ("%Id + %Id = %Id > limit %Id ", base, size, (base + size), limit));
Expand DownExpand Up@@ -11282,12 +11261,6 @@ void gc_heap::clear_region_info (heap_segment* region)
 seg_deleted);

 bgc_verify_mark_array_cleared (region);

 if (dt_high_memory_load_p())
 {
 decommit_mark_array_by_seg (region);
 region->flags &= ~(heap_segment_flags_ma_committed);
 }
#endif //BACKGROUND_GC
}

Expand DownExpand Up@@ -13607,26 +13580,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size,
#endif //BACKGROUND_GC
#endif //WRITE_WATCH

#ifdef USE_REGIONS
 if (gc_heap::heap_hard_limit && gc_heap::heap_hard_limit_oh[soh] == 0)
 {
 size_t gc_region_size = (size_t)1 << min_segment_size_shr;
 size_t sizes[total_bookkeeping_elements];
 size_t bookkeeping_size_per_region = 0;
 uint8_t* temp_lowest_address = (uint8_t*)gc_region_size;
 gc_heap::get_card_table_element_sizes(temp_lowest_address, temp_lowest_address + gc_region_size, sizes);
 for (int i = 0; i < total_bookkeeping_elements; i++)
 {
 bookkeeping_size_per_region += sizes[i];
 }
 size_t total_size_per_region = gc_region_size + bookkeeping_size_per_region;
 size_t max_region_count = gc_heap::heap_hard_limit / total_size_per_region; // implictly rounded down
 gc_heap::heap_hard_limit_for_heap = max_region_count * gc_region_size;
 gc_heap::heap_hard_limit_for_bookkeeping = max_region_count * bookkeeping_size_per_region;
 dprintf (REGIONS_LOG, ("bookkeeping_size_per_region = %Id", bookkeeping_size_per_region));
 }
#endif //USE_REGIONS

#ifdef BACKGROUND_GC
 // leave the first page to contain only segment info
 // because otherwise we could need to revisit the first page frequently in
Expand DownExpand Up@@ -14390,6 +14343,8 @@ gc_heap::init_gc_heap (int h_number)
#endif //CARD_BUNDLE

#ifdef BACKGROUND_GC
 background_saved_highest_address = nullptr;
 background_saved_lowest_address = nullptr;
 if (gc_can_use_concurrent)
 mark_array = translate_mark_array (card_table_mark_array (&g_gc_card_table[card_word (card_of (g_gc_lowest_address))]));
 else
Expand DownExpand Up@@ -20310,20 +20265,17 @@ bool gc_heap::try_get_new_free_region()
bool gc_heap::init_table_for_region (int gen_number, heap_segment* region)
{
#ifdef BACKGROUND_GC
 if (is_bgc_in_progress())
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));

 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 if ((region->flags & heap_segment_flags_ma_committed) != 0)
 {
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/gc/gcpriv.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4116,12 +4116,6 @@ class gc_heap
 PER_HEAP_ISOLATED
 size_t heap_hard_limit_oh[total_oh_count];

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_heap;

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_bookkeeping;

 PER_HEAP_ISOLATED
 CLRCriticalSection check_commit_cs;

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('^' + ".*" + '
Backport PR#77480 to 7.0. by PeterSolMS · Pull Request #85309 · dotnet/runtime · GitHub
Skip to content
Backport PR#77480 to 7.0.#85309

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

mangod9
merged 1 commit into

from

Apr 25, 2023
 Merged


Backport PR#77480 to 7.0.
#85309
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


76 changes: 14 additions & 62 deletions
src/coreclr/gc/gc.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2334,9 +2334,6 @@ size_t gc_heap::heap_hard_limit_oh[total_oh_count];

size_t gc_heap::regions_range = 0;

size_t gc_heap::heap_hard_limit_for_heap = 0;
size_t gc_heap::heap_hard_limit_for_bookkeeping = 0;

#endif //USE_REGIONS

bool affinity_config_specified_p = false;
Expand DownExpand Up@@ -6944,34 +6941,16 @@ bool gc_heap::virtual_commit (void* address, size_t size, int bucket, int h_numb

 if (heap_hard_limit_oh[soh] != 0)
 {
#ifdef USE_REGIONS
 assert (heap_hard_limit_for_heap == 0);
 assert (heap_hard_limit_for_bookkeeping == 0);
#endif //USE_REGIONS
 if ((bucket < total_oh_count) && (committed_by_oh[bucket] + size) > heap_hard_limit_oh[bucket])
 {
 exceeded_p = true;
 }
 }
 else
 {
 size_t base;
 size_t limit;
#ifdef USE_REGIONS
 if (h_number < 0)
 {
 base = current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_bookkeeping;
 }
 else
 {
 base = current_total_committed - current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_heap;
 }
#else
 base = current_total_committed;
 limit = heap_hard_limit;
#endif //USE_REGIONS
 size_t base = current_total_committed;
 size_t limit = heap_hard_limit;

 if ((base + size) > limit)
 {
 dprintf (1, ("%Id + %Id = %Id > limit %Id ", base, size, (base + size), limit));
Expand DownExpand Up@@ -11282,12 +11261,6 @@ void gc_heap::clear_region_info (heap_segment* region)
 seg_deleted);

 bgc_verify_mark_array_cleared (region);

 if (dt_high_memory_load_p())
 {
 decommit_mark_array_by_seg (region);
 region->flags &= ~(heap_segment_flags_ma_committed);
 }
#endif //BACKGROUND_GC
}

Expand DownExpand Up@@ -13607,26 +13580,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size,
#endif //BACKGROUND_GC
#endif //WRITE_WATCH

#ifdef USE_REGIONS
 if (gc_heap::heap_hard_limit && gc_heap::heap_hard_limit_oh[soh] == 0)
 {
 size_t gc_region_size = (size_t)1 << min_segment_size_shr;
 size_t sizes[total_bookkeeping_elements];
 size_t bookkeeping_size_per_region = 0;
 uint8_t* temp_lowest_address = (uint8_t*)gc_region_size;
 gc_heap::get_card_table_element_sizes(temp_lowest_address, temp_lowest_address + gc_region_size, sizes);
 for (int i = 0; i < total_bookkeeping_elements; i++)
 {
 bookkeeping_size_per_region += sizes[i];
 }
 size_t total_size_per_region = gc_region_size + bookkeeping_size_per_region;
 size_t max_region_count = gc_heap::heap_hard_limit / total_size_per_region; // implictly rounded down
 gc_heap::heap_hard_limit_for_heap = max_region_count * gc_region_size;
 gc_heap::heap_hard_limit_for_bookkeeping = max_region_count * bookkeeping_size_per_region;
 dprintf (REGIONS_LOG, ("bookkeeping_size_per_region = %Id", bookkeeping_size_per_region));
 }
#endif //USE_REGIONS

#ifdef BACKGROUND_GC
 // leave the first page to contain only segment info
 // because otherwise we could need to revisit the first page frequently in
Expand DownExpand Up@@ -14390,6 +14343,8 @@ gc_heap::init_gc_heap (int h_number)
#endif //CARD_BUNDLE

#ifdef BACKGROUND_GC
 background_saved_highest_address = nullptr;
 background_saved_lowest_address = nullptr;
 if (gc_can_use_concurrent)
 mark_array = translate_mark_array (card_table_mark_array (&g_gc_card_table[card_word (card_of (g_gc_lowest_address))]));
 else
Expand DownExpand Up@@ -20310,20 +20265,17 @@ bool gc_heap::try_get_new_free_region()
bool gc_heap::init_table_for_region (int gen_number, heap_segment* region)
{
#ifdef BACKGROUND_GC
 if (is_bgc_in_progress())
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));

 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 if ((region->flags & heap_segment_flags_ma_committed) != 0)
 {
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/gc/gcpriv.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4116,12 +4116,6 @@ class gc_heap
 PER_HEAP_ISOLATED
 size_t heap_hard_limit_oh[total_oh_count];

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_heap;

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_bookkeeping;

 PER_HEAP_ISOLATED
 CLRCriticalSection check_commit_cs;

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" + '
Backport PR#77480 to 7.0. by PeterSolMS · Pull Request #85309 · dotnet/runtime · GitHub
Skip to content
Backport PR#77480 to 7.0.#85309

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

mangod9
merged 1 commit into

from

Apr 25, 2023
 Merged


Backport PR#77480 to 7.0.
#85309
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


76 changes: 14 additions & 62 deletions
src/coreclr/gc/gc.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2334,9 +2334,6 @@ size_t gc_heap::heap_hard_limit_oh[total_oh_count];

size_t gc_heap::regions_range = 0;

size_t gc_heap::heap_hard_limit_for_heap = 0;
size_t gc_heap::heap_hard_limit_for_bookkeeping = 0;

#endif //USE_REGIONS

bool affinity_config_specified_p = false;
Expand DownExpand Up@@ -6944,34 +6941,16 @@ bool gc_heap::virtual_commit (void* address, size_t size, int bucket, int h_numb

 if (heap_hard_limit_oh[soh] != 0)
 {
#ifdef USE_REGIONS
 assert (heap_hard_limit_for_heap == 0);
 assert (heap_hard_limit_for_bookkeeping == 0);
#endif //USE_REGIONS
 if ((bucket < total_oh_count) && (committed_by_oh[bucket] + size) > heap_hard_limit_oh[bucket])
 {
 exceeded_p = true;
 }
 }
 else
 {
 size_t base;
 size_t limit;
#ifdef USE_REGIONS
 if (h_number < 0)
 {
 base = current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_bookkeeping;
 }
 else
 {
 base = current_total_committed - current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_heap;
 }
#else
 base = current_total_committed;
 limit = heap_hard_limit;
#endif //USE_REGIONS
 size_t base = current_total_committed;
 size_t limit = heap_hard_limit;

 if ((base + size) > limit)
 {
 dprintf (1, ("%Id + %Id = %Id > limit %Id ", base, size, (base + size), limit));
Expand DownExpand Up@@ -11282,12 +11261,6 @@ void gc_heap::clear_region_info (heap_segment* region)
 seg_deleted);

 bgc_verify_mark_array_cleared (region);

 if (dt_high_memory_load_p())
 {
 decommit_mark_array_by_seg (region);
 region->flags &= ~(heap_segment_flags_ma_committed);
 }
#endif //BACKGROUND_GC
}

Expand DownExpand Up@@ -13607,26 +13580,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size,
#endif //BACKGROUND_GC
#endif //WRITE_WATCH

#ifdef USE_REGIONS
 if (gc_heap::heap_hard_limit && gc_heap::heap_hard_limit_oh[soh] == 0)
 {
 size_t gc_region_size = (size_t)1 << min_segment_size_shr;
 size_t sizes[total_bookkeeping_elements];
 size_t bookkeeping_size_per_region = 0;
 uint8_t* temp_lowest_address = (uint8_t*)gc_region_size;
 gc_heap::get_card_table_element_sizes(temp_lowest_address, temp_lowest_address + gc_region_size, sizes);
 for (int i = 0; i < total_bookkeeping_elements; i++)
 {
 bookkeeping_size_per_region += sizes[i];
 }
 size_t total_size_per_region = gc_region_size + bookkeeping_size_per_region;
 size_t max_region_count = gc_heap::heap_hard_limit / total_size_per_region; // implictly rounded down
 gc_heap::heap_hard_limit_for_heap = max_region_count * gc_region_size;
 gc_heap::heap_hard_limit_for_bookkeeping = max_region_count * bookkeeping_size_per_region;
 dprintf (REGIONS_LOG, ("bookkeeping_size_per_region = %Id", bookkeeping_size_per_region));
 }
#endif //USE_REGIONS

#ifdef BACKGROUND_GC
 // leave the first page to contain only segment info
 // because otherwise we could need to revisit the first page frequently in
Expand DownExpand Up@@ -14390,6 +14343,8 @@ gc_heap::init_gc_heap (int h_number)
#endif //CARD_BUNDLE

#ifdef BACKGROUND_GC
 background_saved_highest_address = nullptr;
 background_saved_lowest_address = nullptr;
 if (gc_can_use_concurrent)
 mark_array = translate_mark_array (card_table_mark_array (&g_gc_card_table[card_word (card_of (g_gc_lowest_address))]));
 else
Expand DownExpand Up@@ -20310,20 +20265,17 @@ bool gc_heap::try_get_new_free_region()
bool gc_heap::init_table_for_region (int gen_number, heap_segment* region)
{
#ifdef BACKGROUND_GC
 if (is_bgc_in_progress())
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));

 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 if ((region->flags & heap_segment_flags_ma_committed) != 0)
 {
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/gc/gcpriv.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4116,12 +4116,6 @@ class gc_heap
 PER_HEAP_ISOLATED
 size_t heap_hard_limit_oh[total_oh_count];

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_heap;

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_bookkeeping;

 PER_HEAP_ISOLATED
 CLRCriticalSection check_commit_cs;

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('^' + ".*" + '
Backport PR#77480 to 7.0. by PeterSolMS · Pull Request #85309 · dotnet/runtime · GitHub
Skip to content
Backport PR#77480 to 7.0.#85309

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

mangod9
merged 1 commit into

from

Apr 25, 2023
 Merged


Backport PR#77480 to 7.0.
#85309
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


76 changes: 14 additions & 62 deletions
src/coreclr/gc/gc.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2334,9 +2334,6 @@ size_t gc_heap::heap_hard_limit_oh[total_oh_count];

size_t gc_heap::regions_range = 0;

size_t gc_heap::heap_hard_limit_for_heap = 0;
size_t gc_heap::heap_hard_limit_for_bookkeeping = 0;

#endif //USE_REGIONS

bool affinity_config_specified_p = false;
Expand DownExpand Up@@ -6944,34 +6941,16 @@ bool gc_heap::virtual_commit (void* address, size_t size, int bucket, int h_numb

 if (heap_hard_limit_oh[soh] != 0)
 {
#ifdef USE_REGIONS
 assert (heap_hard_limit_for_heap == 0);
 assert (heap_hard_limit_for_bookkeeping == 0);
#endif //USE_REGIONS
 if ((bucket < total_oh_count) && (committed_by_oh[bucket] + size) > heap_hard_limit_oh[bucket])
 {
 exceeded_p = true;
 }
 }
 else
 {
 size_t base;
 size_t limit;
#ifdef USE_REGIONS
 if (h_number < 0)
 {
 base = current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_bookkeeping;
 }
 else
 {
 base = current_total_committed - current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_heap;
 }
#else
 base = current_total_committed;
 limit = heap_hard_limit;
#endif //USE_REGIONS
 size_t base = current_total_committed;
 size_t limit = heap_hard_limit;

 if ((base + size) > limit)
 {
 dprintf (1, ("%Id + %Id = %Id > limit %Id ", base, size, (base + size), limit));
Expand DownExpand Up@@ -11282,12 +11261,6 @@ void gc_heap::clear_region_info (heap_segment* region)
 seg_deleted);

 bgc_verify_mark_array_cleared (region);

 if (dt_high_memory_load_p())
 {
 decommit_mark_array_by_seg (region);
 region->flags &= ~(heap_segment_flags_ma_committed);
 }
#endif //BACKGROUND_GC
}

Expand DownExpand Up@@ -13607,26 +13580,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size,
#endif //BACKGROUND_GC
#endif //WRITE_WATCH

#ifdef USE_REGIONS
 if (gc_heap::heap_hard_limit && gc_heap::heap_hard_limit_oh[soh] == 0)
 {
 size_t gc_region_size = (size_t)1 << min_segment_size_shr;
 size_t sizes[total_bookkeeping_elements];
 size_t bookkeeping_size_per_region = 0;
 uint8_t* temp_lowest_address = (uint8_t*)gc_region_size;
 gc_heap::get_card_table_element_sizes(temp_lowest_address, temp_lowest_address + gc_region_size, sizes);
 for (int i = 0; i < total_bookkeeping_elements; i++)
 {
 bookkeeping_size_per_region += sizes[i];
 }
 size_t total_size_per_region = gc_region_size + bookkeeping_size_per_region;
 size_t max_region_count = gc_heap::heap_hard_limit / total_size_per_region; // implictly rounded down
 gc_heap::heap_hard_limit_for_heap = max_region_count * gc_region_size;
 gc_heap::heap_hard_limit_for_bookkeeping = max_region_count * bookkeeping_size_per_region;
 dprintf (REGIONS_LOG, ("bookkeeping_size_per_region = %Id", bookkeeping_size_per_region));
 }
#endif //USE_REGIONS

#ifdef BACKGROUND_GC
 // leave the first page to contain only segment info
 // because otherwise we could need to revisit the first page frequently in
Expand DownExpand Up@@ -14390,6 +14343,8 @@ gc_heap::init_gc_heap (int h_number)
#endif //CARD_BUNDLE

#ifdef BACKGROUND_GC
 background_saved_highest_address = nullptr;
 background_saved_lowest_address = nullptr;
 if (gc_can_use_concurrent)
 mark_array = translate_mark_array (card_table_mark_array (&g_gc_card_table[card_word (card_of (g_gc_lowest_address))]));
 else
Expand DownExpand Up@@ -20310,20 +20265,17 @@ bool gc_heap::try_get_new_free_region()
bool gc_heap::init_table_for_region (int gen_number, heap_segment* region)
{
#ifdef BACKGROUND_GC
 if (is_bgc_in_progress())
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));

 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 if ((region->flags & heap_segment_flags_ma_committed) != 0)
 {
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/gc/gcpriv.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4116,12 +4116,6 @@ class gc_heap
 PER_HEAP_ISOLATED
 size_t heap_hard_limit_oh[total_oh_count];

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_heap;

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_bookkeeping;

 PER_HEAP_ISOLATED
 CLRCriticalSection check_commit_cs;

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('^' + ".*" + '
Backport PR#77480 to 7.0. by PeterSolMS · Pull Request #85309 · dotnet/runtime · GitHub
Skip to content
Backport PR#77480 to 7.0.#85309

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

mangod9
merged 1 commit into

from

Apr 25, 2023
 Merged


Backport PR#77480 to 7.0.
#85309
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


76 changes: 14 additions & 62 deletions
src/coreclr/gc/gc.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2334,9 +2334,6 @@ size_t gc_heap::heap_hard_limit_oh[total_oh_count];

size_t gc_heap::regions_range = 0;

size_t gc_heap::heap_hard_limit_for_heap = 0;
size_t gc_heap::heap_hard_limit_for_bookkeeping = 0;

#endif //USE_REGIONS

bool affinity_config_specified_p = false;
Expand DownExpand Up@@ -6944,34 +6941,16 @@ bool gc_heap::virtual_commit (void* address, size_t size, int bucket, int h_numb

 if (heap_hard_limit_oh[soh] != 0)
 {
#ifdef USE_REGIONS
 assert (heap_hard_limit_for_heap == 0);
 assert (heap_hard_limit_for_bookkeeping == 0);
#endif //USE_REGIONS
 if ((bucket < total_oh_count) && (committed_by_oh[bucket] + size) > heap_hard_limit_oh[bucket])
 {
 exceeded_p = true;
 }
 }
 else
 {
 size_t base;
 size_t limit;
#ifdef USE_REGIONS
 if (h_number < 0)
 {
 base = current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_bookkeeping;
 }
 else
 {
 base = current_total_committed - current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_heap;
 }
#else
 base = current_total_committed;
 limit = heap_hard_limit;
#endif //USE_REGIONS
 size_t base = current_total_committed;
 size_t limit = heap_hard_limit;

 if ((base + size) > limit)
 {
 dprintf (1, ("%Id + %Id = %Id > limit %Id ", base, size, (base + size), limit));
Expand DownExpand Up@@ -11282,12 +11261,6 @@ void gc_heap::clear_region_info (heap_segment* region)
 seg_deleted);

 bgc_verify_mark_array_cleared (region);

 if (dt_high_memory_load_p())
 {
 decommit_mark_array_by_seg (region);
 region->flags &= ~(heap_segment_flags_ma_committed);
 }
#endif //BACKGROUND_GC
}

Expand DownExpand Up@@ -13607,26 +13580,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size,
#endif //BACKGROUND_GC
#endif //WRITE_WATCH

#ifdef USE_REGIONS
 if (gc_heap::heap_hard_limit && gc_heap::heap_hard_limit_oh[soh] == 0)
 {
 size_t gc_region_size = (size_t)1 << min_segment_size_shr;
 size_t sizes[total_bookkeeping_elements];
 size_t bookkeeping_size_per_region = 0;
 uint8_t* temp_lowest_address = (uint8_t*)gc_region_size;
 gc_heap::get_card_table_element_sizes(temp_lowest_address, temp_lowest_address + gc_region_size, sizes);
 for (int i = 0; i < total_bookkeeping_elements; i++)
 {
 bookkeeping_size_per_region += sizes[i];
 }
 size_t total_size_per_region = gc_region_size + bookkeeping_size_per_region;
 size_t max_region_count = gc_heap::heap_hard_limit / total_size_per_region; // implictly rounded down
 gc_heap::heap_hard_limit_for_heap = max_region_count * gc_region_size;
 gc_heap::heap_hard_limit_for_bookkeeping = max_region_count * bookkeeping_size_per_region;
 dprintf (REGIONS_LOG, ("bookkeeping_size_per_region = %Id", bookkeeping_size_per_region));
 }
#endif //USE_REGIONS

#ifdef BACKGROUND_GC
 // leave the first page to contain only segment info
 // because otherwise we could need to revisit the first page frequently in
Expand DownExpand Up@@ -14390,6 +14343,8 @@ gc_heap::init_gc_heap (int h_number)
#endif //CARD_BUNDLE

#ifdef BACKGROUND_GC
 background_saved_highest_address = nullptr;
 background_saved_lowest_address = nullptr;
 if (gc_can_use_concurrent)
 mark_array = translate_mark_array (card_table_mark_array (&g_gc_card_table[card_word (card_of (g_gc_lowest_address))]));
 else
Expand DownExpand Up@@ -20310,20 +20265,17 @@ bool gc_heap::try_get_new_free_region()
bool gc_heap::init_table_for_region (int gen_number, heap_segment* region)
{
#ifdef BACKGROUND_GC
 if (is_bgc_in_progress())
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));

 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 if ((region->flags & heap_segment_flags_ma_committed) != 0)
 {
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/gc/gcpriv.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4116,12 +4116,6 @@ class gc_heap
 PER_HEAP_ISOLATED
 size_t heap_hard_limit_oh[total_oh_count];

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_heap;

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_bookkeeping;

 PER_HEAP_ISOLATED
 CLRCriticalSection check_commit_cs;

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); }
})();
})();
Backport PR#77480 to 7.0. by PeterSolMS · Pull Request #85309 · dotnet/runtime · GitHub
Skip to content
Backport PR#77480 to 7.0.#85309

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

mangod9
merged 1 commit into

from

Apr 25, 2023
 Merged


Backport PR#77480 to 7.0.
#85309
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


76 changes: 14 additions & 62 deletions
src/coreclr/gc/gc.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2334,9 +2334,6 @@ size_t gc_heap::heap_hard_limit_oh[total_oh_count];

size_t gc_heap::regions_range = 0;

size_t gc_heap::heap_hard_limit_for_heap = 0;
size_t gc_heap::heap_hard_limit_for_bookkeeping = 0;

#endif //USE_REGIONS

bool affinity_config_specified_p = false;
Expand DownExpand Up@@ -6944,34 +6941,16 @@ bool gc_heap::virtual_commit (void* address, size_t size, int bucket, int h_numb

 if (heap_hard_limit_oh[soh] != 0)
 {
#ifdef USE_REGIONS
 assert (heap_hard_limit_for_heap == 0);
 assert (heap_hard_limit_for_bookkeeping == 0);
#endif //USE_REGIONS
 if ((bucket < total_oh_count) && (committed_by_oh[bucket] + size) > heap_hard_limit_oh[bucket])
 {
 exceeded_p = true;
 }
 }
 else
 {
 size_t base;
 size_t limit;
#ifdef USE_REGIONS
 if (h_number < 0)
 {
 base = current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_bookkeeping;
 }
 else
 {
 base = current_total_committed - current_total_committed_bookkeeping;
 limit = heap_hard_limit_for_heap;
 }
#else
 base = current_total_committed;
 limit = heap_hard_limit;
#endif //USE_REGIONS
 size_t base = current_total_committed;
 size_t limit = heap_hard_limit;

 if ((base + size) > limit)
 {
 dprintf (1, ("%Id + %Id = %Id > limit %Id ", base, size, (base + size), limit));
Expand DownExpand Up@@ -11282,12 +11261,6 @@ void gc_heap::clear_region_info (heap_segment* region)
 seg_deleted);

 bgc_verify_mark_array_cleared (region);

 if (dt_high_memory_load_p())
 {
 decommit_mark_array_by_seg (region);
 region->flags &= ~(heap_segment_flags_ma_committed);
 }
#endif //BACKGROUND_GC
}

Expand DownExpand Up@@ -13607,26 +13580,6 @@ HRESULT gc_heap::initialize_gc (size_t soh_segment_size,
#endif //BACKGROUND_GC
#endif //WRITE_WATCH

#ifdef USE_REGIONS
 if (gc_heap::heap_hard_limit && gc_heap::heap_hard_limit_oh[soh] == 0)
 {
 size_t gc_region_size = (size_t)1 << min_segment_size_shr;
 size_t sizes[total_bookkeeping_elements];
 size_t bookkeeping_size_per_region = 0;
 uint8_t* temp_lowest_address = (uint8_t*)gc_region_size;
 gc_heap::get_card_table_element_sizes(temp_lowest_address, temp_lowest_address + gc_region_size, sizes);
 for (int i = 0; i < total_bookkeeping_elements; i++)
 {
 bookkeeping_size_per_region += sizes[i];
 }
 size_t total_size_per_region = gc_region_size + bookkeeping_size_per_region;
 size_t max_region_count = gc_heap::heap_hard_limit / total_size_per_region; // implictly rounded down
 gc_heap::heap_hard_limit_for_heap = max_region_count * gc_region_size;
 gc_heap::heap_hard_limit_for_bookkeeping = max_region_count * bookkeeping_size_per_region;
 dprintf (REGIONS_LOG, ("bookkeeping_size_per_region = %Id", bookkeeping_size_per_region));
 }
#endif //USE_REGIONS

#ifdef BACKGROUND_GC
 // leave the first page to contain only segment info
 // because otherwise we could need to revisit the first page frequently in
Expand DownExpand Up@@ -14390,6 +14343,8 @@ gc_heap::init_gc_heap (int h_number)
#endif //CARD_BUNDLE

#ifdef BACKGROUND_GC
 background_saved_highest_address = nullptr;
 background_saved_lowest_address = nullptr;
 if (gc_can_use_concurrent)
 mark_array = translate_mark_array (card_table_mark_array (&g_gc_card_table[card_word (card_of (g_gc_lowest_address))]));
 else
Expand DownExpand Up@@ -20310,20 +20265,17 @@ bool gc_heap::try_get_new_free_region()
bool gc_heap::init_table_for_region (int gen_number, heap_segment* region)
{
#ifdef BACKGROUND_GC
 if (is_bgc_in_progress())
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("new seg %Ix, mark_array is %Ix",
 heap_segment_mem (region), mark_array));
 if (((region->flags & heap_segment_flags_ma_committed) == 0) &&
 !commit_mark_array_new_seg (__this, region))
 {
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));
 dprintf (GC_TABLE_LOG, ("failed to commit mark array for the new region %Ix-%Ix",
 get_region_start (region), heap_segment_reserved (region)));

 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 // We don't have memory to commit the mark array so we cannot use the new region.
 decommit_region (region, gen_to_oh (gen_number), heap_number);
 return false;
 }
 if ((region->flags & heap_segment_flags_ma_committed) != 0)
 {
Expand Down

6 changes: 0 additions & 6 deletions
src/coreclr/gc/gcpriv.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4116,12 +4116,6 @@ class gc_heap
 PER_HEAP_ISOLATED
 size_t heap_hard_limit_oh[total_oh_count];

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_heap;

 PER_HEAP_ISOLATED
 size_t heap_hard_limit_for_bookkeeping;

 PER_HEAP_ISOLATED
 CLRCriticalSection check_commit_cs;

Expand Down