Merge branch 'pan/windows-testcases/OTP-8820' into dev

* pan/windows-testcases/OTP-8820:
  Teach Winsock initialization to be thread safe
  Make ei_threaded_send synchronized
  Increase timeout value in ei_accept_SUITE
  Teach ei_accept_SUITE to wait for node publish instead of using random sleeps
  Teach port suite to not use unix-specific commands and not leave them running
  Add line macros to gen_udp_SUITE:connect

7 files changed, 160 insertions, 35 deletions

diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 77fa75b78f..a7476ca9bb 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -2305,7 +2305,11 @@ load_driver(Dir, Driver) ->
 close_deaf_port(doc) -> ["Send data to port program that does not read it, then close port."];
 close_deaf_port(suite) -> [];
 close_deaf_port(Config) when is_list(Config) ->
-    Port = open_port({spawn,"sleep 999999"},[]),
-    erlang:port_command(Port,"Hello, can you hear me!?!?"),
-    port_close(Port),
+    ?line Dog = test_server:timetrap(test_server:seconds(100)),
+    ?line DataDir = ?config(data_dir, Config),
+    ?line DeadPort = os:find_executable("dead_port", DataDir),
+
+    ?line Port = open_port({spawn,DeadPort++" 60"},[]),
+    ?line erlang:port_command(Port,"Hello, can you hear me!?!?"),
+    ?line port_close(Port),
     ok.
diff --git a/erts/emulator/test/port_SUITE_data/Makefile.src b/erts/emulator/test/port_SUITE_data/Makefile.src
index d97b37c9ae..ff822ae720 100644
--- a/erts/emulator/test/port_SUITE_data/Makefile.src
+++ b/erts/emulator/test/port_SUITE_data/Makefile.src
@@ -3,7 +3,7 @@ LD = @LD@
 CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
 CROSSLDFLAGS = @CROSSLDFLAGS@
 
-PROGS = port_test@exe@ echo_args@exe@
+PROGS = port_test@exe@ echo_args@exe@ dead_port@exe@
 DRIVERS = echo_drv@dll@ exit_drv@dll@ failure_drv@dll@
 
 all: $(PROGS) $(DRIVERS) port_test.@EMULATOR@
diff --git a/erts/emulator/test/port_SUITE_data/dead_port.c b/erts/emulator/test/port_SUITE_data/dead_port.c
new file mode 100644
index 0000000000..6fa77112be
--- /dev/null
+++ b/erts/emulator/test/port_SUITE_data/dead_port.c
@@ -0,0 +1,102 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2001-2010. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+#ifdef VXWORKS
+#include <vxWorks.h>
+#include <taskVarLib.h>
+#include <taskLib.h>
+#include <sysLib.h>
+#include <string.h>
+#include <ioLib.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifndef __WIN32__
+#include <unistd.h>
+
+#ifdef VXWORKS
+#include "reclaim.h"
+#include <sys/times.h>
+#else
+#include <sys/time.h>
+#endif
+
+#define O_BINARY 0
+#define _setmode(fd, mode)
+#endif
+
+#ifdef __WIN32__
+#include "windows.h"
+#include "winbase.h"
+#endif
+
+
+#ifdef VXWORKS
+#define MAIN(argc, argv) port_test(argc, argv)
+#else
+#define MAIN(argc, argv) main(argc, argv)
+#endif
+
+
+extern int errno;
+
+static void delay(unsigned ms);
+
+
+MAIN(argc, argv)
+int argc;
+char *argv[];
+{
+    int x;
+    if (argc < 2) {
+	fprintf(stderr,"Usage %s <seconds>\n",argv[0]);
+	return 1;
+    }
+    if ((x = atoi(argv[1])) <= 0) {
+	fprintf(stderr,"Usage %s <seconds>\n",argv[0]);
+	return 1;
+    }
+    delay(x*1000);
+    return 0;
+}
+
+static void
+delay(unsigned ms)
+{
+#ifdef VXWORKS
+  taskDelay((sysClkRateGet() * ms) / 1000);
+#else
+#ifdef __WIN32__
+  Sleep(ms);
+#else
+  struct timeval t;
+  t.tv_sec = ms/1000;
+  t.tv_usec = (ms % 1000) * 1000;
+
+  select(0, NULL, NULL, NULL, &t);
+#endif
+#endif
+}
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index e191f3fbf0..99ccba0686 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -366,16 +366,16 @@ static int initWinSock(void)
     WORD wVersionRequested;  
     WSADATA wsaData; 
     int i; 
-    /* FIXME problem for threaded ? */ 
-    static int initialized = 0;
+
+    static LONG volatile initialized = 0;
     
     wVersionRequested = MAKEWORD(1, 1); 
-    if (!initialized) {
-	initialized = 1;
+    if (InterlockedCompareExchange((LPLONG) &initialized,1L,0L) == 0L) {
 	/* FIXME not terminate, just a message?! */
 	if ((i = WSAStartup(wVersionRequested, &wsaData))) {
 	    EI_TRACE_ERR1("ei_connect_init",
 			  "ERROR: can't initialize windows sockets: %d",i);
+	    initialized = 2L;
 	    return 0;
 	}
 	
@@ -383,10 +383,14 @@ static int initWinSock(void)
 	    EI_TRACE_ERR0("initWinSock","ERROR: this version of windows "
 			  "sockets not supported");
 	    WSACleanup(); 
+	    initialized = 2L;
 	    return 0;
 	}
+	initialized = 3L;
+    } else while (initialized < 2) {
+	SwitchToThread();
     }
-    return 1;
+    return (int) (initialized - 2);
 }
 #endif
 
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index bc83d6a62e..31781fe377 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -31,7 +31,7 @@
 all(suite) -> [ei_accept, ei_threaded_accept].
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(0.25)),
+    Dog = ?t:timetrap(?t:seconds(30)),
     [{watchdog, Dog}|Config].
 
 fin_per_testcase(_Case, Config) ->
@@ -43,8 +43,6 @@ ei_accept(Config) when is_list(Config) ->
     ?line P = runner:start(?interpret),
     ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
 
-%    ?line AMsg={a,[message, with], " strings in it!", [-12, -23], 1.001},
-    %% shouldn't this be a bif or function or something?
     ?line Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
     ?line io:format("Myname ~p ~n",  [Myname]),
     ?line EINode= list_to_atom("c42@"++Myname),
@@ -52,9 +50,13 @@ ei_accept(Config) when is_list(Config) ->
     ?line Self= self(),
     ?line TermToSend= {call, Self, "Test"},
     ?line F= fun() ->
-		     timer:sleep(500),
-		     {any, EINode} ! TermToSend,
-		     Self ! sent_ok,
+		     case waitfornode("c42",20) of
+			 true ->
+			     {any, EINode} ! TermToSend,
+			     Self ! sent_ok;
+			 false ->
+			     Self ! never_published
+		     end,
 		     ok
 	     end,
 
@@ -90,12 +92,29 @@ ei_threaded_accept(Config) when is_list(Config) ->
 	    || I <- lists:seq(0, N-1) ],
     ok.
 
+waitfornode(String,0) ->
+    io:format("~s never published itself.~n",[String]),
+    false;
+waitfornode(String,N) ->
+    Registered = [X || {X,_} <- element(2,erl_epmd:names())],
+    case lists:member(String,Registered) of
+	true ->
+	    true;
+	false ->
+	    timer:sleep(1000),
+	    waitfornode(String,N-1)
+    end.
+
 send_rec_einode(N, TestServerPid) ->
     ?line Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
-    ?line EINode= list_to_atom("eiacc" ++ integer_to_list(N) ++ "@" ++ Myname),
+    ?line FirstPart = "eiacc" ++ integer_to_list(N),
+    ?line EINode= list_to_atom(FirstPart ++ "@" ++ Myname),
     ?line io:format("EINode ~p ~n",  [EINode]),
     ?line Self= self(),
-    ?line timer:sleep(10*1000),
+    ?line case waitfornode(FirstPart,20) of
+	      true -> ok;
+	      false -> test_server:fail({never_published,EINode})
+	  end,
     ?line {any, EINode} ! Self,
     ?line receive
 	      {N,_}=X ->
@@ -136,13 +155,6 @@ ei_receive(P, Fd) ->
     {term, T}= get_term(P),
     T.
 
-ei_unpublish(P) ->
-    send_command(P, ei_unpublish, []),
-    case get_term(P) of
-	{term,{0, _}} -> ok;
-	{term,{_X, Errno}} -> {error,Errno}
-    end.
-
 send_command(P, Name, Args) ->
     runner:send_term(P, {Name,list_to_tuple(Args)}).
 
diff --git a/lib/erl_interface/test/ei_connect_SUITE.erl b/lib/erl_interface/test/ei_connect_SUITE.erl
index 56f478edad..fe82a73ef9 100644
--- a/lib/erl_interface/test/ei_connect_SUITE.erl
+++ b/lib/erl_interface/test/ei_connect_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -103,10 +103,12 @@ ei_threaded_send(Config) when is_list(Config) ->
     ?line Einode = filename:join(?config(data_dir, Config), "einode"),
     ?line N = 15,
     ?line Host = atom_to_list(node()),
-    ?line spawn_link(fun() -> start_einode(Einode, N, Host) end),
     ?line TestServerPid = self(),
     ?line [ spawn_link(fun() -> rec_einode(I, TestServerPid) end)
 	    || I <- lists:seq(0, N-1) ],
+    ?line [ receive {I,registered} -> ok end
+	    || I <- lists:seq(0, N-1) ],
+    ?line spawn_link(fun() -> start_einode(Einode, N, Host) end),
     ?line [ receive I -> ok end
 	    || I <- lists:seq(0, N-1) ],
     ok.
@@ -114,6 +116,7 @@ ei_threaded_send(Config) when is_list(Config) ->
 rec_einode(N, TestServerPid) ->
     ?line Regname = list_to_atom("mth"++integer_to_list(N)),
     ?line register(Regname, self()),
+    ?line TestServerPid ! {N, registered},
     ?line io:format("~p waiting~n", [Regname]),
     ?line receive
 	      X ->
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index 44dd8607b9..bbdfbd3cb0 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -415,15 +415,15 @@ connect(suite) ->
 connect(doc) ->
     ["Test that connect/3 has effect"];
 connect(Config) when is_list(Config) ->
-    Addr = {127,0,0,1},
-    {ok,S1} = gen_udp:open(0),
-    {ok,P1} = inet:port(S1),
-    {ok,S2} = gen_udp:open(0),
-    ok = inet:setopts(S2, [{active,false}]),
-    ok = gen_udp:close(S1),
-    ok = gen_udp:connect(S2, Addr, P1),
-    ok = gen_udp:send(S2, <<16#deadbeef:32>>),
-    {error,econnrefused} = gen_udp:recv(S2, 0, 5),
+    ?line Addr = {127,0,0,1},
+    ?line {ok,S1} = gen_udp:open(0),
+    ?line {ok,P1} = inet:port(S1),
+    ?line {ok,S2} = gen_udp:open(0),
+    ?line ok = inet:setopts(S2, [{active,false}]),
+    ?line ok = gen_udp:close(S1),
+    ?line ok = gen_udp:connect(S2, Addr, P1),
+    ?line ok = gen_udp:send(S2, <<16#deadbeef:32>>),
+    ?line {error,econnrefused} = gen_udp:recv(S2, 0, 5),
     ok.
 
 implicit_inet6(Config) when is_list(Config) ->