From 7d7c59bbf885fa9a273500360bb64072f64ae1da Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Tue, 2 May 2023 16:55:47 +0200
Subject: [PATCH] Fix bug in spawn task tests

The argument passed to nanos6_spawn_function() was being destroyed when
the parent function ends.
---
 test/rt/nanos6/spawn-task-external-bad.c | 14 +++++++++-----
 test/rt/nanos6/spawn-task-external.c     | 16 ++++++++++------
 test/rt/nanos6/spawn-task.c              | 11 ++++++++---
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/test/rt/nanos6/spawn-task-external-bad.c b/test/rt/nanos6/spawn-task-external-bad.c
index f9d6691..5e0dbaf 100644
--- a/test/rt/nanos6/spawn-task-external-bad.c
+++ b/test/rt/nanos6/spawn-task-external-bad.c
@@ -10,8 +10,9 @@
 
 #include <nanos6.h>
 #include <nanos6/library-mode.h>
-#include <time.h>
 #include <pthread.h>
+#include <stdlib.h>
+#include <time.h>
 
 #include "common.h"
 
@@ -45,8 +46,7 @@ polling_func(void *arg)
 static void *
 spawn(void *arg)
 {
-	double ms = *((double *) arg);
-	nanos6_spawn_function(polling_func, &ms, NULL, NULL, "polling_task");
+	nanos6_spawn_function(polling_func, arg, NULL, NULL, "polling_task");
 	return NULL;
 }
 
@@ -54,7 +54,11 @@ int
 main(void)
 {
 	pthread_t th;
-	double T = 100.0;
+	double *T = malloc(sizeof(double));
+	if (T == NULL)
+		die("malloc failed:");
+
+	*T = 100.0;
 
 	if (pthread_create(&th, NULL, spawn, &T) != 0)
 		die("pthread_create failed:");
@@ -63,7 +67,7 @@ main(void)
 		die("pthread_join failed:");
 
 	#pragma oss task label("dummy_task")
-	dummy_work(T);
+	dummy_work(*T);
 
 	#pragma oss taskwait
 
diff --git a/test/rt/nanos6/spawn-task-external.c b/test/rt/nanos6/spawn-task-external.c
index ceb49cc..470c82c 100644
--- a/test/rt/nanos6/spawn-task-external.c
+++ b/test/rt/nanos6/spawn-task-external.c
@@ -10,8 +10,9 @@
 
 #include <nanos6.h>
 #include <nanos6/library-mode.h>
-#include <time.h>
 #include <pthread.h>
+#include <stdlib.h>
+#include <time.h>
 
 #include "common.h"
 #include "compat.h"
@@ -81,8 +82,7 @@ spawn(void *arg)
 	/* Inform ovni of this external thread */
 	instr_thread_start(-1, -1, 0);
 
-	double ms = *((double *) arg);
-	nanos6_spawn_function(polling_func, &ms, NULL, NULL, "polling_task");
+	nanos6_spawn_function(polling_func, arg, NULL, NULL, "polling_task");
 
 	/* Then inform that the thread finishes */
 	instr_thread_end();
@@ -94,16 +94,20 @@ int
 main(void)
 {
 	pthread_t th;
-	double T = 100.0;
+	double *T = malloc(sizeof(double));
+	if (T == NULL)
+		die("malloc failed:");
 
-	if (pthread_create(&th, NULL, spawn, &T) != 0)
+	*T = 100.0;
+
+	if (pthread_create(&th, NULL, spawn, T) != 0)
 		die("pthread_create failed:");
 
 	if (pthread_join(th, NULL) != 0)
 		die("pthread_join failed:");
 
 	#pragma oss task label("dummy_task")
-	dummy_work(T);
+	dummy_work(*T);
 
 	#pragma oss taskwait
 
diff --git a/test/rt/nanos6/spawn-task.c b/test/rt/nanos6/spawn-task.c
index bff54f0..61436bd 100644
--- a/test/rt/nanos6/spawn-task.c
+++ b/test/rt/nanos6/spawn-task.c
@@ -8,6 +8,7 @@
 
 #include <nanos6.h>
 #include <nanos6/library-mode.h>
+#include <stdlib.h>
 #include <time.h>
 
 #include "common.h"
@@ -41,12 +42,16 @@ polling_func(void *arg)
 int
 main(void)
 {
-	double T = 100.0;
+	double *T = malloc(sizeof(double));
+	if (T == NULL)
+		die("malloc failed:");
 
-	nanos6_spawn_function(polling_func, &T, NULL, NULL, "polling_task");
+	*T = 100.0;
+
+	nanos6_spawn_function(polling_func, T, NULL, NULL, "polling_task");
 
 	#pragma oss task label("dummy_task")
-	dummy_work(T);
+	dummy_work(*T);
 
 	#pragma oss taskwait