Merge branch 'lukas/erts/20_minor_fixes'

* lukas/erts/20_minor_fixes:
  erts: Rebuild etc executables if config.h changes
  erts: Fix new gcc warning in check io
  kernel: Add mem check to prim_file:large_write tc
  erts: Fix two compiler warnings on OS X
  erts: Fix erts_debug:df function info output
  erts: Get rid of some unused function warnings on os x

7 files changed, 50 insertions, 11 deletions

diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 37d8699a4b..3f4a1f9e80 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -308,7 +308,7 @@ erts_debug_disassemble_1(BIF_ALIST_1)
 		BIF_RET(am_undef);
 	    }
 	}
-        code_ptr = erts_codemfa_to_code(cmfa);
+        code_ptr = (BeamInstr*)erts_code_to_codeinfo(erts_codemfa_to_code(cmfa));
     } else {
 	goto error;
     }
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 6b5b64993f..894e0ee582 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -280,6 +280,7 @@ schdlr_sspnd_get_nscheds(ErtsSchedTypeCounters *valp,
     }
 }
 
+#ifdef DEBUG
 static ERTS_INLINE Uint32
 schdlr_sspnd_get_nscheds_tot(ErtsSchedTypeCounters *valp)
 {
@@ -290,6 +291,7 @@ schdlr_sspnd_get_nscheds_tot(ErtsSchedTypeCounters *valp)
 #endif
     return res;
 }
+#endif
 
 static ERTS_INLINE void
 schdlr_sspnd_dec_nscheds(ErtsSchedTypeCounters *valp,
@@ -11374,7 +11376,7 @@ erts_execute_dirty_system_task(Process *c_p)
 
 	switch (st->type) {
 	case ERTS_PSTT_CLA:
-	    ASSERT(is_value(st_res));
+	    ASSERT(is_value(cla_res));
 	    st_res = cla_res;
 	    break;
 	case ERTS_PSTT_GC_MAJOR:
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index 00c70268df..b6d71b3ec5 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -2306,7 +2306,7 @@ ERTS_CIO_EXPORT(erts_check_io)(int do_wait)
         case ERTS_EV_TYPE_NIF: { /* Requested via enif_select()... */
             struct erts_nif_select_event in = {NIL};
             struct erts_nif_select_event out = {NIL};
-            ErtsResource* resource;
+            ErtsResource* resource = NULL;
             ErtsPollEvents revents = pollres[i].events;
 
             if (revents & ERTS_POLL_EV_ERR) {
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index f80f136d79..f7ee9bace0 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -550,11 +550,13 @@ void sys_sigrelease(int sig)
     sigprocmask(SIG_UNBLOCK, &mask, (sigset_t *)NULL);
 }
 
+#ifdef ERTS_HAVE_TRY_CATCH
 void erts_sys_sigsegv_handler(int signo) {
     if (signo == SIGSEGV) {
         longjmp(erts_sys_sigsegv_jmp, 1);
     }
 }
+#endif
 
 /*
  * Function returns 1 if we can read from all values in between
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index d3af634729..f656eebc46 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -360,7 +360,7 @@ Install.ini:	../$(TARGET)/Install.src ../../vsn.mk $(TARGET)/Makefile
 
 
 else
-RC_GENERATED =
+RC_GENERATED =  $(ERL_TOP)/erts/$(TARGET)/config.h
 endif
 #---------------------------------------------------------
 # End of windows specific targets.
diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c
index 0bd469727c..0ccd7ead3e 100644
--- a/erts/etc/unix/to_erl.c
+++ b/erts/etc/unix/to_erl.c
@@ -416,7 +416,7 @@ int main(int argc, char **argv)
 
 	if (len) {
 #ifdef DEBUG
-	    if(write(1, buf, len));
+	    (void)write(1, buf, len);
 #endif
 	    if (write_all(wfd, buf, len) != len) {
 		fprintf(stderr, "Error in writing to FIFO.\n");
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 8be94f1e57..0c84a7d1cc 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -19,8 +19,8 @@
 %%
 -module(prim_file_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,
-	 read_write_file/1]).
+	 init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
+	 read_write_file/1, free_memory/0]).
 -export([cur_dir_0a/1, cur_dir_0b/1, 
 	 cur_dir_1a/1, cur_dir_1b/1, 
 	 make_del_dir_a/1, make_del_dir_b/1,
@@ -115,6 +115,18 @@ groups() ->
       [make_link_a, make_link_b, read_link_info_for_non_link,
        symlinks_a, symlinks_b, list_dir_error]}].
 
+init_per_testcase(large_write, Config) ->
+    {ok, Started} = application:ensure_all_started(os_mon),
+    [{started, Started}|Config];
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(large_write, Config) ->
+    [application:stop(App) || App <- lists:reverse(proplists:get_value(started, Config))],
+    ok;
+end_per_testcase(_, _Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
     Config.
 
@@ -2022,11 +2034,13 @@ run_large_file_test(Config, Run, Name) ->
 	{{unix,sunos},OsVersion} when OsVersion < {5,5,1} ->
 	    {skip,"Only supported on Win32, Unix or SunOS >= 5.5.1"};
 	{{unix,_},_} ->
-	    N = unix_free(proplists:get_value(priv_dir, Config)),
-	    io:format("Free disk: ~w KByte~n", [N]),
-	    if N < 5 bsl 20 ->
+	    DiscFree = unix_free(proplists:get_value(priv_dir, Config)),
+            MemFree = free_memory(),
+	    io:format("Free disk: ~w KByte~n", [DiscFree]),
+	    io:format("Free mem: ~w MByte~n", [MemFree]),
+	    if DiscFree < 5 bsl 20; MemFree < 5 bsl 10 ->
 		    %% Less than 5 GByte free
-		    {skip,"Less than 5 GByte free disk"};
+		    {skip,"Less than 5 GByte free disk/mem"};
 	       true ->
 		    do_run_large_file_test(Config, Run, Name)
 	    end;
@@ -2079,6 +2093,27 @@ zip_data([], Bs) ->
 zip_data(As, []) ->
     As.
 
+%% Stolen from emulator -> alloc_SUITE
+free_memory() ->
+    %% Free memory in MB.
+    try
+	SMD = memsup:get_system_memory_data(),
+	{value, {free_memory, Free}} = lists:keysearch(free_memory, 1, SMD),
+	TotFree = (Free +
+		   case lists:keysearch(cached_memory, 1, SMD) of
+		       {value, {cached_memory, Cached}} -> Cached;
+		       false -> 0
+		   end +
+		   case lists:keysearch(buffered_memory, 1, SMD) of
+		       {value, {buffered_memory, Buffed}} -> Buffed;
+		       false -> 0
+		   end),
+	TotFree div (1024*1024)
+    catch
+	error : undef ->
+	    ct:fail({"os_mon not built"})
+    end.
+
 %%%-----------------------------------------------------------------
 %%% Utilities
 rm_rf(Mod,Dir) ->