rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Emit flush events in order, after the user event

Browse Source 
Fixes the backwards jump in time warnings each 2 MB of buffer, caused by
the flush events being written out of order.
This commit is contained in:
Rodrigo Arias 2021-11-03 11:08:29 +01:00
parent e05f78bb0f
commit 29ea26e871
1 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ovni.c
View File

@ -498,10 +498,28 @@ ovni_flush(void)
return ret; return ret;
} }
static void
add_flush_events(uint64_t t0, uint64_t t1)
{
struct ovni_ev pre={0}, post={0};
pre.header.clock = t0;
ovni_ev_set_mcv(&pre, "OF[");
post.header.clock = t1;
ovni_ev_set_mcv(&post, "OF]");
/* Add the two flush events */
ovni_ev_add(&pre);
ovni_ev_add(&post);
}
static void static void
ovni_ev_add_jumbo(struct ovni_ev *ev, uint8_t *buf, uint32_t bufsize) ovni_ev_add_jumbo(struct ovni_ev *ev, uint8_t *buf, uint32_t bufsize)
{ {
size_t evsize, totalsize; size_t evsize, totalsize;
int flushed = 0;
uint64_t t0, t1;
assert(ovni_payload_size(ev) == 0); assert(ovni_payload_size(ev) == 0);
@ -512,7 +530,13 @@ ovni_ev_add_jumbo(struct ovni_ev *ev, uint8_t *buf, uint32_t bufsize)
/* Check if the event fits or flush first otherwise */ /* Check if the event fits or flush first otherwise */
if(rthread.evlen + totalsize >= OVNI_MAX_EV_BUF) if(rthread.evlen + totalsize >= OVNI_MAX_EV_BUF)
ovni_flush(); {
/* Measure the flush times */
t0 = ovni_get_clock();
flush_evbuf();
t1 = ovni_get_clock();
flushed = 1;
}
/* Se the jumbo flag here, so we capture the previous evsize /* Se the jumbo flag here, so we capture the previous evsize
* properly, ignoring the jumbo buffer */ * properly, ignoring the jumbo buffer */
@ -524,22 +548,46 @@ ovni_ev_add_jumbo(struct ovni_ev *ev, uint8_t *buf, uint32_t bufsize)
rthread.evlen += bufsize; rthread.evlen += bufsize;
assert(rthread.evlen < OVNI_MAX_EV_BUF); assert(rthread.evlen < OVNI_MAX_EV_BUF);
}
if(flushed)
{
/* Emit the flush events *after* the user event */
add_flush_events(t0, t1);
/* Set the current clock to the last event */
rthread.clockvalue = t1;
}
}
static void static void
ovni_ev_add(struct ovni_ev *ev) ovni_ev_add(struct ovni_ev *ev)
{ {
int size; int size, flushed = 0;
uint64_t t0, t1;
size = ovni_ev_size(ev); size = ovni_ev_size(ev);
/* Check if the event fits or flush first otherwise */ /* Check if the event fits or flush first otherwise */
if(rthread.evlen + size >= OVNI_MAX_EV_BUF) if(rthread.evlen + size >= OVNI_MAX_EV_BUF)
ovni_flush(); {
/* Measure the flush times */
t0 = ovni_get_clock();
flush_evbuf();
t1 = ovni_get_clock();
flushed = 1;
}
memcpy(&rthread.evbuf[rthread.evlen], ev, size); memcpy(&rthread.evbuf[rthread.evlen], ev, size);
rthread.evlen += size; rthread.evlen += size;
if(flushed)
{
/* Emit the flush events *after* the user event */
add_flush_events(t0, t1);
/* Set the current clock to the last event */
rthread.clockvalue = t1;
}
} }
void void