diff options
| author | John Högberg <[email protected]> | 2018-07-03 09:33:02 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-03 09:33:02 +0200 |
| commit | 6cfa8af60a9c6fe9043e4992434d40d4a34019e3 (patch) | |
| tree | 822993e0a4fb987014238369db045bf53eaafba3 /erts/emulator/beam/erl_ao_firstfit_alloc.h | |
| parent | bc22321f10c1ad71fb7e28275a8e6ed26a34d4ab (diff) | |
| parent | 29ce7ab0e4403fa688d1e5e5e2170e88d7e8f299 (diff) | |
| download | otp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.tar.gz otp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.tar.bz2 otp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.zip | |
Merge pull request #1854 from jhogberg/john/erts/cross-type-carrier-migration/OTP-15063
Allow carrier migration between different allocator types
Diffstat (limited to 'erts/emulator/beam/erl_ao_firstfit_alloc.h')
| -rw-r--r-- | erts/emulator/beam/erl_ao_firstfit_alloc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.h b/erts/emulator/beam/erl_ao_firstfit_alloc.h index 68df9e0a49..9c9b98da86 100644 --- a/erts/emulator/beam/erl_ao_firstfit_alloc.h +++ b/erts/emulator/beam/erl_ao_firstfit_alloc.h @@ -32,7 +32,12 @@ enum AOFFSortOrder { FF_AGEFF = 0, /* carrier trees only */ FF_AOFF = 1, FF_AOBF = 2, /* block trees only */ - FF_BF = 3 /* block trees only */ + FF_BF = 3, /* block trees only */ + + FF_CHAOS = -1 /* A test-specific sort order that picks any of the above + * after instance id. Used to test that carriers created + * under one order will work fine after being migrated + * to another. */ }; typedef struct { |