d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various connections to last commit

Browse Source
This commit is contained in:
Luigi Rizzo 2012-12-25 07:29:25 +00:00
parent 3e6c8b5366
commit f7a1732204
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/tools/netrate/netreceive/Makefile
View File

@ -4,5 +4,6 @@
PROG= netreceive PROG= netreceive
NO_MAN= NO_MAN=
LDFLAGS += -lpthread
.include <bsd.prog.mk> .include <bsd.prog.mk>

30
tools/tools/netrate/netreceive/netreceive.c
View File

@ -59,6 +59,7 @@ static int round_to(int n, int l)
struct td_desc { struct td_desc {
pthread_t td_id; pthread_t td_id;
uint64_t count; /* rx counter */ uint64_t count; /* rx counter */
uint64_t byte_count; /* rx byte counter */
int fd; int fd;
char *buf; char *buf;
int buflen; int buflen;
@ -116,18 +117,20 @@ rx_body(void *data)
if (y < 0) if (y < 0)
break; break;
t->count++; t->count++;
t->byte_count += y;
} }
} }
return NULL; return NULL;
} }
int static struct td_desc **
make_threads(struct td_desc **tp, int *s, int nsock, int nthreads) make_threads(int *s, int nsock, int nthreads)
{ {
int i, si, nt = nsock * nthreads; int i, si, nt = nsock * nthreads;
int lb = round_to(nt * sizeof (struct td_desc *), 64); int lb = round_to(nt * sizeof (struct td_desc *), 64);
int td_len = round_to(sizeof(struct td_desc), 64); // cache align int td_len = round_to(sizeof(struct td_desc), 64); // cache align
char *m = calloc(1, lb + td_len * nt); char *m = calloc(1, lb + td_len * nt);
struct td_desc **tp;
printf("td len %d -> %d\n", (int)sizeof(struct td_desc) , td_len); printf("td len %d -> %d\n", (int)sizeof(struct td_desc) , td_len);
/* pointers plus the structs */ /* pointers plus the structs */
@ -140,6 +143,8 @@ make_threads(struct td_desc **tp, int *s, int nsock, int nthreads)
for (si = i = 0; i < nt; i++, m += td_len) { for (si = i = 0; i < nt; i++, m += td_len) {
tp[i] = (struct td_desc *)m; tp[i] = (struct td_desc *)m;
tp[i]->fd = s[si]; tp[i]->fd = s[si];
tp[i]->buflen = 65536;
tp[i]->buf = calloc(1, tp[i]->buflen);
if (++si == nsock) if (++si == nsock)
si = 0; si = 0;
if (pthread_create(&tp[i]->td_id, NULL, rx_body, tp[i])) { if (pthread_create(&tp[i]->td_id, NULL, rx_body, tp[i])) {
@ -147,27 +152,29 @@ make_threads(struct td_desc **tp, int *s, int nsock, int nthreads)
exit(1); exit(1);
} }
} }
return tp;
} }
int static void
main_thread(struct td_desc **tp, int nsock, int nthreads) main_thread(struct td_desc **tp, int nsock, int nthreads)
{ {
uint64_t c0, c1; uint64_t c0, c1, bc0, bc1;
struct timespec now, then, delta; struct timespec now, then, delta;
/* now the parent collects and prints results */ /* now the parent collects and prints results */
c0 = c1 = 0; c0 = c1 = bc0 = bc1 = 0;
clock_gettime(CLOCK_REALTIME, &then); clock_gettime(CLOCK_REALTIME, &then);
fprintf(stderr, "start at %ld.%09ld\n", then.tv_sec, then.tv_nsec); fprintf(stderr, "start at %ld.%09ld\n", then.tv_sec, then.tv_nsec);
while (1) { while (1) {
int i, nt = nsock * nthreads; int i, nt = nsock * nthreads;
int64_t dn; int64_t dn;
uint64_t pps; uint64_t pps, bps;
if (poll(NULL, 0, 500) < 0) if (poll(NULL, 0, 500) < 0)
perror("poll"); perror("poll");
c0 = 0; c0 = bc0 = 0;
for (i = 0; i < nt; i++) { for (i = 0; i < nt; i++) {
c0 += tp[i]->count; c0 += tp[i]->count;
bc0 += tp[i]->byte_count;
} }
dn = c0 - c1; dn = c0 - c1;
clock_gettime(CLOCK_REALTIME, &now); clock_gettime(CLOCK_REALTIME, &now);
@ -176,9 +183,12 @@ main_thread(struct td_desc **tp, int nsock, int nthreads)
then = now; then = now;
pps = dn; pps = dn;
pps = (pps * 1000000000) / (delta.tv_sec*1000000000 + delta.tv_nsec + 1); pps = (pps * 1000000000) / (delta.tv_sec*1000000000 + delta.tv_nsec + 1);
fprintf(stderr, "%d pkts in %ld.%09ld ns %ld pps\n", bps = ((bc0 - bc1) * 8000000000) / (delta.tv_sec*1000000000 + delta.tv_nsec + 1);
(int)dn, delta.tv_sec, delta.tv_nsec, (long)pps); fprintf(stderr, " %9ld pps %8.3f Mbps", (long)pps, .000001*bps);
fprintf(stderr, " - %d pkts in %ld.%09ld ns\n",
(int)dn, delta.tv_sec, delta.tv_nsec);
c1 = c0; c1 = c0;
bc1 = bc0;
} }
} }
@ -256,7 +266,7 @@ main(int argc, char *argv[])
printf("netreceive %d sockets x %d threads listening on UDP port %d\n", printf("netreceive %d sockets x %d threads listening on UDP port %d\n",
nsock, nthreads, (u_short)port); nsock, nthreads, (u_short)port);
make_threads(tp, s, nsock, nthreads); tp = make_threads(s, nsock, nthreads);
main_thread(tp, nsock, nthreads); main_thread(tp, nsock, nthreads);
/*NOTREACHED*/ /*NOTREACHED*/