mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-23 07:12:12 -07:00
Code Issues Projects Releases Wiki Activity

Updating scheme example to demonstrate mps_root_create_area rather than deprecated mps_root_create_table.

Browse source 
Copied from Perforce
 Change: 189488
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 2016-03-01 15:11:39 +00:00
parent 13f0a20527
commit e4cfbcc4aa
2 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mps/example/scheme/scheme-advanced.c
View file

@ -4311,7 +4311,6 @@ static int start(int argc, char *argv[])
size_t i;
volatile obj_t env, op_env, obj;
jmp_buf jb;
mps_addr_t ref;
mps_res_t res;
mps_root_t globals_root;
int exit_code = EXIT_SUCCESS;
@ -4325,13 +4324,14 @@ static int start(int argc, char *argv[])
/* We must register the global variable 'symtab' as a root before
creating the symbol table, otherwise the symbol table might be
collected in the interval between creation and registration. But
we must also ensure that 'symtab' is valid before registration
(in this case, by setting it to NULL). See topic/root. */
collected in the interval between creation and
registration. But we must also ensure that 'symtab' is valid
before registration (in this case, by setting it to NULL). See
topic/root. */
symtab = NULL;
ref = &symtab;
res = mps_root_create_table(&symtab_root, arena, mps_rank_exact(), 0,
ref, 1);
res = mps_root_create_area(&symtab_root, arena, mps_rank_exact(), 0,
&symtab, &symtab + 1,
mps_scan_area, NULL, 0);
if(res != MPS_RES_OK) error("Couldn't register symtab root");
/* The symbol table is strong-key weak-value. */

25
mps/example/scheme/scheme.c
View file

@ -759,7 +759,6 @@ static void rehash(void) {
size_t old_symtab_size = symtab_size;
mps_root_t old_symtab_root = symtab_root;
unsigned i;
mps_addr_t ref;
mps_res_t res;
symtab_size *= 2;
@ -770,14 +769,15 @@ static void rehash(void) {
for(i = 0; i < symtab_size; ++i)
symtab[i] = NULL;
/* Once the symbol table is initialized with scannable references (NULL
in this case) we must register it as a root before we copy objects
across from the old symbol table. The MPS might be moving objects
in memory at any time, and will arrange that both copies are updated
atomically to the mutator (this interpreter). */
ref = symtab;
res = mps_root_create_table(&symtab_root, arena, mps_rank_exact(), 0,
ref, symtab_size);
/* %%MPS: Once the symbol table is initialized with scannable
references (NULL in this case) we must register it as a root
before we copy objects across from the old symbol table. The MPS
might be moving objects in memory at any time, and will arrange
that both copies are updated atomically to the mutator (this
interpreter). */
res = mps_root_create_area(&symtab_root, arena, mps_rank_exact(), 0,
symtab, symtab + symtab_size,
mps_scan_area, NULL, 0);
if(res != MPS_RES_OK) error("Couldn't register new symtab root");
for(i = 0; i < old_symtab_size; ++i)
@ -4243,7 +4243,6 @@ static int start(int argc, char *argv[])
size_t i;
volatile obj_t env, op_env, obj;
jmp_buf jb;
mps_addr_t ref;
mps_res_t res;
mps_root_t globals_root;
int exit_code = EXIT_SUCCESS;
@ -4261,9 +4260,9 @@ static int start(int argc, char *argv[])
pointers -- NULL in this case. Random values look like false
references into MPS memory and cause undefined behaviour (most likely
assertion failures). See topic/root. */
ref = symtab;
res = mps_root_create_table(&symtab_root, arena, mps_rank_exact(), 0,
ref, symtab_size);
res = mps_root_create_area(&symtab_root, arena, mps_rank_exact(), 0,
symtab, symtab + symtab_size,
mps_scan_area, NULL, 0);
if(res != MPS_RES_OK) error("Couldn't register symtab root");
error_handler = &jb;