diff options
| author | Sverker Eriksson <[email protected]> | 2011-04-21 11:00:28 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-05-09 17:12:31 +0200 |
| commit | 87b389731e5d9862e0bfac2708ffb5170f9b98d8 (patch) | |
| tree | ba6d3a45ced61b1803ba8570ac3e91e64d4f866b /erts/emulator/beam/erl_lock_check.c | |
| parent | e3af9123e7ef9291535cafbd0ecb9d3309d674f7 (diff) | |
| download | otp-87b389731e5d9862e0bfac2708ffb5170f9b98d8.tar.gz otp-87b389731e5d9862e0bfac2708ffb5170f9b98d8.tar.bz2 otp-87b389731e5d9862e0bfac2708ffb5170f9b98d8.zip | |
Expand the use of high memory allocation in halfword emulator
Also add 'low' field in system_info(allocator)
SHORT_LIVED is still in low memory
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index 9e18997890..9180508a49 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -240,7 +240,7 @@ typedef struct erts_lc_locked_lock_t_ erts_lc_locked_lock_t; struct erts_lc_locked_lock_t_ { erts_lc_locked_lock_t *next; erts_lc_locked_lock_t *prev; - Eterm extra; + UWord extra; Sint16 id; Uint16 flags; }; @@ -441,12 +441,12 @@ new_locked_lock(erts_lc_lock_t *lck, Uint16 op_flags) } static void -print_lock2(char *prefix, Sint16 id, Eterm extra, Uint16 flags, char *suffix) +print_lock2(char *prefix, Sint16 id, Wterm extra, Uint16 flags, char *suffix) { char *lname = (0 <= id && id < ERTS_LOCK_ORDER_SIZE ? erts_lock_order[id].name : "unknown"); - if (is_boxed(extra)) + if (is_not_immed(extra)) erts_fprintf(stderr, "%s'%s:%p%s'%s%s", prefix, @@ -1260,7 +1260,8 @@ erts_lc_init_lock(erts_lc_lock_t *lck, char *name, Uint16 flags) { lck->id = erts_lc_get_lock_order_id(name); - lck->extra = make_boxed(&lck->extra); + lck->extra = &lck->extra; + ASSERT(is_not_immed(lck->extra)); lck->flags = flags; lck->inited = ERTS_LC_INITITALIZED; } @@ -1270,6 +1271,7 @@ erts_lc_init_lock_x(erts_lc_lock_t *lck, char *name, Uint16 flags, Eterm extra) { lck->id = erts_lc_get_lock_order_id(name); lck->extra = extra; + ASSERT(is_immed(lck->extra)); lck->flags = flags; lck->inited = ERTS_LC_INITITALIZED; } |