kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix USE_TRANSIENT_HEAP macro usage in hash.c

Browse source 
Additionally fix some typos in transient heap.
This commit is contained in:
Cristian Greco 2020-11-18 18:04:09 +00:00 • committed by Koichi Sasada
parent dc3a65bd99
commit ce3c9a3437
Notes: git 2020-11-19 07:12:13 +09:00
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hash.c
View file

@ -532,7 +532,7 @@ hash_verify_(VALUE hash, const char *file, int line)
HASH_ASSERT(RHASH_AR_TABLE_BOUND_RAW(hash) == 0); HASH_ASSERT(RHASH_AR_TABLE_BOUND_RAW(hash) == 0);
} }
#if USE_TRANSIENT_HEP #if USE_TRANSIENT_HEAP
if (RHASH_TRANSIENT_P(hash)) { if (RHASH_TRANSIENT_P(hash)) {
volatile st_data_t MAYBE_UNUSED(key) = RHASH_AR_TABLE_REF(hash, 0)->key; /* read */ volatile st_data_t MAYBE_UNUSED(key) = RHASH_AR_TABLE_REF(hash, 0)->key; /* read */
HASH_ASSERT(RHASH_AR_TABLE(hash) != NULL); HASH_ASSERT(RHASH_AR_TABLE(hash) != NULL);

8
transient_heap.c
View file

@ -154,7 +154,7 @@ transient_heap_dump(struct transient_heap* theap)
transient_heap_blocks_dump(theap, theap->free_blocks, "free_blocks"); transient_heap_blocks_dump(theap, theap->free_blocks, "free_blocks");
} }
/* Debug: dump all tarnsient_heap blocks */ /* Debug: dump all transient_heap blocks */
void void
rb_transient_heap_dump(void) rb_transient_heap_dump(void)
{ {
@ -718,7 +718,7 @@ transient_heap_block_evacuate(struct transient_heap* theap, struct transient_hea
asan_unpoison_memory_region(header, sizeof *header, true); asan_unpoison_memory_region(header, sizeof *header, true);
VALUE obj = header->obj; VALUE obj = header->obj;
TH_ASSERT(header->magic == TRANSIENT_HEAP_ALLOC_MAGIC); TH_ASSERT(header->magic == TRANSIENT_HEAP_ALLOC_MAGIC);
if (header->magic != TRANSIENT_HEAP_ALLOC_MAGIC) rb_bug("rb_transient_heap_mark: wrong header %s\n", rb_obj_info(obj)); if (header->magic != TRANSIENT_HEAP_ALLOC_MAGIC) rb_bug("transient_heap_block_evacuate: wrong header %p %s\n", (void *)header, rb_obj_info(obj));
if (TRANSIENT_HEAP_DEBUG >= 3) fprintf(stderr, " * transient_heap_block_evacuate %p %s\n", (void *)header, rb_obj_info(obj)); if (TRANSIENT_HEAP_DEBUG >= 3) fprintf(stderr, " * transient_heap_block_evacuate %p %s\n", (void *)header, rb_obj_info(obj));
@ -739,7 +739,7 @@ transient_heap_block_evacuate(struct transient_heap* theap, struct transient_hea
rb_hash_transient_heap_evacuate(obj, !TRANSIENT_HEAP_DEBUG_DONT_PROMOTE); rb_hash_transient_heap_evacuate(obj, !TRANSIENT_HEAP_DEBUG_DONT_PROMOTE);
break; break;
default: default:
rb_bug("unsupporeted: %s\n", rb_obj_info(obj)); rb_bug("unsupported: %s\n", rb_obj_info(obj));
} }
header->obj = Qundef; /* for debug */ header->obj = Qundef; /* for debug */
} }
@ -912,7 +912,7 @@ rb_transient_heap_start_marking(int full_marking)
struct transient_heap* theap = transient_heap_get(); struct transient_heap* theap = transient_heap_get();
if (TRANSIENT_HEAP_DEBUG >= 1) fprintf(stderr, "!! rb_transient_heap_start_marking objects:%d blocks:%d promtoed:%d full_marking:%d\n", if (TRANSIENT_HEAP_DEBUG >= 1) fprintf(stderr, "!! rb_transient_heap_start_marking objects:%d blocks:%d promoted:%d full_marking:%d\n",
theap->total_objects, theap->total_blocks, theap->promoted_objects_index, full_marking); theap->total_objects, theap->total_blocks, theap->promoted_objects_index, full_marking);
if (TRANSIENT_HEAP_DEBUG >= 2) transient_heap_dump(theap); if (TRANSIENT_HEAP_DEBUG >= 2) transient_heap_dump(theap);