diff options
| author | Rickard Green <[email protected]> | 2019-07-22 11:37:11 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-07-22 11:37:11 +0200 |
| commit | 9d1b3bb0db87cf95cb821af01189f6d6be072f79 (patch) | |
| tree | 03ca2d109430b8a51bb3aa452d88f34f991d67d9 /erts/emulator/beam/erl_gc.c | |
| parent | aa928af9c9a147d1cdfebfaf26016ef17c389d18 (diff) | |
| parent | bcffb7f5599efb62f13128e6feeb03a65cd9c11e (diff) | |
| download | otp-9d1b3bb0db87cf95cb821af01189f6d6be072f79.tar.gz otp-9d1b3bb0db87cf95cb821af01189f6d6be072f79.tar.bz2 otp-9d1b3bb0db87cf95cb821af01189f6d6be072f79.zip | |
Merge branch 'maint'
* maint:
Fix etp-ets-tables
Fix node refc test for free processes hanging around
Enhanced node refc bookkeeping
Fix node container refc tests of ETS
Fix node refc test of external data
Node container refc test for persistent terms
Include persistent term storage in node/dist refc check
Fix node refc test for system message queue
Diffstat (limited to 'erts/emulator/beam/erl_gc.c')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index 7ab8034606..13b1f8ab4d 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -2887,7 +2887,7 @@ sweep_off_heap(Process *p, int fullsweep) if (is_external_header(((struct erl_off_heap_header*) boxed_val(ptr->thing_word))->thing_word)) erts_node_bookkeep(((ExternalThing*)ptr)->node, make_boxed(&ptr->thing_word), - ERL_NODE_DEC); + ERL_NODE_DEC, __FILE__, __LINE__); *prev = ptr = (struct erl_off_heap_header*) boxed_val(ptr->thing_word); ASSERT(!IS_MOVED_BOXED(ptr->thing_word)); switch (ptr->thing_word) { @@ -2918,7 +2918,7 @@ sweep_off_heap(Process *p, int fullsweep) if (is_external_header(ptr->thing_word)) { erts_node_bookkeep(((ExternalThing*)ptr)->node, make_boxed(&ptr->thing_word), - ERL_NODE_INC); + ERL_NODE_INC, __FILE__, __LINE__); } prev = &ptr->next; ptr = ptr->next; @@ -3089,9 +3089,11 @@ offset_heap(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size) if (is_external_header(oh->thing_word)) { erts_node_bookkeep(((ExternalThing*)oh)->node, - make_boxed(((Eterm*)oh)-offs), ERL_NODE_DEC); + make_boxed(((Eterm*)oh)-offs), + ERL_NODE_DEC, __FILE__, __LINE__); erts_node_bookkeep(((ExternalThing*)oh)->node, - make_boxed((Eterm*)oh), ERL_NODE_INC); + make_boxed((Eterm*)oh), ERL_NODE_INC, + __FILE__, __LINE__); } if (ErtsInArea(oh->next, area, area_size)) { |