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

Use pwrite() to modify the streams

Browse Source 
Using MAP_SHARED and mmap() causes coherence problems on shared
filesystems such as GPFS.

See https://pm.bsc.es/gitlab/rarias/ovni/-/issues/28 for more
details.
This commit is contained in:
Rodrigo Arias 2021-12-16 14:22:58 +01:00
parent 12d35b1d46
commit 26ff310287
1 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sort.c
View File

@ -27,18 +27,19 @@
#define _GNU_SOURCE
#include <stdio.h>
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <linux/limits.h>
#include <stdatomic.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <linux/limits.h>
#include <errno.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <stdatomic.h>
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
#include <ctype.h>
#include "ovni.h"
#include "trace.h"
@ -58,7 +59,13 @@ struct sortplan {
/* The next event which must be not affected */
struct ovni_ev *next;
/* Pointer to the stream buffer */
uint8_t *base;
struct ring *r;
/* File descriptor of the stream file */
int fd;
};
enum operation_mode { SORT, CHECK };
@ -216,6 +223,22 @@ sort_buf(uint8_t *src, uint8_t *buf, int64_t bufsize,
dbg("injected %ld events in the past\n", injected);
}
static void
write_stream(int fd, void *base, void *dst, const void *src, size_t size)
{
while(size > 0) {
off_t offset = (off_t) ((int64_t) dst - (int64_t) base);
ssize_t written = pwrite(fd, src, size, offset);
if(written < 0)
die("pwrite failed: %s\n", strerror(errno));
size -= written;
src = (void *) (((uint8_t *) src) + written);
dst = (void *) (((uint8_t *) dst) + written);
}
}
static int
execute_sort_plan(struct sortplan *sp, size_t region)
{
@ -258,6 +281,8 @@ execute_sort_plan(struct sortplan *sp, size_t region)
/* Copy the sorted events back into the stream buffer */
memcpy(first, buf, bufsize);
write_stream(sp->fd, sp->base, first, buf, bufsize);
free(buf);
if(region == 0)
@ -279,8 +304,16 @@ stream_winsort(struct ovni_stream *stream, struct ring *r)
//uint64_t lastclock = 0;
char st = 'S';
char *fn = stream->thread->tracefile;
int fd = open(fn, O_WRONLY);
if(fd < 0)
die("open %s failed: %s\n", fn, strerror(errno));
ring_reset(r);
sp.r = r;
sp.fd = fd;
sp.base = stream->buf;
size_t region = 0;
@ -334,6 +367,9 @@ stream_winsort(struct ovni_stream *stream, struct ring *r)
ring_add(r, ev);
}
if(close(fd) < 0)
die("close %s failed: %s\n", fn, strerror(errno));
return 0;
}
@ -392,9 +428,6 @@ process_trace(struct ovni_trace *trace)
* attempt */
return -1;
}
if(msync(stream->buf, stream->size, MS_ASYNC))
die("msync failed: %s\n", strerror(errno));
}
else
{