Merge branch 'maint'

10 files changed, 99 insertions, 46 deletions

diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index 5ced8c5ca0..f9938fc66c 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -133,7 +133,7 @@ typedef struct {
 
 #define ERL_DRV_EXTENDED_MARKER		(0xfeeeeeed)
 #define ERL_DRV_EXTENDED_MAJOR_VERSION	3
-#define ERL_DRV_EXTENDED_MINOR_VERSION	0
+#define ERL_DRV_EXTENDED_MINOR_VERSION	1
 
 /*
  * The emulator will refuse to load a driver with a major version
diff --git a/erts/emulator/beam/erl_drv_nif.h b/erts/emulator/beam/erl_drv_nif.h
index 3f829ea7ea..4e8c6dc68b 100644
--- a/erts/emulator/beam/erl_drv_nif.h
+++ b/erts/emulator/beam/erl_drv_nif.h
@@ -35,6 +35,7 @@ typedef struct {
     int scheduler_threads;
     int nif_major_version;
     int nif_minor_version;
+    int dirty_scheduler_support;
 }  ErlDrvSysInfo;
 
 typedef struct {
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 44914d3681..ede5f335dc 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -1901,16 +1901,6 @@ enif_is_on_dirty_scheduler(ErlNifEnv* env)
     return ERTS_SCHEDULER_IS_DIRTY(env->proc->scheduler_data);
 }
 
-int
-enif_have_dirty_schedulers()
-{
-#ifdef USE_THREADS
-    return 1;
-#else
-    return 0;
-#endif
-}
-
 #endif /* ERL_NIF_DIRTY_SCHEDULER_SUPPORT */
 
 /* Maps */
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h
index be39816a64..630cefae93 100644
--- a/erts/emulator/beam/erl_nif_api_funcs.h
+++ b/erts/emulator/beam/erl_nif_api_funcs.h
@@ -22,7 +22,7 @@
 #endif
 
 /*
-** WARNING: add new ERL_NIF_API_FUNC_DECL entries at the bottom of the list
+** WARNING: Add new ERL_NIF_API_FUNC_DECL entries at the bottom of the list
 ** to keep compatibility on Windows!!!
 **
 ** And don't forget to increase ERL_NIF_MINOR_VERSION in erl_nif.h
@@ -141,12 +141,6 @@ ERL_NIF_API_FUNC_DECL(int,enif_is_number,(ErlNifEnv*, ERL_NIF_TERM term));
 ERL_NIF_API_FUNC_DECL(void*,enif_dlopen,(const char* lib, void (*err_handler)(void*,const char*), void* err_arg));
 ERL_NIF_API_FUNC_DECL(void*,enif_dlsym,(void* handle, const char* symbol, void (*err_handler)(void*,const char*), void* err_arg));
 ERL_NIF_API_FUNC_DECL(int,enif_consume_timeslice,(ErlNifEnv*, int percent));
-ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_schedule_nif,(ErlNifEnv*,const char*,int,ERL_NIF_TERM (*)(ErlNifEnv*,int,const ERL_NIF_TERM[]),int,const ERL_NIF_TERM[]));
-#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
-ERL_NIF_API_FUNC_DECL(int,enif_is_on_dirty_scheduler,(ErlNifEnv*));
-ERL_NIF_API_FUNC_DECL(int,enif_have_dirty_schedulers,(void));
-#endif
-
 ERL_NIF_API_FUNC_DECL(int, enif_is_map, (ErlNifEnv* env, ERL_NIF_TERM term));
 ERL_NIF_API_FUNC_DECL(int, enif_get_map_size, (ErlNifEnv* env, ERL_NIF_TERM term, size_t *size));
 ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM, enif_make_new_map, (ErlNifEnv* env));
@@ -161,12 +155,22 @@ ERL_NIF_API_FUNC_DECL(int, enif_map_iterator_is_tail, (ErlNifEnv *env, ErlNifMap
 ERL_NIF_API_FUNC_DECL(int, enif_map_iterator_next, (ErlNifEnv *env, ErlNifMapIterator *iter));
 ERL_NIF_API_FUNC_DECL(int, enif_map_iterator_prev, (ErlNifEnv *env, ErlNifMapIterator *iter));
 ERL_NIF_API_FUNC_DECL(int, enif_map_iterator_get_pair, (ErlNifEnv *env, ErlNifMapIterator *iter, ERL_NIF_TERM *key, ERL_NIF_TERM *value));
-
+ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_schedule_nif,(ErlNifEnv*,const char*,int,ERL_NIF_TERM (*)(ErlNifEnv*,int,const ERL_NIF_TERM[]),int,const ERL_NIF_TERM[]));
 
 /*
-** Add new entries here to keep compatibility on Windows!!!
+** ADD NEW ENTRIES HERE (before this comment) !!!
 */
+
+
+/*
+ * Conditional EXPERIMENTAL stuff always last.
+ * Must be moved up and made unconditional to support binary backward
+ * compatibility on Windows.
+ */
+#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
+ERL_NIF_API_FUNC_DECL(int,enif_is_on_dirty_scheduler,(ErlNifEnv*));
 #endif
+#endif /* ERL_NIF_API_FUNC_DECL */
 
 /*
 ** Please keep the ERL_NIF_API_FUNC_MACRO list below in the same order
@@ -280,19 +284,12 @@ ERL_NIF_API_FUNC_DECL(int, enif_map_iterator_get_pair, (ErlNifEnv *env, ErlNifMa
 #  define enif_make_int64 ERL_NIF_API_FUNC_MACRO(enif_make_int64)
 #  define enif_make_uint64 ERL_NIF_API_FUNC_MACRO(enif_make_uint64)
 #endif
-
 #  define enif_is_exception ERL_NIF_API_FUNC_MACRO(enif_is_exception)
 #  define enif_make_reverse_list ERL_NIF_API_FUNC_MACRO(enif_make_reverse_list)
 #  define enif_is_number ERL_NIF_API_FUNC_MACRO(enif_is_number)
 #  define enif_dlopen ERL_NIF_API_FUNC_MACRO(enif_dlopen)
 #  define enif_dlsym ERL_NIF_API_FUNC_MACRO(enif_dlsym)
 #  define enif_consume_timeslice ERL_NIF_API_FUNC_MACRO(enif_consume_timeslice)
-#  define enif_schedule_nif ERL_NIF_API_FUNC_MACRO(enif_schedule_nif)
-#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
-#  define enif_is_on_dirty_scheduler ERL_NIF_API_FUNC_MACRO(enif_is_on_dirty_scheduler)
-#  define enif_have_dirty_schedulers ERL_NIF_API_FUNC_MACRO(enif_have_dirty_schedulers)
-#endif
-
 #  define enif_is_map ERL_NIF_API_FUNC_MACRO(enif_is_map)
 #  define enif_get_map_size ERL_NIF_API_FUNC_MACRO(enif_get_map_size)
 #  define enif_make_new_map ERL_NIF_API_FUNC_MACRO(enif_make_new_map)
@@ -307,11 +304,21 @@ ERL_NIF_API_FUNC_DECL(int, enif_map_iterator_get_pair, (ErlNifEnv *env, ErlNifMa
 #  define enif_map_iterator_next ERL_NIF_API_FUNC_MACRO(enif_map_iterator_next)
 #  define enif_map_iterator_prev ERL_NIF_API_FUNC_MACRO(enif_map_iterator_prev)
 #  define enif_map_iterator_get_pair ERL_NIF_API_FUNC_MACRO(enif_map_iterator_get_pair)
+#  define enif_schedule_nif ERL_NIF_API_FUNC_MACRO(enif_schedule_nif)
 
 /*
-** Add new entries here
+** ADD NEW ENTRIES HERE (before this comment)
 */
+
+/*
+ * Conditional EXPERIMENTAL stuff always last
+ * Must be moved up and made unconditional to support binary backward
+ * compatibility on Windows.
+ */
+#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
+#  define enif_is_on_dirty_scheduler ERL_NIF_API_FUNC_MACRO(enif_is_on_dirty_scheduler)
 #endif
+#endif  /* ERL_NIF_API_FUNC_MACRO */
 
 
 #if defined(__GNUC__) && !(defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))
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
+    }
+
 }
 
 
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 344bde7c91..336b6188f6 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -1084,7 +1084,15 @@ otp_6602(Config) when is_list(Config) ->
 	 ["async_thrs",
 	  "sched_thrs"])).
 
