diff options
| author | Patrik Nyblom <[email protected]> | 2013-06-11 14:50:00 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-06-11 14:50:00 +0200 |
| commit | 5dd13b1efead2a8101ff1fb46937fbfa00db5269 (patch) | |
| tree | dd1de1385b7648e639614909e139ff86f92aff71 /erts/emulator/beam/atom.names | |
| parent | fdd8705381fb3accd2c9becea902fe8754bbb0ec (diff) | |
| parent | c013f8b647c29a41f351a91825906861f01d13ca (diff) | |
| download | otp-5dd13b1efead2a8101ff1fb46937fbfa00db5269.tar.gz otp-5dd13b1efead2a8101ff1fb46937fbfa00db5269.tar.bz2 otp-5dd13b1efead2a8101ff1fb46937fbfa00db5269.zip | |
Merge branch 'pan/happi/yield_in_term_to_binary' into maintOTP_R16B01_RC1
* pan/happi/yield_in_term_to_binary:
Add testcase to stress extra_root
term_to_binary: Remove debug code and set production trap levels
Teach erl_gc:offset_rootset about extra_root
Teach external.c to handle reallocs before compression
Make all steps ofterm_to_binary work in chunks and yield
Make term_to_binary yield (trap).
OTP-11163
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 3ee9eb0f88..eba1d0fa23 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -534,6 +534,7 @@ atom system_version atom system_architecture atom SYSTEM='SYSTEM' atom table +atom term_to_binary_trap atom this atom thread_pool_size atom threads |