diff options
| author | Rickard Green <[email protected]> | 2012-08-03 15:12:02 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-08-03 15:12:02 +0200 |
| commit | afb19a88ab89ae0b45e28555eee2a03d8215b1b1 (patch) | |
| tree | e6e6816f2ae9ab44b2b35243dc347648a4d4028e /erts/emulator/beam/erl_message.h | |
| parent | e76262ea8ac6986a497bb1e7fbf5e75668027473 (diff) | |
| parent | 88126e785de24f5f41068c610bc13840dcab4a7d (diff) | |
| download | otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.tar.gz otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.tar.bz2 otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.zip | |
Merge branch 'rickard/tab-unref-thr-prgr/OTP-10167'
* rickard/tab-unref-thr-prgr/OTP-10167:
Use thread progress instead of scheduling misc aux work were possible
Conflicts:
erts/emulator/beam/erl_process.h
Diffstat (limited to 'erts/emulator/beam/erl_message.h')
| -rw-r--r-- | erts/emulator/beam/erl_message.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h index bb4dbf0ef3..2ae94965b1 100644 --- a/erts/emulator/beam/erl_message.h +++ b/erts/emulator/beam/erl_message.h @@ -125,23 +125,23 @@ typedef struct { #ifdef ERTS_SMP /* Move in message queue to end of private message queue */ -#define ERTS_SMP_MSGQ_MV_INQ2PRIVQ(P) \ -do { \ - if ((P)->msg_inq.first) { \ - *(P)->msg.last = (P)->msg_inq.first; \ - (P)->msg.last = (P)->msg_inq.last; \ - (P)->msg.len += (P)->msg_inq.len; \ - (P)->msg_inq.first = NULL; \ - (P)->msg_inq.last = &(P)->msg_inq.first; \ - (P)->msg_inq.len = 0; \ - } \ +#define ERTS_SMP_MSGQ_MV_INQ2PRIVQ(P) \ +do { \ + if ((P)->u.alive.msg_inq.first) { \ + *(P)->msg.last = (P)->u.alive.msg_inq.first; \ + (P)->msg.last = (P)->u.alive.msg_inq.last; \ + (P)->msg.len += (P)->u.alive.msg_inq.len; \ + (P)->u.alive.msg_inq.first = NULL; \ + (P)->u.alive.msg_inq.last = &(P)->u.alive.msg_inq.first; \ + (P)->u.alive.msg_inq.len = 0; \ + } \ } while (0) /* Add message last in message queue */ #define LINK_MESSAGE(p, mp) do { \ - *(p)->msg_inq.last = (mp); \ - (p)->msg_inq.last = &(mp)->next; \ - (p)->msg_inq.len++; \ + *(p)->u.alive.msg_inq.last = (mp); \ + (p)->u.alive.msg_inq.last = &(mp)->next; \ + (p)->u.alive.msg_inq.len++; \ } while(0) #else |