diff options
| author | Rickard Green <[email protected]> | 2016-03-11 11:33:42 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-03-11 11:33:42 +0100 |
| commit | e6ca9a6b1352420d3cdc08970b049b02d4303a16 (patch) | |
| tree | 0c45d43cef9236045e507e9b2f911ce4eed075c2 /erts/emulator/beam/bif.h | |
| parent | d369571f10ccc5ebf4548f4dbc74efe649c5e669 (diff) | |
| parent | 207a569d4caf80b10a54eec2220ac672a3377f00 (diff) | |
| download | otp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.tar.gz otp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.tar.bz2 otp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.zip | |
Merge branch 'rickard/ds-sched-suspend'
* rickard/ds-sched-suspend:
Improved scheduler suspend functionality
Diffstat (limited to 'erts/emulator/beam/bif.h')
| -rw-r--r-- | erts/emulator/beam/bif.h | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/erts/emulator/beam/bif.h b/erts/emulator/beam/bif.h index a62eddf36b..46af552b39 100644 --- a/erts/emulator/beam/bif.h +++ b/erts/emulator/beam/bif.h @@ -338,37 +338,20 @@ do { \ } while(0) extern Export bif_return_trap_export; -#ifdef DEBUG -#define ERTS_BIF_PREP_YIELD_RETURN_X(RET, P, VAL, DEBUG_VAL) \ +#define ERTS_BIF_PREP_YIELD_RETURN_X(RET, P, VAL, OP) \ do { \ ERTS_VBUMP_ALL_REDS(P); \ - ERTS_BIF_PREP_TRAP2(RET, &bif_return_trap_export, (P), (VAL), \ - (DEBUG_VAL)); \ + ERTS_BIF_PREP_TRAP2(RET, &bif_return_trap_export, (P), (VAL), (OP));\ } while (0) -#else -#define ERTS_BIF_PREP_YIELD_RETURN_X(RET, P, VAL, DEBUG_VAL) \ -do { \ - ERTS_VBUMP_ALL_REDS(P); \ - ERTS_BIF_PREP_TRAP1(RET, &bif_return_trap_export, (P), (VAL)); \ -} while (0) -#endif #define ERTS_BIF_PREP_YIELD_RETURN(RET, P, VAL) \ ERTS_BIF_PREP_YIELD_RETURN_X(RET, (P), (VAL), am_undefined) -#ifdef DEBUG -#define ERTS_BIF_YIELD_RETURN_X(P, VAL, DEBUG_VAL) \ +#define ERTS_BIF_YIELD_RETURN_X(P, VAL, OP) \ do { \ ERTS_VBUMP_ALL_REDS(P); \ - BIF_TRAP2(&bif_return_trap_export, (P), (VAL), (DEBUG_VAL)); \ + BIF_TRAP2(&bif_return_trap_export, (P), (VAL), (OP)); \ } while (0) -#else -#define ERTS_BIF_YIELD_RETURN_X(P, VAL, DEBUG_VAL) \ -do { \ - ERTS_VBUMP_ALL_REDS(P); \ - BIF_TRAP1(&bif_return_trap_export, (P), (VAL)); \ -} while (0) -#endif #define ERTS_BIF_RETURN_YIELD(P) ERTS_VBUMP_ALL_REDS((P)) |