aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/global.h
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-11-18 17:58:14 +0100
committerBjörn-Egil Dahlberg <[email protected]>2015-11-18 18:00:24 +0100
commit5d764f988ab09326d24e39a172083b09ab364c6c (patch)
treebf899001ecf0427769b193d6c1a61054353629ce /erts/emulator/beam/global.h
parent3f29cf1f72f50d20ce1864f76e1a298602429ca4 (diff)
downloadotp-5d764f988ab09326d24e39a172083b09ab364c6c.tar.gz
otp-5d764f988ab09326d24e39a172083b09ab364c6c.tar.bz2
otp-5d764f988ab09326d24e39a172083b09ab364c6c.zip
Refactor sharing preserved copy flags
The TMPBUF option is no longer needed due to is_literal test and NONE was only used for initial debugging. So we remove the entire option.
Diffstat (limited to 'erts/emulator/beam/global.h')
-rw-r--r--erts/emulator/beam/global.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index e9f7901a51..98c275a20c 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1052,14 +1052,8 @@ void erl_error(char*, va_list);
#ifdef SHCOPY
#define SHCOPY_SEND
#define SHCOPY_SPAWN
-/* Use this if you want sharing-preserving copy to be initially disabled */
-#undef SHCOPY_DISABLE
#endif
-#define ERTS_SHCOPY_FLG_MASK (((Uint32) 3) << 0)
-#define ERTS_SHCOPY_FLG_NONE (((Uint32) 1) << 0)
-#define ERTS_SHCOPY_FLG_TMPBUF (((Uint32) 1) << 1) /* forces INHEAP to true */
-
/* The persistent state while the sharing-preserving copier works */
typedef struct {
@@ -1106,8 +1100,8 @@ Eterm copy_object_x(Eterm, Process*, Uint);
#define copy_object(Term, Proc) copy_object_x(Term,Proc,0)
Uint size_object(Eterm);
-Uint copy_shared_calculate(Eterm, erts_shcopy_t*, Uint32);
-Eterm copy_shared_perform(Eterm, Uint, erts_shcopy_t*, Eterm**, ErlOffHeap*, Uint32);
+Uint copy_shared_calculate(Eterm, erts_shcopy_t*);
+Eterm copy_shared_perform(Eterm, Uint, erts_shcopy_t*, Eterm**, ErlOffHeap*);
Uint size_shared(Eterm);