[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1436172445-6979-25-git-send-email-avagin@openvz.org>
Date: Mon, 6 Jul 2015 11:47:25 +0300
From: Andrey Vagin <avagin@...nvz.org>
To: linux-kernel@...r.kernel.org
Cc: linux-api@...r.kernel.org, Andrey Vagin <avagin@...nvz.org>,
Oleg Nesterov <oleg@...hat.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Cyrill Gorcunov <gorcunov@...nvz.org>,
Pavel Emelyanov <xemul@...allels.com>,
Roger Luethi <rl@...lgate.ch>, Arnd Bergmann <arnd@...db.de>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
David Ahern <dsahern@...il.com>,
Andy Lutomirski <luto@...capital.net>,
Pavel Odintsov <pavel.odintsov@...il.com>
Subject: [PATCH 24/24] task_diag: Enhance fork tool to spawn threads
From: David Ahern <dsahern@...il.com>
Add option to fork threads as well as processes.
Make the sleep time configurable too so that spawned
tasks exit on their own.
Signed-off-by: David Ahern <dsahern@...il.com>
Signed-off-by: Andrey Vagin <avagin@...nvz.org>
---
tools/testing/selftests/task_diag/Makefile | 2 ++
tools/testing/selftests/task_diag/fork.c | 36 ++++++++++++++++++++++++++----
tools/testing/selftests/task_diag/run.sh | 4 ++--
3 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/task_diag/Makefile b/tools/testing/selftests/task_diag/Makefile
index 7104573..0c53cf6 100644
--- a/tools/testing/selftests/task_diag/Makefile
+++ b/tools/testing/selftests/task_diag/Makefile
@@ -12,6 +12,8 @@ task_diag_comm.o: task_diag_comm.c task_diag_comm.h
task_diag_all: task_diag_all.o task_diag_comm.o
task_diag: task_diag.o task_diag_comm.o
fork: fork.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread
+
task_proc_all: task_proc_all.c
clean:
diff --git a/tools/testing/selftests/task_diag/fork.c b/tools/testing/selftests/task_diag/fork.c
index c6e17d1..ebddedd2 100644
--- a/tools/testing/selftests/task_diag/fork.c
+++ b/tools/testing/selftests/task_diag/fork.c
@@ -2,15 +2,39 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <pthread.h>
+void *f(void *arg)
+{
+ unsigned long t = (unsigned long) arg;
+
+ sleep(t);
+ return NULL;
+}
+
+/* usage: fork nproc [mthreads [sleep]] */
int main(int argc, char **argv)
{
- int i, n;
+ int i, j, n, m = 0;
+ unsigned long t_sleep = 1000;
+ pthread_attr_t attr;
+ pthread_t id;
- if (argc < 2)
+ if (argc < 2) {
+ fprintf(stderr, "usage: fork nproc [mthreads [sleep]]\n");
return 1;
+ }
n = atoi(argv[1]);
+
+ if (argc > 2)
+ m = atoi(argv[2]);
+
+ if (argc > 3)
+ t_sleep = atoi(argv[3]);
+
+ pthread_attr_init(&attr);
+
for (i = 0; i < n; i++) {
pid_t pid;
@@ -20,8 +44,12 @@ int main(int argc, char **argv)
return 1;
}
if (pid == 0) {
- while (1)
- sleep(1000);
+ if (m) {
+ for (j = 0; j < m-1; ++j)
+ pthread_create(&id, &attr, f, (void *)t_sleep);
+ }
+
+ sleep(t_sleep);
return 0;
}
}
diff --git a/tools/testing/selftests/task_diag/run.sh b/tools/testing/selftests/task_diag/run.sh
index 62250a5..06e182d 100755
--- a/tools/testing/selftests/task_diag/run.sh
+++ b/tools/testing/selftests/task_diag/run.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-./fork 1000
+./fork 1000 10
nproc=`./task_diag_all A | grep 'pid.*tgid.*ppid.*comm fork$' | wc -l`
killall -9 fork
-[ "$nproc" -eq 1000 ] && exit 0
+[ "$nproc" -eq 10000 ] && exit 0
echo "Unexpected number of tasks '$nproc'" 1>&2
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists