diff options
author | Rickard Green <[email protected]> | 2012-08-03 15:06:21 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2012-08-03 15:06:21 +0200 |
commit | e76262ea8ac6986a497bb1e7fbf5e75668027473 (patch) | |
tree | 7128f0a39f6a996f7abd67e16fa3167bdc28e116 /erts/emulator/beam/erl_message.h | |
parent | ee51d735f05514a784d808be9604703d70561731 (diff) | |
parent | ff1a1e3c6f9a233b880e9d359a1c50e55d7c812f (diff) | |
download | otp-e76262ea8ac6986a497bb1e7fbf5e75668027473.tar.gz otp-e76262ea8ac6986a497bb1e7fbf5e75668027473.tar.bz2 otp-e76262ea8ac6986a497bb1e7fbf5e75668027473.zip |
Merge branch 'rickard/proc-sched/OTP-9892'
* rickard/proc-sched/OTP-9892:
Read message queue lengths while having lock
Remove development debug code
Fix bug scheduling free processes
Conflicts:
erts/emulator/beam/erl_message.c
Diffstat (limited to 'erts/emulator/beam/erl_message.h')
-rw-r--r-- | erts/emulator/beam/erl_message.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h index 3e9a24ee81..bb4dbf0ef3 100644 --- a/erts/emulator/beam/erl_message.h +++ b/erts/emulator/beam/erl_message.h @@ -90,7 +90,7 @@ typedef struct { ErlMessage* first; ErlMessage** last; /* point to the last next pointer */ ErlMessage** save; - int len; /* queue length */ + Sint len; /* queue length */ /* * The following two fields are used by the recv_mark/1 and @@ -105,7 +105,7 @@ typedef struct { typedef struct { ErlMessage* first; ErlMessage** last; /* point to the last next pointer */ - int len; /* queue length */ + Sint len; /* queue length */ } ErlMessageInQueue; #endif @@ -234,7 +234,7 @@ void erts_queue_message(Process*, ErtsProcLocks*, ErlHeapFragment*, Eterm, Eterm #endif ); void erts_deliver_exit_message(Eterm, Process*, ErtsProcLocks *, Eterm, Eterm); -void erts_send_message(Process*, Process*, ErtsProcLocks*, Eterm, unsigned); +Sint erts_send_message(Process*, Process*, ErtsProcLocks*, Eterm, unsigned); void erts_link_mbuf_to_proc(Process *proc, ErlHeapFragment *bp); void erts_move_msg_mbuf_to_heap(Eterm**, ErlOffHeap*, ErlMessage *); |