Updated hackbench to lastest version available

Downloaded from http://people.redhat.com/mingo/cfs-scheduler/tools/hackbench.c
February 19 2010.

Signed-off-by: David Sommerseth <davids@redhat.com>
This commit is contained in:
David Sommerseth 2010-02-23 10:22:14 +01:00
parent bd588c92b8
commit a0e5fa847d
2 changed files with 320 additions and 172 deletions

View File

@ -1,2 +1,2 @@
hackbench: hackbench.c
$(CC) $(CFLAGS) -o hackbench hackbench.c -g -Wall
$(CC) $(CFLAGS) -o hackbench hackbench.c -g -Wall -lpthread

View File

@ -1,25 +1,132 @@
/*
* This is the latest version of hackbench.c, that tests scheduler and
* unix-socket (or pipe) performance.
*
* Usage: hackbench [-pipe] <num groups> [process|thread] [loops]
*
* Build it with:
* gcc -g -Wall -O2 -o hackbench hackbench.c -lpthread
*/
#if 0
Date: Fri, 04 Jan 2008 14:06:26 +0800
From: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
To: LKML <linux-kernel@vger.kernel.org>
Subject: Improve hackbench
Cc: Ingo Molnar <mingo@elte.hu>, Arjan van de Ven <arjan@infradead.org>
hackbench tests the Linux scheduler. The original program is at
http://devresources.linux-foundation.org/craiger/hackbench/src/hackbench.c
Based on this multi-process version, a nice person created a multi-thread
version. Pls. see
http://www.bullopensource.org/posix/pi-futex/hackbench_pth.c
When I integrated them into my automation testing system, I found
a couple of issues and did some improvements.
1) Merge hackbench: I integrated hackbench_pth.c into hackbench and added a
new parameter which can be used to choose process mode or thread mode. The
default mode is process.
2) It runs too fast and ends in a couple of seconds. Sometimes it's too hard to debug
the issues. On my ia64 Montecito machines, the result looks weird when comparing
process mode and thread mode.
I want a stable result and hope the testing could run for a stable longer time, so I
might use performance tools to debug issues.
I added another new parameter,`loops`, which can be used to change variable loops,
so more messages will be passed from writers to receivers. Parameter 'loops' is equal to
100 by default.
For example on my 8-core x86_64:
[ymzhang@lkp-st01-x8664 hackbench]$ uname -a
Linux lkp-st01-x8664 2.6.24-rc6 #1 SMP Fri Dec 21 08:32:31 CST 2007 x86_64 x86_64 x86_64 GNU/Linux
[ymzhang@lkp-st01-x8664 hackbench]$ ./hackbench
Usage: hackbench [-pipe] <num groups> [process|thread] [loops]
[ymzhang@lkp-st01-x8664 hackbench]$ ./hackbench 150 process 1000
Time: 151.533
[ymzhang@lkp-st01-x8664 hackbench]$ ./hackbench 150 thread 1000
Time: 153.666
With the same new parameters, I did captured the SLUB issue discussed on LKML recently.
3) hackbench_pth.c will fail on ia64 machine because pthread_attr_setstacksize always
fails if the stack size is less than 196*1024. I moved this statement within a __ia64__ check.
This new program could be compiled with command line:
#gcc -g -Wall -o hackbench hackbench.c -lpthread
Thank Ingo for his great comments!
-yanmin
---
* Nathan Lynch <ntl@pobox.com> wrote:
> Here's a fixlet for the hackbench program found at
>
> http://people.redhat.com/mingo/cfs-scheduler/tools/hackbench.c
>
> When redirecting hackbench output I am seeing multiple copies of the
> "Running with %d*40 (== %d) tasks" line. Need to flush the buffered
> output before forking.
#endif
/* Test groups of 20 processes spraying to 20 receivers */
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include <sys/time.h>
#include <sys/poll.h>
#include <limits.h>
#define DATASIZE 100
static unsigned int loops = 100;
/*
* 0 means thread mode and others mean process (default)
*/
static unsigned int process_mode = 1;
static int use_pipes = 0;
struct sender_context {
unsigned int num_fds;
int ready_out;
int wakefd;
int out_fds[0];
};
struct receiver_context {
unsigned int num_packets;
int in_fds[2];
int ready_out;
int wakefd;
};
static void barf(const char *msg)
{
fprintf(stderr, "%s (error: %s)\n", msg, strerror(errno));
exit(1);
}
static void print_usage_exit()
{
printf("Usage: hackbench [-pipe] <num groups> [process|thread] [loops]\n");
exit(1);
}
static void fdpair(int fds[2])
{
if (use_pipes) {
@ -35,7 +142,7 @@ static void fdpair(int fds[2])
/* Block until we're ready to go */
static void ready(int ready_out, int wakefd)
{
char dummy = '*';
char dummy;
struct pollfd pollfd = { .fd = wakefd, .events = POLLIN };
/* Tell them we're ready. */
@ -48,24 +155,20 @@ static void ready(int ready_out, int wakefd)
}
/* Sender sprays loops messages down each file descriptor */
static void sender(unsigned int num_fds,
int out_fd[num_fds],
int ready_out,
int wakefd)
static void *sender(struct sender_context *ctx)
{
char data[DATASIZE];
unsigned int i, j;
ready(ready_out, wakefd);
memset(&data, '-', DATASIZE);
ready(ctx->ready_out, ctx->wakefd);
/* Now pump to every receiver. */
for (i = 0; i < loops; i++) {
for (j = 0; j < num_fds; j++) {
for (j = 0; j < ctx->num_fds; j++) {
int ret, done = 0;
again:
ret = write(out_fd[j], data + done, sizeof(data)-done);
again:
ret = write(ctx->out_fds[j], data + done, sizeof(data)-done);
if (ret < 0)
barf("SENDER: write");
done += ret;
@ -73,113 +176,149 @@ static void sender(unsigned int num_fds,
goto again;
}
}
return NULL;
}
/* One receiver per fd */
static void receiver(unsigned int num_packets,
int in_fd,
int ready_out,
int wakefd)
static void *receiver(struct receiver_context* ctx)
{
unsigned int i;
if (process_mode)
close(ctx->in_fds[1]);
/* Wait for start... */
ready(ready_out, wakefd);
ready(ctx->ready_out, ctx->wakefd);
/* Receive them all */
for (i = 0; i < num_packets; i++) {
for (i = 0; i < ctx->num_packets; i++) {
char data[DATASIZE];
int ret, done = 0;
again:
ret = read(in_fd, data + done, DATASIZE - done);
again:
ret = read(ctx->in_fds[0], data + done, DATASIZE - done);
if (ret < 0)
barf("SERVER: read");
done += ret;
if (done < DATASIZE)
goto again;
}
return NULL;
}
pthread_t create_worker(void *ctx, void *(*func)(void *))
{
pthread_attr_t attr;
pthread_t childid;
int err;
if (process_mode) {
/* process mode */
/* Fork the receiver. */
switch (fork()) {
case -1: barf("fork()");
case 0:
(*func) (ctx);
exit(0);
}
return (pthread_t) 0;
}
if (pthread_attr_init(&attr) != 0)
barf("pthread_attr_init:");
#ifndef __ia64__
if (pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN) != 0)
barf("pthread_attr_setstacksize");
#endif
if ((err=pthread_create(&childid, &attr, func, ctx)) != 0) {
fprintf(stderr, "pthread_create failed: %s (%d)\n", strerror(err), err);
exit(-1);
}
return (childid);
}
void reap_worker(pthread_t id)
{
int status;
if (process_mode) {
/* process mode */
wait(&status);
if (!WIFEXITED(status))
exit(1);
} else {
void *status;
pthread_join(id, &status);
}
}
/* One group of senders and receivers */
static unsigned int group(unsigned int num_fds,
static unsigned int group(pthread_t *pth,
unsigned int num_fds,
int ready_out,
int wakefd,
pid_t *childpids,
unsigned int childp_offset)
int wakefd)
{
unsigned int i;
int out_fds[num_fds];
unsigned int children_started = 0;
struct sender_context* snd_ctx = malloc (sizeof(struct sender_context)
+num_fds*sizeof(int));
for (i = 0; i < num_fds ; i++) {
for (i = 0; i < num_fds; i++) {
int fds[2];
pid_t pid = -1;
struct receiver_context* ctx = malloc (sizeof(*ctx));
if (!ctx)
barf("malloc()");
/* Create the pipe between client and server */
fdpair(fds);
/* Fork the receiver. */
switch ((pid = fork())) {
case -1:
return children_started;
case 0:
close(fds[1]);
receiver(num_fds*loops, fds[0], ready_out, wakefd);
exit(0);
}
childpids[childp_offset + children_started] = pid;
children_started++;
out_fds[i] = fds[1];
ctx->num_packets = num_fds*loops;
ctx->in_fds[0] = fds[0];
ctx->in_fds[1] = fds[1];
ctx->ready_out = ready_out;
ctx->wakefd = wakefd;
pth[i] = create_worker(ctx, (void *)(void *)receiver);
snd_ctx->out_fds[i] = fds[1];
if (process_mode)
close(fds[0]);
}
/* Now we have all the fds, fork the senders */
for (i = 0; i < num_fds; i++) {
pid_t pid = -1;
snd_ctx->ready_out = ready_out;
snd_ctx->wakefd = wakefd;
snd_ctx->num_fds = num_fds;
switch ((pid = fork())) {
case -1:
return children_started;
case 0:
sender(num_fds, out_fds, ready_out, wakefd);
exit(0);
}
childpids[childp_offset + children_started] = pid;
children_started++;
pth[num_fds+i] = create_worker(snd_ctx, (void *)(void *)sender);
}
/* Close the fds we have left */
if (process_mode)
for (i = 0; i < num_fds; i++)
close(out_fds[i]);
close(snd_ctx->out_fds[i]);
/* Return number of children to reap */
return num_fds * 2;
}
static unsigned int reap_children(pid_t *children, unsigned int num_childs, unsigned int dokill) {
unsigned int i, rc = 0;
for (i = 0; i < num_childs; i++) {
int status;
if( dokill ) {
kill(children[i], SIGTERM);
}
waitpid(children[i], &status, 0);
if (!WIFEXITED(status))
rc++; /* count how many children not exiting "correctly" */
}
return rc;
}
int main(int argc, char *argv[])
{
unsigned int i, num_groups, total_children, rc;
unsigned int i, num_groups = 10, total_children;
struct timeval start, stop, diff;
unsigned int num_fds = 20;
int readyfds[2], wakefds[2];
char dummy;
pid_t *children = NULL;
pthread_t *pth_tab;
if (argv[1] && strcmp(argv[1], "-pipe") == 0) {
use_pipes = 1;
@ -187,27 +326,37 @@ int main(int argc, char *argv[])
argv++;
}
if (argc != 2 || (num_groups = atoi(argv[1])) == 0)
barf("Usage: hackbench [-pipe] <num groups>\n");
if (argc >= 2 && (num_groups = atoi(argv[1])) == 0)
print_usage_exit();
printf("Running with %d*40 (== %d) tasks.\n",
num_groups, num_groups*40);
fflush(NULL);
if (argc > 2) {
if ( !strcmp(argv[2], "process") )
process_mode = 1;
else if ( !strcmp(argv[2], "thread") )
process_mode = 0;
else
print_usage_exit();
}
if (argc > 3)
loops = atoi(argv[3]);
pth_tab = malloc(num_fds * 2 * num_groups * sizeof(pthread_t));
if (!pth_tab)
barf("main:malloc()");
fdpair(readyfds);
fdpair(wakefds);
children = calloc((num_groups * num_fds * 2)+1, sizeof(pid_t)+2);
if( !children )
barf("calloc() for children array");
/* Start groups of children (num_fds * 2 - sender and receiver processes) */
total_children = 0;
for (i = 0; i < num_groups; i++) {
int c = group(num_fds, readyfds[1], wakefds[0], children, total_children);
if( c < (num_fds*2) ) {
/* Not all expected children started - kill all children which are alive */
reap_children(children, total_children + c, 1);
barf("fork()");
}
total_children += c;
}
for (i = 0; i < num_groups; i++)
total_children += group(pth_tab+total_children, num_fds, readyfds[1], wakefds[0]);
/* Wait for everyone to be ready */
for (i = 0; i < total_children; i++)
@ -221,16 +370,15 @@ int main(int argc, char *argv[])
barf("Writing to start them");
/* Reap them all */
if ((rc = reap_children(children, total_children, 0)) != 0) {
printf("%i children did not exit correctly", rc);
}
for (i = 0; i < total_children; i++)
reap_worker(pth_tab[i]);
gettimeofday(&stop, NULL);
/* Print time... */
timersub(&stop, &start, &diff);
printf("Time: %lu.%03lu\n", diff.tv_sec, diff.tv_usec/1000);
free(children);
exit(rc > 0 ? 1 : 0);
exit(0);
}