Merge branch 'rickard/driver_async_cancel/OTP-9302' into dev

* rickard/driver_async_cancel/OTP-9302:
  Fix driver_async_cancel()

4 files changed, 173 insertions, 6 deletions

diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c
index 12c7631448..a920bd2c8c 100644
--- a/erts/emulator/beam/erl_async.c
+++ b/erts/emulator/beam/erl_async.c
@@ -251,6 +251,7 @@ static int async_del(long id)
 		erts_free(ERTS_ALC_T_ASYNC, a);
 		return 1;
 	    }
+	    a = a->next;
 	}
 	erts_mtx_unlock(&async_q[i].mtx);
     }
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 520e3e8c76..f6cf01ce16 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -74,7 +74,8 @@
 	 missing_callbacks/1,
 	 smp_select/1,
 	 driver_select_use/1,
-	 thread_mseg_alloc_cache_clean/1]).
+	 thread_mseg_alloc_cache_clean/1,
+	 otp_9302/1]).
 
 -export([bin_prefix/2]).
 
@@ -141,7 +142,8 @@ all() ->
      smaller_minor_vsn_drv, peek_non_existing_queue,
      otp_6879, caller, many_events, missing_callbacks,
      smp_select, driver_select_use,
-     thread_mseg_alloc_cache_clean].
+     thread_mseg_alloc_cache_clean,
+     otp_9302].
 
 groups() -> 
     [{timer, [],
@@ -1890,13 +1892,39 @@ thread_mseg_alloc_cache_clean_test(Port, N, CCI, Size) ->
     ?line ?t:format("CCC = ~p~n", [CCC]),
     ?line true = CCC > OCCC,
     ?line thread_mseg_alloc_cache_clean_test(Port, N-1, CCI, Size).
-    
-    
+
+otp_9302(Config) when is_list(Config) ->
+    ?line Path = ?config(data_dir, Config),
+    ?line erl_ddll:start(),
+    ?line ok = load_driver(Path, otp_9302_drv),
+    ?line Port = open_port({spawn, otp_9302_drv}, []),
+    ?line true = is_port(Port),
+    ?line port_command(Port, ""),
+    ?line {msg, block} = get_port_msg(Port, infinity),
+    ?line {msg, job} = get_port_msg(Port, infinity),
+    ?line case erlang:system_info(thread_pool_size) of
+	      0 ->
+		  {msg, cancel} = get_port_msg(Port, infinity);
+	      _ ->
+		  ok
+	  end,
+    ?line {msg, job} = get_port_msg(Port, infinity),
+    ?line {msg, end_of_jobs} = get_port_msg(Port, infinity),
+    ?line no_msg = get_port_msg(Port, 2000),
+    ?line port_close(Port),
+    ?line ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% 		Utilities
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    
+
+get_port_msg(Port, Timeout) ->
+    receive
+	{Port, What} ->
+	    {msg, What}
+    after Timeout ->
+	    no_msg
+    end.
 
 wait_until(Fun) ->
     case Fun() of
diff --git a/erts/emulator/test/driver_SUITE_data/Makefile.src b/erts/emulator/test/driver_SUITE_data/Makefile.src
index 4ac7987d2f..5b3ba1557e 100644
--- a/erts/emulator/test/driver_SUITE_data/Makefile.src
+++ b/erts/emulator/test/driver_SUITE_data/Makefile.src
@@ -11,7 +11,8 @@ MISC_DRVS =		outputv_drv@dll@ \
 			caller_drv@dll@ \
 			many_events_drv@dll@ \
 			missing_callback_drv@dll@ \
-			thr_alloc_drv@dll@
+			thr_alloc_drv@dll@ \
+			otp_9302_drv@dll@
 
 SYS_INFO_DRVS = 	sys_info_1_0_drv@dll@ \
 			sys_info_1_1_drv@dll@ \
diff --git a/erts/emulator/test/driver_SUITE_data/otp_9302_drv.c b/erts/emulator/test/driver_SUITE_data/otp_9302_drv.c
new file mode 100644
index 0000000000..1147549135
--- /dev/null
+++ b/erts/emulator/test/driver_SUITE_data/otp_9302_drv.c
@@ -0,0 +1,137 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2011. 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 __WIN32__
+#include <windows.h>
+#endif
+#include "erl_driver.h"
+
+static ErlDrvData start(ErlDrvPort port,
+			char *command);
+static void output(ErlDrvData drv_data,
+		   char *buf, int len);
+static void ready_async(ErlDrvData drv_data,
+			ErlDrvThreadData thread_data);
+
+static ErlDrvEntry otp_9302_drv_entry = { 
+    NULL /* init */,
+    start,
+    NULL /* stop */,
+    output,
+    NULL /* ready_input */,
+    NULL /* ready_output */,
+    "otp_9302_drv",
+    NULL /* finish */,
+    NULL /* handle */,
+    NULL /* control */,
+    NULL /* timeout */,
+    NULL /* outputv */,
+    ready_async,
+    NULL /* flush */,
+    NULL /* call */,
+    NULL /* event */,
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    ERL_DRV_FLAG_USE_PORT_LOCKING,
+    NULL /* handle2 */,
+    NULL /* handle_monitor */
+};
+
+DRIVER_INIT(otp_9302_drv)
+{
+    return &otp_9302_drv_entry;
+}
+
+static ErlDrvData start(ErlDrvPort port,
+			char *command)
+{
+    return (ErlDrvData) port;
+}
+
+typedef struct {
+    ErlDrvPort port;
+    ErlDrvTermData receiver;
+    int block;
+    int cancel;
+    int eoj;
+} Otp9302AsyncData;
+
+static void async_invoke(void *data)
+{
+    Otp9302AsyncData *adata = (Otp9302AsyncData *) data;
+    char *what = (adata->block
+		  ? "block"
+		  : (adata->cancel
+		     ? "cancel"
+		     : (adata->eoj
+			? "end_of_jobs"
+			: "job")));
+    ErlDrvTermData spec[] = {
+	ERL_DRV_PORT, driver_mk_port(adata->port),
+	ERL_DRV_ATOM, driver_mk_atom(what),
+	ERL_DRV_TUPLE, 2
+    };
+    driver_send_term(adata->port, adata->receiver,
+		     spec, sizeof(spec)/sizeof(spec[0]));
+    if (adata->block) {
+#ifdef __WIN32__
+	Sleep((DWORD) 2000);
+#else
+	sleep(2);
+#endif
+    }
+}
+
+static void output(ErlDrvData drv_data,
+		   char *buf, int len)
+{
+    ErlDrvPort port = (ErlDrvPort) drv_data;
+    ErlDrvTermData caller = driver_caller(port);
+    unsigned int key = (unsigned int) port;
+    long id[5];
+    Otp9302AsyncData *ad[5];
+    int i;
+
+    for (i = 0; i < sizeof(ad)/sizeof(ad[0]); i++) {
+	ad[i] = driver_alloc(sizeof(Otp9302AsyncData));
+	if (!ad[i])
+	    abort();
+
+	ad[i]->port = port;
+	ad[i]->receiver = caller;
+	ad[i]->block = 0;
+	ad[i]->eoj = 0;
+	ad[i]->cancel = 0;
+    }
+    ad[0]->block = 1;
+    ad[2]->cancel = 1;
+    ad[4]->eoj = 1;
+    for (i = 0; i < sizeof(id)/sizeof(id[0]); i++)
+	id[i] = driver_async(port, &key, async_invoke, ad[i], driver_free);
+    if (id[2] > 0)
+	driver_async_cancel(id[2]);
+}
+
+static void ready_async(ErlDrvData drv_data,
+			ErlDrvThreadData thread_data)
+{
+    if ((void *) thread_data)
+	driver_free((void *) thread_data);
+}
+