From 17d977aad0abeac9726a21f1500d5d0c21964b6c Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Thu, 22 Jul 2021 12:35:02 +0200 Subject: [PATCH] Use write() and mark flushes --- Makefile | 13 ++++--- def.h | 11 ++++-- ovni.c | 101 +++++++++++++++++++++++++++++++++++++++++++------------ ovni.h | 5 ++- 4 files changed, 101 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index c16c206..0301194 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,12 @@ -CFLAGS=-g -O0 -fPIC +CFLAGS=-fPIC -CFLAGS+=-fsanitize=address -LDFLAGS+=-fsanitize=address +#CFLAGS+=-fsanitize=address +#LDFLAGS+=-fsanitize=address +#CFLAGS+=-g -O0 +CFLAGS+=-O3 +CFLAGS+=-fstack-protector-explicit -BIN=dump libovni.a prvth +BIN=dump libovni.a prvth test_speed all: $(BIN) @@ -12,5 +15,7 @@ libovni.a: ovni.o dump: ovni.o dump.o +test_speed: test_speed.c ovni.o + clean: rm -f *.o $(BIN) diff --git a/def.h b/def.h index 701924d..cc2abd1 100644 --- a/def.h +++ b/def.h @@ -7,6 +7,9 @@ #define MAX_LOOM 4 #define TRACEDIR "ovni" +#define MAX_EV (16*1024) /* 16 kev per thread */ +//#define MAX_EV (16) /* 16 ev per thread */ + /* ----------------------- common ------------------------ */ enum thread_state { @@ -36,10 +39,14 @@ struct rthread { /* Clock value of the events being emitted */ uint64_t clockvalue; - /* Stream trace file */ - FILE *stream; + /* Stream trace file descriptor */ + int streamfd; int ready; + + /* Buffer to write events */ + int nevents; + struct event events[MAX_EV]; }; /* State of each process on runtime */ diff --git a/ovni.c b/ovni.c index 2063339..0d4977b 100644 --- a/ovni.c +++ b/ovni.c @@ -11,10 +11,16 @@ #include #include #include +#include +#include +#include + #include "ovni.h" #include "def.h" +//#define ENABLE_SLOW_CHECKS + /* Data per process */ struct rproc rproc = {0}; @@ -59,17 +65,23 @@ create_trace_dirs(char *tracedir, int loom, int proc) static int create_trace_stream() { + int fd; char path[PATH_MAX]; fprintf(stderr, "create thread stream tid=%d gettid=%d rproc.proc=%d rproc.ready=%d\n", rthread.tid, gettid(), rproc.proc, rproc.ready); snprintf(path, PATH_MAX, "%s/thread.%d", rproc.dir, rthread.tid); - if((rthread.stream = fopen(path, "w")) == NULL) + + //rthread.streamfd = open(path, O_WRONLY | O_CREAT | O_DSYNC, 0644); + rthread.streamfd = open(path, O_WRONLY | O_CREAT, 0644); + + if(rthread.streamfd == -1) { - fprintf(stderr, "fopen %s failed: %s\n", path, strerror(errno)); + fprintf(stderr, "open %s failed: %s\n", path, strerror(errno)); + /* Shall we just return -1 ? */ abort(); - return -1; + //return -1; } return 0; @@ -123,6 +135,7 @@ ovni_thread_init(pid_t tid) rthread.tid = tid; rthread.cpu = -666; + rthread.nevents = 0; if(create_trace_stream(tid)) abort(); @@ -146,21 +159,23 @@ ovni_cpu_set(int cpu) /* Sets the current time so that all subsequent events have the new * timestamp */ -int +void ovni_clock_update() { struct timespec tp; uint64_t ns = 1000LL * 1000LL * 1000LL; uint64_t raw; + int ret; - if(clock_gettime(rproc.clockid, &tp)) - return -1; + ret = clock_gettime(rproc.clockid, &tp); + +#ifdef ENABLE_SLOW_CHECKS + if(ret) abort(); +#endif raw = tp.tv_sec * ns + tp.tv_nsec; //raw = raw >> 6; rthread.clockvalue = (uint64_t) raw; - - return 0; } static void @@ -183,32 +198,73 @@ hexdump(uint8_t *buf, size_t size) static int ovni_write(uint8_t *buf, size_t size) { - assert(rthread.stream); + ssize_t written; - fprintf(stderr, "writing %ld bytes in thread.%d\n", size, rthread.tid); - if(fwrite(buf, 1, size, rthread.stream) != size) + do { - perror("fwrite"); - return -1; - } + written = write(rthread.streamfd, buf, size); - //fflush(rthread.stream); + if(written < 0) + { + perror("write"); + return -1; + } + + size -= written; + buf += written; + } while(size > 0); return 0; } +int +ovni_thread_flush() +{ + int ret = 0; + struct event pre={0}, post={0}; + + assert(rthread.ready); + assert(rproc.ready); + + ovni_clock_update(); + pre.clock = rthread.clockvalue; + pre.fsm = 'F'; + pre.event = '['; + + ret = ovni_write((uint8_t *) rthread.events, rthread.nevents * sizeof(struct event)); + rthread.nevents = 0; + + ovni_clock_update(); + post.clock = rthread.clockvalue; + post.fsm = 'F'; + post.event = ']'; + + /* Also emit the two flush events */ + memcpy(&rthread.events[rthread.nevents++], &pre, sizeof(struct event));; + memcpy(&rthread.events[rthread.nevents++], &post, sizeof(struct event));; + + return ret; +} + static int ovni_ev(uint8_t fsm, uint8_t event, uint16_t a, uint16_t b) { - struct event ev; + struct event *ev; + int ret = 0; - ev.clock = rthread.clockvalue; - ev.fsm = fsm; - ev.event = event; - ev.a = a; - ev.b = b; + ev = &rthread.events[rthread.nevents++]; - return ovni_write((uint8_t *) &ev, sizeof(ev)); + ev->clock = rthread.clockvalue; + ev->fsm = fsm; + ev->event = event; + ev->a = a; + ev->b = b; + + /* Flush */ + if(rthread.nevents >= MAX_EV) + ret = ovni_thread_flush(); + + return ret; } int @@ -218,3 +274,4 @@ ovni_thread_ev(uint8_t fsm, uint8_t event, uint16_t a, uint16_t b) assert(rproc.ready); return ovni_ev(fsm, event, a, b); } + diff --git a/ovni.h b/ovni.h index 33a2171..f50fd49 100644 --- a/ovni.h +++ b/ovni.h @@ -10,10 +10,13 @@ ovni_thread_init(pid_t tid); int ovni_thread_isready(); -int +void ovni_clock_update(); int ovni_thread_ev(uint8_t fsm, uint8_t event, uint16_t a, uint16_t b); +int +ovni_thread_flush(); + #endif /* OVNI_H */