diff options
| author | Sverker Eriksson <[email protected]> | 2014-09-12 14:20:18 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-09-12 14:20:18 +0200 |
| commit | faa53bd63b428d41c5ae3f67daf487947718e2a6 (patch) | |
| tree | a7bedc859a2a3daddc719326fdb72a39843d3387 /erts/emulator/beam/io.c | |
| parent | 92820da8b662ffc4b9997a30eff414f24a8e0e7c (diff) | |
| parent | 12d3d25535225934cb2190c82c1b5dae005f1cda (diff) | |
| download | otp-faa53bd63b428d41c5ae3f67daf487947718e2a6.tar.gz otp-faa53bd63b428d41c5ae3f67daf487947718e2a6.tar.bz2 otp-faa53bd63b428d41c5ae3f67daf487947718e2a6.zip | |
Merge branch 'sverk/dirty-sched-api-cleanup' into maint
* sverk/dirty-sched-api-cleanup:
erts: Remove enif_have_dirty_schedulers()
erts: Correct dirty scheduler NIF API for Windows
Diffstat (limited to 'erts/emulator/beam/io.c')
| -rw-r--r-- | erts/emulator/beam/io.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index ae053fc191..9ae973e108 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -7274,6 +7274,18 @@ driver_system_info(ErlDrvSysInfo *sip, size_t si_size) sip->nif_major_version = ERL_NIF_MAJOR_VERSION; sip->nif_minor_version = ERL_NIF_MINOR_VERSION; } + /* + * 'dirty_scheduler_support' is the last field in the 4th version + * (driver version 3.1, NIF version 2.7) + */ + if (si_size >= ERL_DRV_SYS_INFO_SIZE(dirty_scheduler_support)) { +#if defined(ERL_NIF_DIRTY_SCHEDULER_SUPPORT) && defined(USE_THREADS) + sip->dirty_scheduler_support = 1; +#else + sip->dirty_scheduler_support = 0; +#endif + } + } |