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

Remove verbose details from ovnisort

Browse Source
This commit is contained in:
Rodrigo Arias 2021-12-16 15:16:17 +01:00
parent 500051305c
commit df72ab79ac
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sort.c
View File

@ -136,6 +136,7 @@ ends_unsorted_region(struct ovni_ev *ev)
ev->header.value == ']'; ev->header.value == ']';
} }
#if 0
static void static void
hexdump(uint8_t *buf, size_t size) hexdump(uint8_t *buf, size_t size)
{ {
@ -175,6 +176,7 @@ hexdump(uint8_t *buf, size_t size)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
} }
#endif
static void static void
sort_buf(uint8_t *src, uint8_t *buf, int64_t bufsize, sort_buf(uint8_t *src, uint8_t *buf, int64_t bufsize,
@ -240,7 +242,7 @@ write_stream(int fd, void *base, void *dst, const void *src, size_t size)
} }
static int static int
execute_sort_plan(struct sortplan *sp, size_t region) execute_sort_plan(struct sortplan *sp)
{ {
int64_t i0, bufsize; int64_t i0, bufsize;
uint8_t *buf; uint8_t *buf;
@ -253,7 +255,9 @@ execute_sort_plan(struct sortplan *sp, size_t region)
/* Cannot sort in one pass; just fail for now */ /* Cannot sort in one pass; just fail for now */
if((i0 = find_destination(sp->r, sp->bad0->header.clock)) < 0) if((i0 = find_destination(sp->r, sp->bad0->header.clock)) < 0)
{ {
err("cannot find a destination for unsorted region\n"); err("cannot find destination for region starting at clock %ld\n",
sp->bad0->header.clock);
return -1; return -1;
} }
@ -270,12 +274,6 @@ execute_sort_plan(struct sortplan *sp, size_t region)
if(!buf) if(!buf)
die("malloc failed: %s\n", strerror(errno)); die("malloc failed: %s\n", strerror(errno));
if(region == 0)
{
err("stream window region %ld BEFORE sort:\n", region);
hexdump((uint8_t *) first, bufsize);
}
sort_buf((uint8_t *) first, buf, bufsize, sort_buf((uint8_t *) first, buf, bufsize,
(uint8_t *) sp->bad0, (uint8_t *) sp->next); (uint8_t *) sp->bad0, (uint8_t *) sp->next);
@ -285,12 +283,6 @@ execute_sort_plan(struct sortplan *sp, size_t region)
free(buf); free(buf);
if(region == 0)
{
err("stream window region %ld AFTER sort:\n", region);
hexdump((uint8_t *) first, bufsize);
}
return 0; return 0;
} }
@ -315,7 +307,7 @@ stream_winsort(struct ovni_stream *stream, struct ring *r)
sp.fd = fd; sp.fd = fd;
sp.base = stream->buf; sp.base = stream->buf;
size_t region = 0; size_t empty_regions = 0;
for(i=0; stream->active; i++) for(i=0; stream->active; i++)
{ {
@ -332,7 +324,7 @@ stream_winsort(struct ovni_stream *stream, struct ring *r)
* event inside the section */ * event inside the section */
if(ends_unsorted_region(ev)) if(ends_unsorted_region(ev))
{ {
err("warning: ignoring empty sort section\n"); empty_regions++;
st = 'S'; st = 'S';
} }
else else
@ -347,7 +339,7 @@ stream_winsort(struct ovni_stream *stream, struct ring *r)
{ {
sp.next = ev; sp.next = ev;
dbg("executing sort plan for stream tid=%d\n", stream->tid); dbg("executing sort plan for stream tid=%d\n", stream->tid);
if(execute_sort_plan(&sp, region) < 0) if(execute_sort_plan(&sp) < 0)
{ {
err("sort failed for stream tid=%d\n", err("sort failed for stream tid=%d\n",
stream->tid); stream->tid);
@ -358,8 +350,6 @@ stream_winsort(struct ovni_stream *stream, struct ring *r)
sp.next = NULL; sp.next = NULL;
sp.bad0 = NULL; sp.bad0 = NULL;
region++;
st = 'S'; st = 'S';
} }
} }
@ -367,6 +357,10 @@ stream_winsort(struct ovni_stream *stream, struct ring *r)
ring_add(r, ev); ring_add(r, ev);
} }
if(empty_regions > 0)
err("warning: stream %d contains %ld empty sort regions\n",
stream->tid, empty_regions);
if(close(fd) < 0) if(close(fd) < 0)
die("close %s failed: %s\n", fn, strerror(errno)); die("close %s failed: %s\n", fn, strerror(errno));