Merge branch 'maint'

* maint:
  Fix dirty schedulers build on windows

3 files changed, 44 insertions, 12 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 3b12f78ced..0ac22b637e 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -5252,19 +5252,14 @@ void erts_dirty_process_main(ErtsSchedulerData *esdp)
 	else {
 	    /*
 	     * Dirty CPU scheduler:
-	     *   Currently two reductions consumed per
-	     *   micro second spent in the dirty NIF.
+	     *   Reductions based on time consumed by
+	     *   the dirty NIF.
 	     */
-	    ErtsMonotonicTime time;
-	    time = erts_get_monotonic_time(esdp);
-	    time -= start_time;
-	    time = ERTS_MONOTONIC_TO_USEC(time);
-	    time *= (CONTEXT_REDS-1)/1000 + 1;
-	    ASSERT(time >= 0);
-	    if (time == 0)
-		time = 1; /* At least one reduction */
-	    time += esdp->virtual_reds;
-	    reds_used = time > INT_MAX ? INT_MAX : (int) time;
+	    Sint64 treds;
+	    treds = erts_time2reds(start_time,
+				   erts_get_monotonic_time(esdp));
+	    treds += esdp->virtual_reds;
+	    reds_used = treds > INT_MAX ? INT_MAX : (int) treds;
 	}
 
 	PROCESS_MAIN_CHK_LOCKS(c_p);
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index fa8290028a..bcbb9b3115 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -9408,6 +9408,14 @@ erts_set_process_priority(Process *p, Eterm value)
     }
 }
 
+#ifdef __WIN32__
+Sint64
+erts_time2reds(ErtsMonotonicTime start, ErtsMonotonicTime end)
+{
+    return ERTS_TIME2REDS_IMPL__(start, end);
+}
+#endif
+
 static int
 scheduler_gc_proc(Process *c_p, int reds_left)
 {
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index f1788c3f71..94c13bb948 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -2473,6 +2473,35 @@ erts_get_atom_cache_map(Process *c_p)
 }
 #endif
 
+#ifdef __WIN32__
+/*
+ * Don't want erts_time2reds() inlined in beam_emu.c on windows since
+ * it is compiled with gcc which fails on it. Implementation is in
+ * erl_process.c on windows.
+ */
+#  define ERTS_TIME2REDS_IMPL__ erts_time2reds__
+#else
+#  define ERTS_TIME2REDS_IMPL__ erts_time2reds
+#endif
+
+ERTS_GLB_INLINE Sint64 ERTS_TIME2REDS_IMPL__(ErtsMonotonicTime start,
+					     ErtsMonotonicTime end);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+ERTS_GLB_INLINE Sint64
+ERTS_TIME2REDS_IMPL__(ErtsMonotonicTime start, ErtsMonotonicTime end)
+{
+    ErtsMonotonicTime time = end - start;
+    ASSERT(time >= 0);
+    time = ERTS_MONOTONIC_TO_USEC(time);
+    if (time == 0)
+	return (Sint64) 1; /* At least one reduction */
+    /* Currently two reductions per micro second */
+    time *= (CONTEXT_REDS-1)/1000 + 1;
+    return (Sint64) time;
+}
+#endif
+
 Process *erts_pid2proc_suspend(Process *,
 			       ErtsProcLocks,
 			       Eterm,