diff options
| author | Hans Nilsson <[email protected]> | 2016-06-30 12:23:29 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-06-30 12:23:29 +0200 |
| commit | 571baf5f6c45ac0a4a9d8b0fb8465077191fc0d9 (patch) | |
| tree | 220b0075400ebee063d1e2052e8282007756908d /erts/emulator | |
| parent | 2b34c1fb98053b3cff3cfb38f9e9c2c94405eb3f (diff) | |
| parent | 7c91a9c8d4a05ab254b89a6b1d700ff794017579 (diff) | |
| download | otp-571baf5f6c45ac0a4a9d8b0fb8465077191fc0d9.tar.gz otp-571baf5f6c45ac0a4a9d8b0fb8465077191fc0d9.tar.bz2 otp-571baf5f6c45ac0a4a9d8b0fb8465077191fc0d9.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/bif.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index fc14061a44..d9048065c8 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -4305,8 +4305,9 @@ BIF_RETTYPE group_leader_2(BIF_ALIST_2) else { locks &= ~ERTS_PROC_LOCK_STATUS; erts_smp_proc_unlock(new_member, ERTS_PROC_LOCK_STATUS); - if (erts_smp_atomic32_read_nob(&new_member->state) - & !(ERTS_PSFLG_DIRTY_RUNNING|ERTS_PSFLG_DIRTY_RUNNING_SYS)) { + if (new_member == BIF_P + || !(erts_smp_atomic32_read_nob(&new_member->state) + & (ERTS_PSFLG_DIRTY_RUNNING|ERTS_PSFLG_DIRTY_RUNNING_SYS))) { new_member->group_leader = STORE_NC_IN_PROC(new_member, BIF_ARG_1); } @@ -4326,6 +4327,7 @@ BIF_RETTYPE group_leader_2(BIF_ALIST_2) BIF_ARG_1); bp->next = new_member->mbuf; new_member->mbuf = bp; + new_member->mbuf_sz += bp->used_size; } } } |