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

Fix sorting without previous events

Browse Source
This commit is contained in:
Rodrigo Arias 2022-10-07 12:17:59 +02:00
parent 6dda4e90dd
commit 75bc02bccd
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sort.c
View File

@ -87,15 +87,16 @@ static ssize_t
find_destination(struct ring *r, uint64_t clock) find_destination(struct ring *r, uint64_t clock)
{ {
ssize_t nback = 0; ssize_t nback = 0;
ssize_t i = 0;
UNUSED(nback); UNUSED(nback);
ssize_t start = r->tail - 1 >= 0 ? r->tail - 1 : r->size - 1; ssize_t start = r->tail - 1 >= 0 ? r->tail - 1 : r->size - 1;
ssize_t end = r->head - 1 >= 0 ? r->head - 1 : r->size - 1; ssize_t end = r->head - 1 >= 0 ? r->head - 1 : r->size - 1;
uint64_t last_clock = 0;
for (i = start; i != end; i = i - 1 < 0 ? r->size - 1 : i - 1) { for (ssize_t i = start; i != end; i = i - 1 < 0 ? r->size - 1 : i - 1) {
if (r->ev[i]->header.clock < clock) { last_clock = r->ev[i]->header.clock;
if (last_clock < clock) {
dbg("found suitable position %ld events backwards\n", dbg("found suitable position %ld events backwards\n",
nback); nback);
return i; return i;
@ -103,8 +104,19 @@ find_destination(struct ring *r, uint64_t clock)
nback++; nback++;
} }
/* If there is no event with a lower clock and we haven't fill the ring
* yet, then we are at the beginning and no other event has be emitted
* before the sort window. So simply return the first marker. */
if (nback < (ssize_t) max_look_back) {
if (r->head != 0)
die("ring head expected to be 0\n");
if (r->tail >= r->size - 1)
die("ring tail=%d expected to be less than %d\n", r->tail, r->size - 1);
return r->head;
}
err("cannot find a event previous to clock %lu\n", clock); err("cannot find a event previous to clock %lu\n", clock);
err("nback = %ld, last clock=%lu\n", nback, r->ev[i]->header.clock); err("nback=%ld, last_clock=%lu\n", nback, last_clock);
return -1; return -1;
} }