diff options
| author | Rickard Green <[email protected]> | 2017-01-17 12:39:55 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-17 12:39:55 +0100 |
| commit | 8e77d78810c2b77a81e261234b351d30e374d629 (patch) | |
| tree | db5c8dc37898b5c8e8bcd9d91b1c1e35ca3ff4dc /erts/emulator/beam/erl_msacc.c | |
| parent | 894cceaa2191bbb59474c1a1bfc657493c5ea79e (diff) | |
| parent | 0d20adbfbb0918c8d6bfc629e9e4ff89d2ef1a64 (diff) | |
| download | otp-8e77d78810c2b77a81e261234b351d30e374d629.tar.gz otp-8e77d78810c2b77a81e261234b351d30e374d629.tar.bz2 otp-8e77d78810c2b77a81e261234b351d30e374d629.zip | |
Merge branch 'rickard/ds-features-20'
OTP-14152
* rickard/ds-features-20:
Remove experimental disclaimer on dirty schedulers
Scheduler wall time support for dirty schedulers
Always return info from system_info(dirty_[cpu|io]_schedulers*)
Improve etp-commands
Switch between scheduler types when multi-scheduling is blocked
Perform potentially long GC on dirty schedulers if available
Return and exception trace for nif-export scheduled BIFs
Optimize handling of BIF errors
Support for dirty BIFs
Reduction counting on non-tail return
Diffstat (limited to 'erts/emulator/beam/erl_msacc.c')
| -rw-r--r-- | erts/emulator/beam/erl_msacc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_msacc.c b/erts/emulator/beam/erl_msacc.c index 7ddf49937f..66bb55e6c8 100644 --- a/erts/emulator/beam/erl_msacc.c +++ b/erts/emulator/beam/erl_msacc.c @@ -137,8 +137,8 @@ void erts_msacc_init_thread(char *type, int id, int managed) { void erts_msacc_set_bif_state(ErtsMsAcc *__erts_msacc_cache, Eterm mod, void *fn) { #ifdef ERTS_MSACC_EXTENDED_BIFS -#define BIF_LIST(Mod,Func,Arity,FuncAddr,Num) \ - if (fn == &FuncAddr) { \ +#define BIF_LIST(Mod,Func,Arity,BifFuncAddr,FuncAddr,Num) \ + if (fn == &BifFuncAddr) { \ ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATIC_STATE_COUNT + Num); \ } else #include "erl_bif_list.h" |