chunk: Add functions to map file contents to a chunk

This commit is contained in:
Martin Willi
2014-01-23 15:55:32 +01:00
parent fa9b6e88a0
commit 595b6d9a82
3 changed files with 149 additions and 1 deletions
+80
View File
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
@@ -275,6 +276,85 @@ chunk_t chunk_from_fd(int fd)
return chunk_clone(chunk_create(buf, total));
}
/**
* Implementation for mmap()ed chunks
*/
typedef struct {
/* public chunk interface */
chunk_t public;
/* FD of open file */
int fd;
/* mmap() address */
void *map;
/* size of map */
size_t len;
} mmaped_chunk_t;
/**
* See header.
*/
chunk_t *chunk_map(char *path, bool wr)
{
mmaped_chunk_t *chunk;
struct stat sb;
int tmp;
INIT(chunk,
.fd = open(path, wr ? O_RDWR : O_RDONLY),
);
if (chunk->fd == -1)
{
free(chunk);
return NULL;
}
if (fstat(chunk->fd, &sb) == -1)
{
tmp = errno;
chunk_unmap(&chunk->public);
errno = tmp;
return NULL;
}
chunk->len = sb.st_size;
/* map non-empty files only, as mmap() complains otherwise */
if (chunk->len)
{
/* in read-only mode, we allow writes, but don't sync to disk */
chunk->map = mmap(NULL, chunk->len, PROT_READ | PROT_WRITE,
wr ? MAP_SHARED : MAP_PRIVATE, chunk->fd, 0);
if (chunk->map == MAP_FAILED)
{
tmp = errno;
chunk_unmap(&chunk->public);
errno = tmp;
return NULL;
}
}
chunk->public = chunk_create(chunk->map, chunk->len);
return &chunk->public;
}
/**
* See header.
*/
bool chunk_unmap(chunk_t *public)
{
mmaped_chunk_t *chunk;
bool ret = FALSE;
int tmp = 0;
chunk = (mmaped_chunk_t*)public;
if (chunk->map && chunk->map != MAP_FAILED)
{
ret = munmap(chunk->map, chunk->len) == 0;
tmp = errno;
}
close(chunk->fd);
free(chunk);
errno = tmp;
return ret;
}
/** hex conversion digits */
static char hexdig_upper[] = "0123456789ABCDEF";
+26
View File
@@ -107,6 +107,32 @@ bool chunk_write(chunk_t chunk, char *path, char *label, mode_t mask, bool force
*/
chunk_t chunk_from_fd(int fd);
/**
* mmap() a file to a chunk
*
* The returned chunk structure is allocated from heap, but it must be freed
* through chunk_unmap(). A user may alter the chunk ptr or len, but must pass
* the chunk pointer returned from chunk_map() to chunk_unmap() after use.
*
* On error, errno is set appropriately.
*
* @param path path of file to map
* @param wr TRUE to sync writes to disk
* @return mapped chunk, NULL on error
*/
chunk_t *chunk_map(char *path, bool wr);
/**
* munmap() a chunk previously mapped with chunk_map()
*
* When unmapping a writeable map, the return value should be checked to
* ensure changes landed on disk.
*
* @param chunk pointer returned from chunk_map()
* @return TRUE of changes written back to file
*/
bool chunk_unmap(chunk_t *chunk);
/**
* Convert a chunk of data to hex encoding.
*