--define(EXPECTED_SYSTEM_INFO_NAMES, ?EXPECTED_SYSTEM_INFO_NAMES2).
+-define(EXPECTED_SYSTEM_INFO_NAMES3,
+	(?EXPECTED_SYSTEM_INFO_NAMES2 ++
+	 ["emu_nif_vsn"])).
+
+-define(EXPECTED_SYSTEM_INFO_NAMES4,
+	(?EXPECTED_SYSTEM_INFO_NAMES3 ++
+	 ["dirty_sched"])).
+
+-define(EXPECTED_SYSTEM_INFO_NAMES, ?EXPECTED_SYSTEM_INFO_NAMES4).
 
 'driver_system_info_base_ver'(doc) ->
     [];
@@ -1132,16 +1140,18 @@ check_driver_system_info_result(Result) ->
 		drv_vsn_str2tup(erlang:system_info(driver_version))} of
 	      {DDVSN, DDVSN} ->
 		  ?line [] = Ns;
-	      {{1, 0}, _} ->
+	      %% {{1, 0}, _} ->
+	      %% 	  ?line ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
+	      %% 				   -- ?EXPECTED_SYSTEM_INFO_NAMES1),
+	      %% 	  ?line ExpNs = lists:sort(Ns);
+	      %% {{1, 1}, _} ->
+	      %% 	  ?line ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
+	      %% 				   -- ?EXPECTED_SYSTEM_INFO_NAMES2),
+	      %% 	  ?line ExpNs = lists:sort(Ns);
+	      {{3, 0}, _} ->
 		  ?line ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
-					   -- ?EXPECTED_SYSTEM_INFO_NAMES1),
-		  ?line ExpNs = lists:sort(Ns);
-	      {{1, 1}, _} ->
-		  ?line ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
-					   -- ?EXPECTED_SYSTEM_INFO_NAMES2),
-		  ?line ExpNs = lists:sort(Ns);
-	      {{2, 0}, _} ->
-		  ?line [] = Ns
+					   -- ?EXPECTED_SYSTEM_INFO_NAMES3),
+		  ?line ExpNs = lists:sort(Ns)
 	  end.
 
 chk_sis(SIs, Ns) ->
@@ -1188,6 +1198,14 @@ check_si_res(["async_thrs", Value]) ->
 check_si_res(["sched_thrs", Value]) ->
     ?line Value = integer_to_list(erlang:system_info(schedulers));
 
+%% Data added in 3rd version of driver_system_info() (driver version 1.5)
+check_si_res(["emu_nif_vsn", _Value]) ->
+    true;
+
+%% Data added in 4th version of driver_system_info() (driver version 3.1)
+check_si_res(["dirty_sched", _Value]) ->
+    true;
+
 check_si_res(Unexpected) ->
     ?line ?t:fail({unexpected_result, Unexpected}).
 
diff --git a/erts/emulator/test/driver_SUITE_data/sys_info_base_drv.c b/erts/emulator/test/driver_SUITE_data/sys_info_base_drv.c
index e44c7dbd5e..964034f5a6 100644
--- a/erts/emulator/test/driver_SUITE_data/sys_info_base_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/sys_info_base_drv.c
@@ -41,7 +41,9 @@
   "thread=%s "				\
   "smp=%s "				\
   "async_thrs=%d "			\
-  "sched_thrs=%d"
+  "sched_thrs=%d "                      \
+  "emu_nif_vsn=%d.%d"
+
 
 static size_t
 sys_info_drv_max_res_len(ErlDrvSysInfo *sip)
@@ -55,6 +57,7 @@ sys_info_drv_max_res_len(ErlDrvSysInfo *sip)
     slen += 5;		/* smp */
     slen += 20;		/* async_thrs */
     slen += 20;		/* sched_thrs */
+    slen += 2*20;       /* emu_nif_vsn */
     return slen;
 }
 
@@ -72,7 +75,9 @@ sys_info_drv_sprintf_sys_info(ErlDrvSysInfo *sip, char *str)
 		   sip->thread_support ? "true" : "false",
 		   sip->smp_support ? "true" : "false",
 		   sip->async_threads,
-		   sip->scheduler_threads);
+		   sip->scheduler_threads,
+		   sip->nif_major_version,
+		   sip->nif_minor_version);
 }
 
 #include "sys_info_drv_impl.c"
diff --git a/erts/emulator/test/driver_SUITE_data/sys_info_curr_drv.c b/erts/emulator/test/driver_SUITE_data/sys_info_curr_drv.c
index 5bbc966932..6d2c47fdaf 100644
--- a/erts/emulator/test/driver_SUITE_data/sys_info_curr_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/sys_info_curr_drv.c
@@ -40,7 +40,9 @@
   "thread=%s "				\
   "smp=%s "				\
   "async_thrs=%d "			\
-  "sched_thrs=%d"
+  "sched_thrs=%d "                      \
+  "emu_nif_vsn=%d.%d "                  \
+  "dirty_sched=%s"
 
 static size_t
 sys_info_drv_max_res_len(ErlDrvSysInfo *sip)
@@ -54,6 +56,8 @@ sys_info_drv_max_res_len(ErlDrvSysInfo *sip)
     slen += 5;		/* smp */
     slen += 20;		/* async_thrs */
     slen += 20;		/* sched_thrs */
+    slen += 2*20;       /* emu_nif_vsn */
+    slen += 5;          /* dirty_sched */
     return slen;
 }
 
@@ -71,7 +75,10 @@ sys_info_drv_sprintf_sys_info(ErlDrvSysInfo *sip, char *str)
 		   sip->thread_support ? "true" : "false",
 		   sip->smp_support ? "true" : "false",
 		   sip->async_threads,
-		   sip->scheduler_threads);
+		   sip->scheduler_threads,
+		   sip->nif_major_version,
+		   sip->nif_minor_version,
+		   sip->dirty_scheduler_support ? "true" : "false");
 }
 
 #include "sys_info_drv_impl.c"
diff --git a/erts/emulator/test/driver_SUITE_data/sys_info_prev_drv.c b/erts/emulator/test/driver_SUITE_data/sys_info_prev_drv.c
index 63c69f751c..2271d7027b 100644
--- a/erts/emulator/test/driver_SUITE_data/sys_info_prev_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/sys_info_prev_drv.c
@@ -41,7 +41,9 @@
   "thread=%s "				\
   "smp=%s "				\
   "async_thrs=%d "			\
-  "sched_thrs=%d"
+  "sched_thrs=%d "                      \
+  "emu_nif_vsn=%d.%d"
+
 
 static size_t
 sys_info_drv_max_res_len(ErlDrvSysInfo *sip)
@@ -55,6 +57,7 @@ sys_info_drv_max_res_len(ErlDrvSysInfo *sip)
     slen += 5;		/* smp */
     slen += 20;		/* async_thrs */
     slen += 20;		/* sched_thrs */
+    slen += 2*20;       /* emu_nif_vsn */
     return slen;
 }
 
@@ -72,7 +75,9 @@ sys_info_drv_sprintf_sys_info(ErlDrvSysInfo *sip, char *str)
 		   sip->thread_support ? "true" : "false",
 		   sip->smp_support ? "true" : "false",
 		   sip->async_threads,
-		   sip->scheduler_threads);
+		   sip->scheduler_threads,
+		   sip->nif_major_version,
+		   sip->nif_minor_version);
 }
 
 #include "sys_info_drv_impl.c"
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index ff5fb8c5af..291c903947 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -1539,13 +1539,21 @@ static ERL_NIF_TERM call_nif_schedule(ErlNifEnv* env, int argc, const ERL_NIF_TE
 }
 
 #ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
+
+static int have_dirty_schedulers(void)
+{
+    ErlNifSysInfo si;
+    enif_system_info(&si, sizeof(si));
+    return si.dirty_scheduler_support;
+}
+
 static ERL_NIF_TERM dirty_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     int n;
     char s[10];
     ErlNifBinary b;
     ERL_NIF_TERM result;
-    if (enif_have_dirty_schedulers()) {
+    if (have_dirty_schedulers()) {
 	assert(enif_is_on_dirty_scheduler(env));
     }
     assert(argc == 3);
@@ -1566,7 +1574,7 @@ static ERL_NIF_TERM call_dirty_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
     assert(!enif_is_on_dirty_scheduler(env));
     if (argc != 3)
 	return enif_make_badarg(env);
-    if (enif_have_dirty_schedulers()) {
+    if (have_dirty_schedulers()) {
 	if (enif_get_int(env, argv[0], &n) &&
 	    enif_get_string(env, argv[1], s, sizeof s, ERL_NIF_LATIN1) &&
 	    enif_inspect_binary(env, argv[2], &b))