Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions base/strings/substring.jl
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ function isvalid(s::SubString, i::Integer)
@inbounds return ib && isvalid(s.string, s.offset + i)::Bool
end

thisind(s::SubString{String}, i::Int) = _thisind_str(s, i)
nextind(s::SubString{String}, i::Int) = _nextind_str(s, i)
@propagate_inbounds thisind(s::SubString{String}, i::Int) = _thisind_str(s, i)
@propagate_inbounds nextind(s::SubString{String}, i::Int) = _nextind_str(s, i)

parent(s::SubString) = s.string
parentindices(s::SubString) = (s.offset + 1 : thisind(s.string, s.offset + s.ncodeunits),)
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
96c4535bb47d6bb6c779e42ae011abbc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f2afdb1f0da6b2e5bd21c368e005921f77f7726bca1caac62699563e5d1e110aa08f709156fda2456885b4fe37f9864ccffd87d39a52602da1fb04a39dd7ca67

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
de32e20dce88650db906b149eda6854b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
90a6af3cebea0cd01c2b76ad3d70c578cba478f1665e07c66a27d3e91c7c3ceb37d07ea2fc791252d28735aef4a6f1ac86f350058ebb391d79e7a19ee149b639

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd5e9859422d5df99dfba2f2a9680ae6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
821f2ce35f3c3659ec323f97486f79deea0e5fb5edec0d5725a6ad6875d6e27974419c53dc702afebeaad68f2547b22c3566074fdd40049fee0ef00d3fb5a242
1 change: 1 addition & 0 deletions src/gc-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ extern "C" {
// GC Big objects
// =========================================================================== //

// layout for big (>2k) objects
JL_EXTENSION typedef struct _bigval_t {
struct _bigval_t *next;
struct _bigval_t *prev;
Expand Down
21 changes: 0 additions & 21 deletions src/gc-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -1100,27 +1100,6 @@ void gc_count_pool(void)
jl_safe_printf("************************\n");
}

void _report_gc_finished(uint64_t pause, uint64_t freed, int full, int recollect, int64_t live_bytes) JL_NOTSAFEPOINT {
if (!gc_logging_enabled) {
return;
}
jl_safe_printf("\nGC: pause %.2fms. collected %fMB. %s %s\n",
pause/1e6, freed/(double)(1<<20),
full ? "full" : "incr",
recollect ? "recollect" : ""
);

jl_safe_printf("Heap stats: bytes_mapped %.2f MB, bytes_resident %.2f MB,\nheap_size %.2f MB, heap_target %.2f MB, Fragmentation %.3f\n",
jl_atomic_load_relaxed(&gc_heap_stats.bytes_mapped)/(double)(1<<20),
jl_atomic_load_relaxed(&gc_heap_stats.bytes_resident)/(double)(1<<20),
// live_bytes/(double)(1<<20), live byes tracking is not accurate.
jl_atomic_load_relaxed(&gc_heap_stats.heap_size)/(double)(1<<20),
jl_atomic_load_relaxed(&gc_heap_stats.heap_target)/(double)(1<<20),
(double)live_bytes/(double)jl_atomic_load_relaxed(&gc_heap_stats.heap_size)
);
// Should fragmentation use bytes_resident instead of heap_size?
}

#ifdef __cplusplus
}
#endif
2 changes: 1 addition & 1 deletion src/gc-pages.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ NOINLINE jl_gc_pagemeta_t *jl_gc_alloc_page(void) JL_NOTSAFEPOINT
}

// return a page to the freemap allocator
void jl_gc_free_page(jl_gc_pagemeta_t *pg) JL_NOTSAFEPOINT
NOINLINE void jl_gc_free_page(jl_gc_pagemeta_t *pg) JL_NOTSAFEPOINT
{
void *p = pg->data;
gc_alloc_map_set((char*)p, GC_PAGE_FREED);
Expand Down
Loading
Loading