diff options
| author | Rickard Green <[email protected]> | 2012-07-31 22:09:24 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-07-31 22:09:24 +0200 |
| commit | 8082d20dcf47a143290cd0362ec014dfa998e0f4 (patch) | |
| tree | 16a657691896004cb56b91ba0e70722f373bf3bf /erts/emulator/beam/erl_process_lock.h | |
| parent | a67d0be885529844b3c14102604a38f556e70ecc (diff) | |
| parent | d15c8cec3c9ecbba18fa5ed5cf6e8050c0e1a239 (diff) | |
| download | otp-8082d20dcf47a143290cd0362ec014dfa998e0f4.tar.gz otp-8082d20dcf47a143290cd0362ec014dfa998e0f4.tar.bz2 otp-8082d20dcf47a143290cd0362ec014dfa998e0f4.zip | |
Merge branch 'maint'
* maint:
Use static allocation of process lock queues
Conflicts:
erts/emulator/beam/erl_process_lock.c
erts/emulator/beam/erl_process_lock.h
Diffstat (limited to 'erts/emulator/beam/erl_process_lock.h')
| -rw-r--r-- | erts/emulator/beam/erl_process_lock.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h index 7367e03b44..ca853bf347 100644 --- a/erts/emulator/beam/erl_process_lock.h +++ b/erts/emulator/beam/erl_process_lock.h @@ -69,8 +69,6 @@ typedef erts_aint32_t ErtsProcLocks; -typedef struct erts_proc_lock_queues_t_ erts_proc_lock_queues_t; - typedef struct erts_proc_lock_t_ { #if ERTS_PROC_LOCK_OWN_IMPL #if ERTS_PROC_LOCK_ATOMIC_IMPL @@ -78,7 +76,7 @@ typedef struct erts_proc_lock_t_ { #else ErtsProcLocks flags; #endif - erts_proc_lock_queues_t *queues; + erts_tse_t *queue[ERTS_PROC_LOCK_MAX_BIT+1]; #ifdef ERTS_ENABLE_LOCK_COUNT erts_lcnt_lock_t lcnt_main; erts_lcnt_lock_t lcnt_link; |