diff options
| author | Rickard Green <[email protected]> | 2016-08-29 18:50:40 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-29 18:50:40 +0200 |
| commit | 81993991c8438aa31ec0e88f4f67637d43fa70c0 (patch) | |
| tree | b0f7c723ef79c0156bac5f74fcf77dc53aeb656d /erts/preloaded/ebin | |
| parent | ca85801bf0fffa1bc8b19ca3acb7f69f2361627c (diff) | |
| parent | b815d568e2e43d96698dbb8de6b993d55c1b14a0 (diff) | |
| download | otp-81993991c8438aa31ec0e88f4f67637d43fa70c0.tar.gz otp-81993991c8438aa31ec0e88f4f67637d43fa70c0.tar.bz2 otp-81993991c8438aa31ec0e88f4f67637d43fa70c0.zip | |
Merge branch 'maint'
* maint:
Fix tracing of processes executing dirty
Perform check_process_code while process is executing dirty
Fix purge of code
Reclaim literal area after purge has completed
Separate literal area from code
Conflicts:
erts/emulator/beam/global.h
Diffstat (limited to 'erts/preloaded/ebin')
| -rw-r--r-- | erts/preloaded/ebin/erts_code_purger.beam | bin | 8696 -> 11168 bytes |
| -rw-r--r-- | erts/preloaded/ebin/erts_dirty_process_code_checker.beam | bin | 0 -> 2144 bytes |
| -rw-r--r-- | erts/preloaded/ebin/erts_internal.beam | bin | 10536 -> 11116 bytes |
| -rw-r--r-- | erts/preloaded/ebin/erts_literal_area_collector.beam | bin | 0 -> 3304 bytes |
| -rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 50036 -> 50032 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erts_code_purger.beam b/erts/preloaded/ebin/erts_code_purger.beam Binary files differindex a0da864824..a1eb126098 100644 --- a/erts/preloaded/ebin/erts_code_purger.beam +++ b/erts/preloaded/ebin/erts_code_purger.beam diff --git a/erts/preloaded/ebin/erts_dirty_process_code_checker.beam b/erts/preloaded/ebin/erts_dirty_process_code_checker.beam Binary files differnew file mode 100644 index 0000000000..a7ac116c05 --- /dev/null +++ b/erts/preloaded/ebin/erts_dirty_process_code_checker.beam diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam Binary files differindex d897c8e92f..22817be8f4 100644 --- a/erts/preloaded/ebin/erts_internal.beam +++ b/erts/preloaded/ebin/erts_internal.beam diff --git a/erts/preloaded/ebin/erts_literal_area_collector.beam b/erts/preloaded/ebin/erts_literal_area_collector.beam Binary files differnew file mode 100644 index 0000000000..71f3c2ec8c --- /dev/null +++ b/erts/preloaded/ebin/erts_literal_area_collector.beam diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex f0344fd6ba..849273f746 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam |