perf test workload: Add thread count argument to thloop
Ian Rogers
reviewerPATCH v2 1/1 perf test workload: Add thread count argument to thloop
Allow the number of threads for the thloop workload to be increased beyond the normal 2. Add error checking to the parsed time and thread count values.
---
v2: Perform the pthread_join unconditionally and ensure started
threads terminate.
--- tools/perf/tests/workloads/thloop.c | 45 ++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 7 deletions(-)
tools/perf/tests/workloads/thloop.c +38 -7
@@ -31,21 +31,52 @@ static void *thfunc(void *arg)static int thloop (int argc,const char **argv) { -int sec =1 ; -pthread_t th; +int nt =2 , sec =1 , err =1 ; +pthread_t *thread_list =NULL ;if (argc >0 ) sec =atoi (argv[0 ]); +if (sec <=0 ) { +fprintf (stderr,"Error: seconds (%d) must be >= 1\n" , sec); +return 1 ; + } + +if (argc >1 ) + nt =atoi (argv[1 ]); + +if (nt <=0 ) { +fprintf (stderr,"Error: thread count (%d) must be >= 1\n" , nt); +return 1 ; + } +signal (SIGINT , sighandler);signal (SIGALRM , sighandler); -alarm (sec); -pthread_create (&th,NULL , thfunc, test_loop); -test_loop (); -pthread_join (th,NULL ); + thread_list =calloc (nt,sizeof (pthread_t)); +if (thread_list ==NULL ) { +fprintf (stderr,"Error: malloc failed for %d threads\n" , nt); + goto out; + } +for (int i =1 ; i < nt; i++) { +int ret =pthread_create (&thread_list[i],NULL , thfunc, test_loop); -return 0 ; +if (ret) { +fprintf (stderr,"Error: failed to create thread %d\n" , i); + done =1 ;// Ensure started threads terminate. + goto out; + } + } +alarm (sec); +test_loop (); + err =0 ; +out: +for (int i =1 ; i < nt; i++) { +if (thread_list && thread_list[i]) +pthread_join (thread_list[i],/*retval=*/ NULL ); + } +free (thread_list); +return err; }DEFINE_WORKLOAD (thloop);
Signature · 1 line
2.51.1.851.g4ebd6896fd-goog
Arnaldo Carvalho de Melo
maintainerQuoted 44 lines · Ian Rogers
Allow the number of threads for the thloop workload to be increased beyond the normal 2. Add error checking to the parsed time and thread count values.
Signed-off-by Ian Rogers <[email protected]>---
v2: Perform thepthread_joinunconditionally and ensure started
threads terminate.--- tools/perf/tests/workloads/thloop.c | 45 ++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 7 deletions(-)tools/perf/tests/workloads/thloop.c +15
-3@@ -31,21 +31,52 @@ static void *thfunc(void *arg)static int thloop (int argc,const char **argv) { -int sec =1 ; -pthread_t th; +int nt =2 , sec =1 , err =1 ; +pthread_t *thread_list =NULL ;if (argc >0 ) sec =atoi (argv[0 ]); +if (sec <=0 ) { +fprintf (stderr,"Error: seconds (%d) must be >= 1\n" , sec); +return 1 ; + } + +if (argc >1 ) + nt =atoi (argv[1 ]); + +if (nt <=0 ) { +fprintf (stderr,"Error: thread count (%d) must be >= 1\n" , nt); +return 1 ; + } +signal (SIGINT , sighandler);signal (SIGALRM , sighandler); -alarm (sec);
tools/perf/tests/workloads/thloop.c static void *thfunc(void *arg) · line 61
Quoted 10 lines
tools/perf/tests/workloads/thloop.c +6
-3-pthread_create (&th,NULL , thfunc, test_loop); -test_loop (); -pthread_join (th,NULL ); + thread_list =calloc (nt,sizeof (pthread_t)); +if (thread_list ==NULL ) { +fprintf (stderr,"Error: malloc failed for %d threads\n" , nt); + goto out; + } +for (int i =1 ; i < nt; i++) {
Why do you start at 1? What goes in thread[0]? calloc() leaves it at NULL, then if you have two threads you'll allocate thread[1], i gets incremented, 2 < 2 fails, you get just one thread created, when two were asked?
Oh, I see, you use the main thread to run, that test_loop() just before the err = 0, its just that you allocate thread[0] for nothing, that confused me.
- Arnaldo
Quoted 24 lines
tools/perf/tests/workloads/thloop.c +17
-1+int ret =pthread_create (&thread_list[i],NULL , thfunc, test_loop); -return 0 ; +if (ret) { +fprintf (stderr,"Error: failed to create thread %d\n" , i); + done =1 ;// Ensure started threads terminate. + goto out; + } + } +alarm (sec); +test_loop (); + err =0 ; +out: +for (int i =1 ; i < nt; i++) { +if (thread_list && thread_list[i]) +pthread_join (thread_list[i],/*retval=*/ NULL ); + } +free (thread_list); +return err; }DEFINE_WORKLOAD (thloop);Signature · 1 line
2.51.1.851.g4ebd6896fd-goog
Ian Rogers
reviewerQuoted 62 lines · Arnaldo Carvalho de Melo
Quoted 44 lines · Ian Rogers
Allow the number of threads for the thloop workload to be increased beyond the normal 2. Add error checking to the parsed time and thread count values.
Signed-off-by Ian Rogers <[email protected]>---
v2: Perform thepthread_joinunconditionally and ensure started
threads terminate.--- tools/perf/tests/workloads/thloop.c | 45 ++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 7 deletions(-)tools/perf/tests/workloads/thloop.c +15
-3@@ -31,21 +31,52 @@ static void *thfunc(void *arg)static int thloop (int argc,const char **argv) { -int sec =1 ; -pthread_t th; +int nt =2 , sec =1 , err =1 ; +pthread_t *thread_list =NULL ;if (argc >0 ) sec =atoi (argv[0 ]); +if (sec <=0 ) { +fprintf (stderr,"Error: seconds (%d) must be >= 1\n" , sec); +return 1 ; + } + +if (argc >1 ) + nt =atoi (argv[1 ]); + +if (nt <=0 ) { +fprintf (stderr,"Error: thread count (%d) must be >= 1\n" , nt); +return 1 ; + } +signal (SIGINT , sighandler);signal (SIGALRM , sighandler); -alarm (sec);tools/perf/tests/workloads/thloop.c static void *thfunc(void *arg) · line 61
Quoted 10 lines
tools/perf/tests/workloads/thloop.c +6
-3-pthread_create (&th,NULL , thfunc, test_loop); -test_loop (); -pthread_join (th,NULL ); + thread_list =calloc (nt,sizeof (pthread_t)); +if (thread_list ==NULL ) { +fprintf (stderr,"Error: malloc failed for %d threads\n" , nt); + goto out; + } +for (int i =1 ; i < nt; i++) {Why do you start at 1? What goes in thread[0]?
calloc()leaves it at NULL, then if you have two threads you'll allocate thread[1], i gets incremented, 2 < 2 fails, you get just one thread created, when two were asked?
Quoted 3 lines
Oh, I see, you use the main thread to run, that
test_loop()just before the err = 0, its just that you allocate thread[0] for nothing, that confused me.
Agreed. It was so I could avoid doing "nt-1" as I mentioned before. Fwiw, pthread_self will sometimes return 0 for the main thread and so it isn't entirely inconsistent to do things this way. Not that the main thread should try to do a pthread_join with itself.
Thanks,
Ian
Quoted 26 lines
- Arnaldo
Quoted 24 lines
tools/perf/tests/workloads/thloop.c +17
-2+int ret =pthread_create (&thread_list[i],NULL , thfunc, test_loop); -return 0 ; +if (ret) { +fprintf (stderr,"Error: failed to create thread %d\n" , i); + done =1 ;// Ensure started threads terminate. + goto out; + } + } +alarm (sec); +test_loop (); + err =0 ; +out: +for (int i =1 ; i < nt; i++) { +if (thread_list && thread_list[i]) +pthread_join (thread_list[i],/*retval=*/ NULL ); + } +free (thread_list); +return err; }DEFINE_WORKLOAD (thloop); --2.51.1.851.g4ebd6896fd-goog
Quoted 64 lines · Ian Rogers
Quoted 62 lines · Arnaldo Carvalho de Melo
Quoted 44 lines · Ian Rogers
Allow the number of threads for the thloop workload to be increased beyond the normal 2. Add error checking to the parsed time and thread count values.
Signed-off-by Ian Rogers <[email protected]>---
v2: Perform thepthread_joinunconditionally and ensure started
threads terminate.--- tools/perf/tests/workloads/thloop.c | 45 ++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 7 deletions(-)tools/perf/tests/workloads/thloop.c +15
-3@@ -31,21 +31,52 @@ static void *thfunc(void *arg)static int thloop (int argc,const char **argv) { -int sec =1 ; -pthread_t th; +int nt =2 , sec =1 , err =1 ; +pthread_t *thread_list =NULL ;if (argc >0 ) sec =atoi (argv[0 ]); +if (sec <=0 ) { +fprintf (stderr,"Error: seconds (%d) must be >= 1\n" , sec); +return 1 ; + } + +if (argc >1 ) + nt =atoi (argv[1 ]); + +if (nt <=0 ) { +fprintf (stderr,"Error: thread count (%d) must be >= 1\n" , nt); +return 1 ; + } +signal (SIGINT , sighandler);signal (SIGALRM , sighandler); -alarm (sec);tools/perf/tests/workloads/thloop.c static void *thfunc(void *arg) · line 61
Quoted 10 lines
tools/perf/tests/workloads/thloop.c +6
-3-pthread_create (&th,NULL , thfunc, test_loop); -test_loop (); -pthread_join (th,NULL ); + thread_list =calloc (nt,sizeof (pthread_t)); +if (thread_list ==NULL ) { +fprintf (stderr,"Error: malloc failed for %d threads\n" , nt); + goto out; + } +for (int i =1 ; i < nt; i++) {Why do you start at 1? What goes in thread[0]?
calloc()leaves it at NULL, then if you have two threads you'll allocate thread[1], i gets incremented, 2 < 2 fails, you get just one thread created, when two were asked?
Quoted 8 lines
Quoted 3 lines
Oh, I see, you use the main thread to run, that
test_loop()just before the err = 0, its just that you allocate thread[0] for nothing, that confused me.Agreed. It was so I could avoid doing "nt-1" as I mentioned before. Fwiw,
pthread_selfwill sometimes return 0 for the main thread and so it isn't entirely inconsistent to do things this way. Not that the main thread should try to do apthread_joinwith itself.
:-)
Its just a test,
Quoted 29 lines
Thanks,
IanQuoted 26 lines
- Arnaldo
Quoted 24 lines
tools/perf/tests/workloads/thloop.c +17
-2+int ret =pthread_create (&thread_list[i],NULL , thfunc, test_loop); -return 0 ; +if (ret) { +fprintf (stderr,"Error: failed to create thread %d\n" , i); + done =1 ;// Ensure started threads terminate. + goto out; + } + } +alarm (sec); +test_loop (); + err =0 ; +out: +for (int i =1 ; i < nt; i++) { +if (thread_list && thread_list[i]) +pthread_join (thread_list[i],/*retval=*/ NULL ); + } +free (thread_list); +return err; }DEFINE_WORKLOAD (thloop); --2.51.1.851.g4ebd6896fd-goog
Quoted 5 lines · Ian Rogers
Allow the number of threads for the thloop workload to be increased beyond the normal 2. Add error checking to the parsed time and thread count values.
Applied to perf-tools-next, thanks!
Best regards,
Namhyung