3 files changed, 100 insertions, 4 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index 98e1efe18f..1acb270d1f 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -34,6 +34,10 @@ static ERL_NIF_TERM atom_self;
 static ERL_NIF_TERM atom_ok;
 static ERL_NIF_TERM atom_join;
 static ERL_NIF_TERM atom_binary_resource_type;
+static ERL_NIF_TERM atom_seconds;
+static ERL_NIF_TERM atom_milli_seconds;
+static ERL_NIF_TERM atom_micro_seconds;
+static ERL_NIF_TERM atom_nano_seconds;
 
 
 typedef struct
@@ -138,6 +142,10 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
     atom_ok = enif_make_atom(env,"ok");
     atom_join = enif_make_atom(env,"join");
     atom_binary_resource_type = enif_make_atom(env,"binary_resource_type");
+    atom_seconds = enif_make_atom(env,"seconds");
+    atom_milli_seconds = enif_make_atom(env,"milli_seconds");
+    atom_micro_seconds = enif_make_atom(env,"micro_seconds");
+    atom_nano_seconds = enif_make_atom(env,"nano_seconds");
 
     *priv_data = data;
     return 0;
@@ -906,6 +914,7 @@ static ERL_NIF_TERM check_is_exception(ErlNifEnv* env, int argc, const ERL_NIF_T
  * argv[2] empty list
  * argv[3] not an atom
  * argv[4] not a list
+ * argv[5] improper list
  */
 static ERL_NIF_TERM length_test(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
@@ -926,6 +935,9 @@ static ERL_NIF_TERM length_test(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
     if (enif_get_list_length(env, argv[4], &len))
 	return enif_make_badarg(env);
 
+    if (enif_get_list_length(env, argv[5], &len))
+	return enif_make_badarg(env);
+
     return enif_make_atom(env, "ok");
 }
 
@@ -1885,6 +1897,87 @@ static ERL_NIF_TERM sorted_list_from_maps_nif(ErlNifEnv* env, int argc, const ER
     return enif_make_tuple2(env, list_f, list_b);
 }
 
+
+static ERL_NIF_TERM monotonic_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifTimeUnit time_unit;
+
+    if (argc != 1)
+	return atom_false;
+
+    if (enif_compare(argv[0], atom_seconds) == 0)
+	time_unit = ERL_NIF_SEC;
+    else if (enif_compare(argv[0], atom_milli_seconds) == 0)
+	time_unit = ERL_NIF_MSEC;
+    else if (enif_compare(argv[0], atom_micro_seconds) == 0)
+	time_unit = ERL_NIF_USEC;
+    else if (enif_compare(argv[0], atom_nano_seconds) == 0)
+	time_unit = ERL_NIF_NSEC;
+    else
+	time_unit = 4711; /* invalid time unit */
+
+    return enif_make_int64(env, enif_monotonic_time(time_unit));
+}
+
+static ERL_NIF_TERM time_offset(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifTimeUnit time_unit;
+
+    if (argc != 1)
+	return atom_false;
+
+    if (enif_compare(argv[0], atom_seconds) == 0)
+	time_unit = ERL_NIF_SEC;
+    else if (enif_compare(argv[0], atom_milli_seconds) == 0)
+	time_unit = ERL_NIF_MSEC;
+    else if (enif_compare(argv[0], atom_micro_seconds) == 0)
+	time_unit = ERL_NIF_USEC;
+    else if (enif_compare(argv[0], atom_nano_seconds) == 0)
+	time_unit = ERL_NIF_NSEC;
+    else
+	time_unit = 4711; /* invalid time unit */
+    return enif_make_int64(env, enif_time_offset(time_unit));
+}
+
+static ERL_NIF_TERM convert_time_unit(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifSInt64 i64;
+    ErlNifTime val;
+    ErlNifTimeUnit from, to;
+
+    if (argc != 3)
+	return atom_false;
+
+    if (!enif_get_int64(env, argv[0], &i64))
+	return enif_make_badarg(env);
+
+    val = (ErlNifTime) i64;
+
+    if (enif_compare(argv[1], atom_seconds) == 0)
+	from = ERL_NIF_SEC;
+    else if (enif_compare(argv[1], atom_milli_seconds) == 0)
+	from = ERL_NIF_MSEC;
+    else if (enif_compare(argv[1], atom_micro_seconds) == 0)
+	from = ERL_NIF_USEC;
+    else if (enif_compare(argv[1], atom_nano_seconds) == 0)
+	from = ERL_NIF_NSEC;
+    else
+	from = 4711; /* invalid time unit */
+
+    if (enif_compare(argv[2], atom_seconds) == 0)
+	to = ERL_NIF_SEC;
+    else if (enif_compare(argv[2], atom_milli_seconds) == 0)
+	to = ERL_NIF_MSEC;
+    else if (enif_compare(argv[2], atom_micro_seconds) == 0)
+	to = ERL_NIF_USEC;
+    else if (enif_compare(argv[2], atom_nano_seconds) == 0)
+	to = ERL_NIF_NSEC;
+    else
+	to = 4711; /* invalid time unit */
+
+    return enif_make_int64(env, enif_convert_time_unit(val, from, to));
+}
+
 static ErlNifFunc nif_funcs[] =
 {
     {"lib_version", 0, lib_version},
@@ -1913,7 +2006,7 @@ static ErlNifFunc nif_funcs[] =
     {"make_new_resource", 2, make_new_resource},
     {"check_is", 11, check_is},
     {"check_is_exception", 0, check_is_exception},
-    {"length_test", 5, length_test},
+    {"length_test", 6, length_test},
     {"make_atoms", 0, make_atoms},
     {"make_strings", 0, make_strings},
     {"make_new_resource", 2, make_new_resource},
@@ -1954,7 +2047,10 @@ static ErlNifFunc nif_funcs[] =
     {"make_map_update_nif", 3, make_map_update_nif},
     {"make_map_remove_nif", 2, make_map_remove_nif},
     {"maps_from_list_nif", 1, maps_from_list_nif},
-    {"sorted_list_from_maps_nif", 1, sorted_list_from_maps_nif}
+    {"sorted_list_from_maps_nif", 1, sorted_list_from_maps_nif},
+    {"monotonic_time", 1, monotonic_time},
+    {"time_offset", 1, time_offset},
+    {"convert_time_unit", 3, convert_time_unit}
 };
 
 ERL_NIF_INIT(nif_SUITE,nif_funcs,load,reload,upgrade,unload)
diff --git a/erts/emulator/test/nif_SUITE_data/nif_mod.erl b/erts/emulator/test/nif_SUITE_data/nif_mod.erl
index e65d4577c7..aa3c90fe9d 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_mod.erl
+++ b/erts/emulator/test/nif_SUITE_data/nif_mod.erl
@@ -20,7 +20,7 @@
 
 -module(nif_mod).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([load_nif_lib/2, load_nif_lib/3, start/0, lib_version/0, call_history/0,
 	 get_priv_data_ptr/0, make_new_resource/2, get_resource/2]).
diff --git a/erts/emulator/test/nif_SUITE_data/tester.erl b/erts/emulator/test/nif_SUITE_data/tester.erl
index b393e29b82..32b9ef1826 100644
--- a/erts/emulator/test/nif_SUITE_data/tester.erl
+++ b/erts/emulator/test/nif_SUITE_data/tester.erl
@@ -1,6 +1,6 @@
 -module(tester).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([load_nif_lib/2, run/0]).