Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Unifying the type used for number of heaps/locks/threads (#27846)
Browse files Browse the repository at this point in the history 
Unifying the type used for number of heaps/locks/threads
It is the same small number and should be just int.

NOTE: Initial number of allocated blocks per generation is also the same as number of heaps.
  • Loading branch information
@VSadov
VSadov authored Nov 14, 2019
1 parent dd02c6d commit 7405e43
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
30 changes: 14 additions & 16 deletions src/gc/gc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -808,8 +808,8 @@ struct DECLSPEC_ALIGN(HS_CACHE_LINE_SIZE) join_structure

// Keep volatile counted locks on separate cache line write many per join
DECLSPEC_ALIGN(HS_CACHE_LINE_SIZE)
VOLATILE(int32_t) join_lock;
VOLATILE(int32_t) r_join_lock;
VOLATILE(int) join_lock;
VOLATILE(int) r_join_lock;

};
#pragma warning(pop)
Expand Down Expand Up @@ -4344,9 +4344,9 @@ typedef struct
size_t block_size_normal;
size_t block_size_large;

size_t block_count; // # of blocks in each
size_t current_block_normal;
size_t current_block_large;
int block_count; // # of blocks in each
int current_block_normal;
int current_block_large;

enum
{
Expand All @@ -4360,7 +4360,7 @@ typedef struct

initial_memory_details memory_details;

BOOL reserve_initial_memory (size_t normal_size, size_t large_size, size_t num_heaps, bool use_large_pages_p)
BOOL reserve_initial_memory (size_t normal_size, size_t large_size, int num_heaps, bool use_large_pages_p)
{
BOOL reserve_success = FALSE;

Expand Down Expand Up @@ -4408,7 +4408,7 @@ BOOL reserve_initial_memory (size_t normal_size, size_t large_size, size_t num_h
g_gc_highest_address = allatonce_block + requestedMemory;
memory_details.allocation_pattern = initial_memory_details::ALLATONCE;

for (size_t i = 0; i < memory_details.block_count; i++)
for (int i = 0; i < memory_details.block_count; i++)
{
memory_details.initial_normal_heap[i].memory_base = allatonce_block + (i * normal_size);
memory_details.initial_large_heap[i].memory_base = allatonce_block +
Expand All @@ -4431,7 +4431,7 @@ BOOL reserve_initial_memory (size_t normal_size, size_t large_size, size_t num_h
g_gc_lowest_address = min (b1, b2);
g_gc_highest_address = max (b1 + memory_details.block_count * normal_size,
b2 + memory_details.block_count * large_size);
for (size_t i = 0; i < memory_details.block_count; i++)
for (int i = 0; i < memory_details.block_count; i++)
{
memory_details.initial_normal_heap[i].memory_base = b1 + (i * normal_size);
memory_details.initial_large_heap[i].memory_base = b2 + (i * large_size);
Expand All @@ -4451,7 +4451,7 @@ BOOL reserve_initial_memory (size_t normal_size, size_t large_size, size_t num_h
memory_details.allocation_pattern = initial_memory_details::EACH_BLOCK;

imemory_data* current_block = memory_details.initial_memory;
for (size_t i = 0; i < (memory_details.block_count * 2); i++, current_block++)
for (int i = 0; i < (memory_details.block_count * 2); i++, current_block++)
{
size_t block_size = ((i < memory_details.block_count) ?
memory_details.block_size_normal :
Expand All @@ -4462,7 +4462,7 @@ BOOL reserve_initial_memory (size_t normal_size, size_t large_size, size_t num_h
{
// Free the blocks that we've allocated so far
current_block = memory_details.initial_memory;
for (size_t j = 0; j < i; j++, current_block++) {
for (int j = 0; j < i; j++, current_block++) {
if (current_block->memory_base != 0) {
block_size = ((j < memory_details.block_count) ?
memory_details.block_size_normal :
Expand Down Expand Up @@ -4510,7 +4510,7 @@ void destroy_initial_memory()
{
assert (memory_details.allocation_pattern == initial_memory_details::EACH_BLOCK);
imemory_data *current_block = memory_details.initial_memory;
for(size_t i = 0; i < (memory_details.block_count*2); i++, current_block++)
for(int i = 0; i < (memory_details.block_count*2); i++, current_block++)
{
size_t block_size = (i < memory_details.block_count) ? memory_details.block_size_normal :
memory_details.block_size_large;
Expand Down Expand Up @@ -5756,7 +5756,7 @@ void gc_heap::hb_log_new_allocation()
#endif //HEAP_BALANCE_INSTRUMENTATION
}

BOOL gc_heap::create_thread_support (unsigned number_of_heaps)
BOOL gc_heap::create_thread_support (int number_of_heaps)
{
BOOL ret = FALSE;
if (!gc_start_event.CreateOSManualEventNoThrow (FALSE))
Expand Down Expand Up @@ -10548,21 +10548,19 @@ HRESULT gc_heap::initialize_gc (size_t segment_size,
#endif //BACKGROUND_GC

reserved_memory = 0;
unsigned block_count;
#ifdef MULTIPLE_HEAPS
reserved_memory_limit = (segment_size + heap_size) * number_of_heaps;
block_count = number_of_heaps;
#else //MULTIPLE_HEAPS
reserved_memory_limit = segment_size + heap_size;
block_count = 1;
int number_of_heaps = 1;
#endif //MULTIPLE_HEAPS

if (heap_hard_limit)
{
check_commit_cs.Initialize();
}

if (!reserve_initial_memory (segment_size,heap_size,block_count,use_large_pages_p))
if (!reserve_initial_memory (segment_size,heap_size,number_of_heaps,use_large_pages_p))
return E_OUTOFMEMORY;

#ifdef CARD_BUNDLE
Expand Down
2 changes: 1 addition & 1 deletion src/gc/gcpriv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2959,7 +2959,7 @@ class gc_heap
/*------------ Multiple non isolated heaps ----------------*/
#ifdef MULTIPLE_HEAPS
PER_HEAP_ISOLATED
BOOL create_thread_support (unsigned number_of_heaps);
BOOL create_thread_support (int number_of_heaps);
PER_HEAP_ISOLATED
void destroy_thread_support ();
PER_HEAP
Expand Down

0 comments on commit 7405e43

Please sign in to comment.