diff options
| author | Sverker Eriksson <[email protected]> | 2010-07-20 18:49:48 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2010-07-20 18:49:48 +0200 |
| commit | 9267b2dc792c0a7632a0dcdc0a49510eb13e465e (patch) | |
| tree | e18a6e9d1fd56526893a208d64ead6e285cc6a18 /erts/emulator/beam/erl_message.h | |
| parent | 9f44863204c56dcfa38c67db9662f7f1b7e6c582 (diff) | |
| parent | db206769c477aae8bafb7ae9b6b4fe1ad56cf729 (diff) | |
| download | otp-9267b2dc792c0a7632a0dcdc0a49510eb13e465e.tar.gz otp-9267b2dc792c0a7632a0dcdc0a49510eb13e465e.tar.bz2 otp-9267b2dc792c0a7632a0dcdc0a49510eb13e465e.zip | |
Merge branch 'sverker/one_offheap_list/OTP-8737' into dev
* sverker/one_offheap_list/OTP-8737:
One off-heap list, to eliminate two words per ETS object.
Diffstat (limited to 'erts/emulator/beam/erl_message.h')
| -rw-r--r-- | erts/emulator/beam/erl_message.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h index f478572ac2..890af2675c 100644 --- a/erts/emulator/beam/erl_message.h +++ b/erts/emulator/beam/erl_message.h @@ -28,13 +28,18 @@ struct external_thing_; * but is stored outside of any heap. */ +struct erl_off_heap_header { + Eterm thing_word; + union { + Uint size; + void* ptr; + }u; + struct erl_off_heap_header* next; +}; + typedef struct erl_off_heap { - struct proc_bin* mso; /* List of associated binaries. */ -#ifndef HYBRID /* FIND ME! */ - struct erl_fun_thing* funs; /* List of funs. */ -#endif - struct external_thing_* externals; /* List of external things. */ - int overhead; /* Administrative overhead (used to force GC). */ + struct erl_off_heap_header* first; + int overhead; /* Administrative overhead (used to force GC). */ } ErlOffHeap; #include "external.h" @@ -201,9 +206,7 @@ do { \ (HEAP_FRAG_P)->next = NULL; \ (HEAP_FRAG_P)->alloc_size = (DATA_WORDS); \ (HEAP_FRAG_P)->used_size = (DATA_WORDS); \ - (HEAP_FRAG_P)->off_heap.mso = NULL; \ - (HEAP_FRAG_P)->off_heap.funs = NULL; \ - (HEAP_FRAG_P)->off_heap.externals = NULL; \ + (HEAP_FRAG_P)->off_heap.first = NULL; \ (HEAP_FRAG_P)->off_heap.overhead = 0; \ } while (0) |