diff options
author | Sverker Eriksson <[email protected]> | 2014-09-12 14:21:36 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2014-09-12 14:21:36 +0200 |
commit | 4530f4dc9eee2ec4f5831a4aab70fda6301cb3bb (patch) | |
tree | 65e1ef8fba05d04948e0d06bc9c4e674262e1863 /erts/emulator/beam/io.c | |
parent | 421cd880f2e2a63b8f4a5444200c2c5b3b8c1f3e (diff) | |
parent | faa53bd63b428d41c5ae3f67daf487947718e2a6 (diff) | |
download | otp-4530f4dc9eee2ec4f5831a4aab70fda6301cb3bb.tar.gz otp-4530f4dc9eee2ec4f5831a4aab70fda6301cb3bb.tar.bz2 otp-4530f4dc9eee2ec4f5831a4aab70fda6301cb3bb.zip |
Merge branch 'maint'
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 + } + } |