Commit d40d1092 authored by william's avatar william

fixup up bench build

parent f3100ac3
...@@ -19,13 +19,31 @@ timeout64: CPPFLAGS+=-DWHEEL_BIT=6 -DWHEEL_NUM=$(WHEEL_NUM) ...@@ -19,13 +19,31 @@ timeout64: CPPFLAGS+=-DWHEEL_BIT=6 -DWHEEL_NUM=$(WHEEL_NUM)
timeout64 timeout32 timeout16 timeout8 timeout: timeout.c timeout64 timeout32 timeout16 timeout8 timeout: timeout.c
$(CC) $(CFLAGS) -o $@ $^ $(CPPFLAGS) $(CC) $(CFLAGS) -o $@ $^ $(CPPFLAGS)
timeout.o: CPPFLAGS=-DWHEEL_BIT=$(WHEEL_BIT) -DWHEEL_NUM=$(WHEEL_NUM)
timeout.o: timeout.c
$(CC) $(CFLAGS) -c -o $@ $^ $(CPPFLAGS)
bench: bench.c timeout.h
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< -ldl
ifeq ($(shell uname -s), Darwin)
SOFLAGS = -bundle -undefined dynamic_lookup
else
SOFLAGS = -shared
endif
bench-wheel.so: CPPFLAGS+=-DWHEEL_BIT=$(WHEEL_BIT) -DWHEEL_NUM=$(WHEEL_NUM)
bench-%.so: bench-%.c timeout.h
$(CC) -o $@ $< $(CPPFLAGS) $(CFLAGS) -Wno-unused-function $(SOFLAGS)
.PHONY: clean clean~ .PHONY: clean clean~
clean: clean:
$(RM) -r timeout timeout8 timeout16 timeout32 timeout64 *.dSYM $(RM) -r timeout timeout8 timeout16 timeout32 timeout64 *.dSYM bench *.so *.o
clean~: clean clean~: clean
$(RM) *~ $(RM) *~
...@@ -199,11 +199,17 @@ static void update(timeout_t ts) { ...@@ -199,11 +199,17 @@ static void update(timeout_t ts) {
} /* update() */ } /* update() */
static void check(void) {
return;
} /* check() */
const struct vops VOPS = { const struct vops VOPS = {
.init = &init, .init = &init,
.add = &add, .add = &add,
.del = &del, .del = &del,
.get = &get, .get = &get,
.update = &update, .update = &update,
.check = &check,
}; };
...@@ -36,11 +36,18 @@ static void update(timeout_t ts) { ...@@ -36,11 +36,18 @@ static void update(timeout_t ts) {
} /* update() */ } /* update() */
static void (check)(void) {
if (!timeouts_check(&timeouts, stderr))
_Exit(1);
} /* check() */
const struct vops VOPS = { const struct vops VOPS = {
.init = &init, .init = &init,
.add = &add, .add = &add,
.del = &del, .del = &del,
.get = &get, .get = &get,
.update = &update, .update = &update,
.check = &check,
}; };
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <locale.h>
#include <unistd.h>
#include <dlfcn.h>
#include <err.h>
#include "timeout.h"
#include "bench.h"
#ifndef countof
#define countof(a) (sizeof (a) / sizeof *(a))
#endif
struct {
const char *path;
void *solib;
size_t count;
timeout_t maximum;
struct timeout *timeout;
struct vops vops;
timeout_t curtime;
} MAIN = {
.path = "bench-wheel.so",
.count = 32678,
.maximum = 60000, // 60 seconds in milliseconds
};
static int split(char **argv, int max, char *src) {
char **ap = argv, **pe = argv + max;
while (ap < pe && (*ap = strsep(&src, " \t\n"))) {
if (**ap)
++ap;
}
return ap - argv;
} /* split() */
struct op *parseop(struct op *op, char *ln) {
char *arg[8];
int argc;
if (!(argc = split(arg, countof(arg), ln)))
return NULL;
switch (**arg) {
case 'q': /* quit */
op->type = OP_QUIT;
break;
case 'h': /* help */
op->type = OP_HELP;
break;
case 'a': /* add */
if (argc != 3)
goto badargc;
op->type = OP_ADD;
op->add.id = strtoul(arg[1], NULL, 0) % MAIN.count;
op->add.timeout = strtoul(arg[2], NULL, 0);
break;
case 'd': /* del */
if (argc != 2)
goto badargc;
op->type = OP_DEL;
op->del.id = strtoul(arg[1], NULL, 0) % MAIN.count;
break;
case 'g': /* get */
op->type = OP_GET;
break;
case 's': /* step */
if (argc != 2)
goto badargc;
op->type = OP_STEP;
op->step.time = strtoul(arg[1], NULL, 0);
break;
case 'u': /* update */
if (argc != 2)
goto badargc;
op->type = OP_UPDATE;
op->update.time = strtoul(arg[1], NULL, 0);
break;
case 'c': /* check */
op->type = OP_CHECK;
break;
default:
op->type = OP_OOPS;
snprintf(op->oops.why, sizeof op->oops.why, "%.8s: illegal op", *arg);
break;
} /* switch() */
return op;
badargc:
op->type = OP_OOPS;
snprintf(op->oops.why, sizeof op->oops.why, "wrong number of arguments");
return op;
} /* parseop() */
#define SHORT_OPTS "n:t:h"
static void usage(FILE *fp) {
fprintf(fp,
"bench [-%s] LIBRARY\n" \
" -n MAX maximum number of timeouts\n" \
" -t MAX maximum timeout\n" \
" -h print usage message\n" \
"\n" \
"[commands]\n" \
" help print usage message\n" \
" quit exit program\n" \
"\n" \
"Report bugs to <william@25thandClement.com>\n",
SHORT_OPTS);
} /* usage() */
int main(int argc, char **argv) {
extern char *optarg;
extern int optind;
int optc;
struct vops *vops;
char cmd[256];
struct op op;
setlocale(LC_ALL, "C");
while (-1 != (optc = getopt(argc, argv, SHORT_OPTS))) {
switch (optc) {
case 'n':
MAIN.count = strtoul(optarg, NULL, 0);
break;
case 't':
MAIN.maximum = (strtod(optarg, NULL) * TIMEOUT_mHZ);
case 'h':
usage(stdout);
return 0;
default:
usage(stderr);
return 1;
} /* switch() */
} /* while() */
argv += optind;
argc -= optind;
if (argc > 0) {
MAIN.path = *argv++;
--argc;
}
if (!(MAIN.timeout = calloc(MAIN.count, sizeof *MAIN.timeout)))
err(1, "calloc");
if (!(MAIN.solib = dlopen(MAIN.path, RTLD_NOW|RTLD_LOCAL)))
errx(1, "%s: %s", MAIN.path, dlerror());
if (!(vops = dlsym(MAIN.solib, "VOPS")))
errx(1, "%s: %s", MAIN.path, dlerror());
MAIN.vops = *vops;
while (fgets(cmd, sizeof cmd, stdin) && parseop(&op, cmd)) {
struct timeout *to;
switch (op.type) {
case OP_QUIT:
goto quit;
case OP_HELP:
usage(stdout);
break;
case OP_ADD:
to = &MAIN.timeout[op.add.id];
MAIN.vops.add(to, op.add.timeout);
break;
case OP_DEL:
to = &MAIN.timeout[op.del.id];
MAIN.vops.del(to);
break;
case OP_GET:
while ((to = MAIN.vops.get())) {
printf("%ld expired", to - MAIN.timeout);
}
break;
case OP_STEP:
MAIN.curtime += op.step.time;
MAIN.vops.update(MAIN.curtime);
break;
case OP_UPDATE:
MAIN.curtime = op.update.time;
MAIN.vops.update(MAIN.curtime);
break;
case OP_CHECK:
break;
case OP_OOPS:
errx(1, "oops: %s", op.oops.why);
break;
}
} /* while() */
quit:
return 0;
} /* main() */
struct op {
enum {
OP_OOPS,
OP_QUIT,
OP_HELP,
OP_ADD,
OP_DEL,
OP_GET,
OP_STEP,
OP_UPDATE,
OP_CHECK,
} type;
union {
struct {
char why[32];
} oops;
struct {
unsigned id;
timeout_t timeout;
} add;
struct {
unsigned id;
} del;
struct {
timeout_t time;
} step, update;
};
}; /* struct op */
struct op *parseop(struct op *, char *ln);
struct vops {
void (*init)(struct timeout *, size_t);
void (*add)(struct timeout *, timeout_t);
void (*del)(struct timeout *);
struct timeout *(*get)(void);
void (*update)(timeout_t);
void (*check)(void);
}; /* struct vops() */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment