/*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include <dirent.h> /* readdir() */
#include <assert.h>
-
#include "log.h"
#include "osl.h"
-#include "error.h"
-#include "fd.h"
-#include "list.h"
+#include "util.h"
#include "osl_core.h"
-/**
- * Allocate a sufficiently large string and print into it.
- *
- * \param fmt A usual format string.
- *
- * Produce output according to \p fmt. No artificial bound on the length of the
- * resulting string is imposed.
- *
- * \return This function either returns a pointer to a string that must be
- * freed by the caller or \p NULL if memory allocation failed.
+/*
+ * Taken from Drepper: How to write shared libraries, Appendix B.
*
- * \sa printf(3).
+ * The main reason for this rather fancy implementation of strerror() is to
+ * avoid having an array of pointers. This is desirable because initialized
+ * pointer variables increase the startup time of the library due to the
+ * processing of relocations.
*/
-static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
-{
- int n;
- size_t size = 100;
- char *p = malloc(size);
-
- if (!p)
- return NULL;
- while (1) {
- char *q;
- va_list ap;
- /* Try to print in the allocated space. */
- va_start(ap, fmt);
- n = vsnprintf(p, size, fmt, ap);
- va_end(ap);
- /* If that worked, return the string. */
- if (n > -1 && n < size)
- break;
- /* Else try again with more space. */
- if (n > -1) /* glibc 2.1 */
- size = n + 1; /* precisely what is needed */
- else /* glibc 2.0 */
- size *= 2; /* twice the old size */
- q = realloc(p, size);
- if (!q) {
- free(p);
- return NULL;
- }
- p = q;
- }
- return p;
-}
-
-/* Taken from Drepper: How to write shared libraries, Appendix B. */
#include <stddef.h>
#define MSGSTRFIELD(line) MSGSTRFIELD1(line)
#define MSGSTRFIELD1(line) str##line
static const union msgstr_t {
struct {
-#define _S(n, s) char MSGSTRFIELD(__LINE__)[sizeof(s)];
+#define OSL_ERROR(n, s) char MSGSTRFIELD(__LINE__)[sizeof(s)];
#include "errtab.h"
-#undef _S
+#undef OSL_ERROR
};
char str[0];
} msgstr = { {
-#define _S(n, s) s,
+#define OSL_ERROR(n, s) s,
#include "errtab.h"
-#undef _S
+#undef OSL_ERROR
} };
static const unsigned int errmsgidx[] = {
-#define _S(n, s) [n] = offsetof(union msgstr_t, MSGSTRFIELD(__LINE__)),
+#define OSL_ERROR(n, s) [n] = offsetof(union msgstr_t, MSGSTRFIELD(__LINE__)),
#include "errtab.h"
-#undef _S
+#undef OSL_ERROR
};
__export const char *osl_strerror(int num)
{
- if (IS_SYSTEM_ERROR(num))
- return strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1));
return msgstr.str + errmsgidx[num];
}
-static int loglevel;
+int loglevel = 0;
static void __attribute ((constructor)) init_loglevel(void)
{
__printf_2_3 void __log(int ll, const char* fmt,...)
{
va_list argp;
- FILE *outfd;
struct tm *tm;
time_t t1;
char str[255] = "";
if (ll < loglevel)
return;
- outfd = stderr;
time(&t1);
tm = localtime(&t1);
strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
- fprintf(outfd, "%s ", str);
+ fprintf(stderr, "%s ", str);
va_start(argp, fmt);
- vfprintf(outfd, fmt, argp);
+ vfprintf(stderr, fmt, argp);
va_end(argp);
}
return 1;
}
-/**
- * Wrapper for the write system call.
- *
- * \param fd The file descriptor to write to.
- * \param buf The buffer to write.
- * \param size The length of \a buf in bytes.
- *
- * This function writes out the given buffer and retries if an interrupt
- * occurred during the write.
- *
- * \return On success, the number of bytes written is returned, otherwise, the
- * function returns \p -E_OSL_WRITE.
- *
- * \sa write(2).
- */
-static ssize_t __write(int fd, const void *buf, size_t size)
-{
- ssize_t ret;
-
- for (;;) {
- ret = write(fd, buf, size);
- if ((ret < 0) && (errno == EAGAIN || errno == EINTR))
- continue;
- return ret >= 0? ret : -E_OSL_WRITE;
- }
-}
-
-/**
- * Write the whole buffer to a file descriptor.
- *
- * \param fd The file descriptor to write to.
- * \param buf The buffer to write.
- * \param size The length of \a buf in bytes.
- *
- * This function writes the given buffer and continues on short writes and
- * when interrupted by a signal.
- *
- * \return Positive on success, negative on errors. Possible errors: any
- * errors returned by para_write().
- *
- * \sa para_write().
- */
-static ssize_t write_all(int fd, const void *buf, size_t size)
-{
-// DEBUG_LOG("writing %zu bytes\n", size);
- const char *b = buf;
- while (size) {
- ssize_t ret = __write(fd, b, size);
-// DEBUG_LOG("ret: %zd\n", ret);
- if (ret < 0)
- return ret;
- b += ret;
- size -= ret;
- }
- return 1;
-}
-/**
- * Open a file, write the given buffer and close the file.
- *
- * \param filename Full path to the file to open.
- * \param buf The buffer to write to the file.
- * \param size The size of \a buf.
- *
- * \return Standard.
- */
-static int write_file(const char *filename, const void *buf, size_t size)
-{
- int ret, fd;
-
- ret = osl_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
- if (ret < 0)
- return ret;
- fd = ret;
- ret = write_all(fd, buf, size);
- if (ret < 0)
- goto out;
- ret = 1;
-out:
- close(fd);
- return ret;
-}
-
-static int append_file(const char *filename, char *header, size_t header_size,
- char *data, size_t data_size, uint32_t *new_pos)
+static int append_file(const char *filename, char *data, size_t data_size,
+ uint32_t *new_pos)
{
int ret, fd;
if (ret < 0)
return ret;
fd = ret;
- if (header && header_size) {
- ret = write_all(fd, header, header_size);
- if (ret < 0)
- goto out;
- }
- ret = write_all(fd, data, data_size);
+ ret = write_all(fd, data, &data_size);
if (ret < 0)
goto out;
if (new_pos) {
return 1;
}
-int osl_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
-{
- return hash_compare((HASH_TYPE *)obj1->data, (HASH_TYPE *)obj2->data);
-}
-
static char *disk_storage_dirname(const struct osl_table *t, unsigned col_num,
const char *ds_name)
{
*name = disk_storage_name_of_object(t, &obj);
if (*name)
return 1;
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
}
static void column_name_hash(const char *col_name, HASH_TYPE *hash)
int i, j, ret;
const struct osl_column_description *cd;
- ret = -E_OSL_BAD_TABLE_DESC;
ret = verify_name(t->desc->name);
if (ret < 0)
goto err;
{
const struct osl_column_description *cd;
struct osl_table *t = calloc(1, sizeof(*t));
- int i, ret = -ERRNO_TO_ERROR(ENOMEM), have_disk_storage_name_column = 0;
+ int i, ret = -E_OSL_NOMEM, have_disk_storage_name_column = 0;
if (!t)
return ret;
ret = -E_OSL_NO_COLUMNS;
if (!desc->num_columns)
goto err;
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
t->columns = calloc(desc->num_columns, sizeof(struct osl_column));
if (!t->columns)
goto err;
ret = -E_OSL_BAD_STORAGE_FLAGS;
if (st == OSL_DISK_STORAGE && sf & OSL_RBTREE)
goto err;
+ if ((sf & OSL_RBTREE) && !(sf & OSL_UNIQUE))
+ WARNING_LOG("invalid storage flags for column %s: "
+ "OSL_RBTREE && !OSL_UNIQUE\n", cd->name);
ret = -E_OSL_BAD_STORAGE_SIZE;
if (sf & OSL_FIXED_SIZE && !cd->data_size)
goto err;
* \param map The memory mapping of the index file.
* \param desc The values found in the index header are returned here.
*
- * Read the index header, check for the paraslash magic string and the table version number.
- * Read all information stored in the index header into \a desc.
+ * Read the index header, check for the osl magic string and the table version
+ * number. Read all information stored in the index header into \a desc.
*
* \return Standard.
*
int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
{
char *buf = map->data;
- uint8_t version;
+ uint8_t version, compat_version, create_version;
uint16_t header_size;
int ret, i;
unsigned offset;
if (map->size < MIN_INDEX_HEADER_SIZE(1))
return -E_OSL_SHORT_TABLE;
- if (strncmp(buf + IDX_PARA_MAGIC, PARA_MAGIC, strlen(PARA_MAGIC)))
+ if (strncmp(buf + IDX_OSL_MAGIC, OSL_MAGIC, strlen(OSL_MAGIC)))
return -E_OSL_NO_MAGIC;
version = read_u8(buf + IDX_VERSION);
- if (version < MIN_TABLE_VERSION || version > MAX_TABLE_VERSION)
+ /*
+ * The on-disk version consists of two version numbers: the
+ * create_version (low 4 bits) is the CURRENT_TABLE_VERSION version
+ * number of the library that created the table, and compat_version
+ * (high 4 bits) tells us the lowest version of the library that can
+ * still read this table.
+ */
+ create_version = version & 0xf;
+ compat_version = version >> 4;
+ INFO_LOG("create_version: %u, compat_version: %u\n", create_version,
+ compat_version);
+ if (create_version < MIN_TABLE_VERSION /* table too old */
+ || compat_version > CURRENT_TABLE_VERSION) /* libosl too old */
return -E_OSL_VERSION_MISMATCH;
desc->flags = read_u8(buf + IDX_TABLE_FLAGS);
desc->num_columns = read_u16(buf + IDX_NUM_COLUMNS);
desc->column_descriptions = calloc(desc->num_columns,
sizeof(struct osl_column_description));
if (!desc->column_descriptions)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
offset = IDX_COLUMN_DESCRIPTIONS;
FOR_EACH_COLUMN(i, desc, cd) {
char *null_byte;
ret = -E_OSL_INDEX_CORRUPTION;
if (!null_byte)
goto err;
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
cd->name = strdup(buf + offset + IDX_CD_NAME);
if (!cd->name)
goto err;
struct osl_column_description *cd;
unsigned diff = t->desc->num_columns - desc.num_columns;
INFO_LOG("extending table by %u volatile columns\n", diff);
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
desc.column_descriptions = realloc(desc.column_descriptions,
t->desc->num_columns * sizeof(struct osl_column_description));
if (!desc.column_descriptions)
t->desc->name);
buf = calloc(1, size);
if (!buf)
- return -ERRNO_TO_ERROR(ENOMEM);
- sprintf(buf + IDX_PARA_MAGIC, "%s", PARA_MAGIC);
+ return -E_OSL_NOMEM;
+ sprintf(buf + IDX_OSL_MAGIC, "%s", OSL_MAGIC);
write_u8(buf + IDX_TABLE_FLAGS, t->desc->flags);
write_u8(buf + IDX_DIRTY_FLAG, 0);
- write_u8(buf + IDX_VERSION, CURRENT_TABLE_VERSION);
+ write_u8(buf + IDX_VERSION, CURRENT_TABLE_VERSION
+ + (COMPAT_TABLE_VERSION << 4));
write_u16(buf + IDX_NUM_COLUMNS, t->num_mapped_columns + t->num_disk_storage_columns);
write_u16(buf + IDX_HEADER_SIZE, t->index_header_size);
offset = IDX_COLUMN_DESCRIPTIONS;
strcpy(buf + offset + IDX_CD_NAME, cd->name);
offset += index_column_description_size(cd->name);
}
- assert(offset = size);
+ assert(offset == size);
filename = index_filename(t->desc);
if (filename)
ret = write_file(filename, buf, size);
else
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
free(buf);
free(filename);
return ret;
continue;
if (!table_dir) {
ret = osl_mkdir(desc->dir, 0777);
- if (ret < 0 && !is_errno(-ret, EEXIST))
+ if (ret < 0 && ret != -E_OSL_DIR_EXISTS)
goto out;
table_dir = make_message("%s/%s", desc->dir,
desc->name);
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
if (!table_dir)
goto out;
ret = osl_mkdir(table_dir, 0777);
if (ret < 0)
goto out;
}
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
filename = column_filename(t, i);
if (!filename)
goto out;
int ret;
if (!map.data)
return;
- ret = para_munmap(map.data, map.size);
+ ret = osl_munmap(map.data, map.size);
assert(ret > 0);
map.data = NULL;
}
*
* \return Positive on success, negative on errors.
*
- * \sa map_table(), enum osl_close_flags, para_munmap().
+ * \sa map_table(), enum osl_close_flags, osl_munmap().
*/
int unmap_table(struct osl_table *t, enum osl_close_flags flags)
{
return -E_OSL_NOT_MAPPED;
if (flags & OSL_MARK_CLEAN)
mark_table_clean(t);
- ret = para_munmap(t->index_map.data, t->index_map.size);
+ ret = osl_munmap(t->index_map.data, t->index_map.size);
if (ret < 0)
return ret;
t->index_map.data = NULL;
{
struct stat statbuf;
char *filename = column_filename(t, col_num);
- int ret = -E_OSL_STAT;
+ int ret;
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
- if (stat(filename, &statbuf) < 0) {
+ return -E_OSL_NOMEM;
+ ret = osl_stat(filename, &statbuf);
+ if (ret < 0) {
free(filename);
return ret;
}
return -E_OSL_ALREADY_MAPPED;
filename = index_filename(t->desc);
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
INFO_LOG("mapping table '%s' (index: %s)\n", t->desc->name, filename);
ret = mmap_full_file(filename, flags & MAP_TBL_FL_MAP_RDONLY?
O_RDONLY : O_RDWR, &t->index_map.data, &t->index_map.size, NULL);
err: /* unmap what is already mapped */
for (i--; i >= 0; i--) {
struct osl_object map = t->columns[i].data_map;
- para_munmap(map.data, map.size);
+ osl_munmap(map.data, map.size);
map.data = NULL;
}
- para_munmap(t->index_map.data, t->index_map.size);
+ osl_munmap(t->index_map.data, t->index_map.size);
t->index_map.data = NULL;
return ret;
}
{
struct osl_column *col = &t->columns[col_num];
uint32_t offset;
- char *header;
char *cell_index;
int ret;
if (ret < 0)
return ret;
offset = read_u32(cell_index);
- obj->size = read_u32(cell_index + 4) - 1;
- header = col->data_map.data + offset;
- obj->data = header + 1;
- if (read_u8(header) == 0xff) {
- ERROR_LOG("col %u, size %zu, offset %u\n", col_num,
- obj->size, offset);
- return -E_OSL_INVALID_OBJECT;
- }
+ obj->size = read_u32(cell_index + 4);
+ obj->data = col->data_map.data + offset;
return 1;
}
+/*
+ * It's OK to call this with result = rb_node = NULL. If result is not NULL,
+ * and rb key was not found, result points to the parent node.
+ */
static int search_rbtree(const struct osl_object *obj,
const struct osl_table *t, unsigned col_num,
struct rb_node **result, struct rb_node ***rb_link)
const struct osl_column_description *cd;
if (!row)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
row->num = row_num;
row->volatile_objects = volatile_objs;
FOR_EACH_RBTREE_COLUMN(i, t, cd) {
/* add valid rows to rbtrees */
t->num_invalid_rows = 0;
for (i = 0; i < t->num_rows; i++) {
+ struct osl_object *volatile_objs;
ret = row_is_invalid(t, i);
if (ret < 0)
return ret;
t->num_invalid_rows++;
continue;
}
- ret = add_row_to_rbtrees(t, i, NULL, NULL);
+ if (t->num_volatile_columns > 0) {
+ volatile_objs = calloc(t->num_volatile_columns,
+ sizeof(struct osl_object));
+ if (!volatile_objs)
+ return -E_OSL_NOMEM;
+ } else
+ volatile_objs = NULL;
+ ret = add_row_to_rbtrees(t, i, volatile_objs, NULL);
if (ret < 0)
return ret;
}
struct stat statbuf;
char *dirname = column_filename(t, i);
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
if (!dirname)
goto err;
/* check if directory exists */
- ret = stat(dirname, &statbuf);
+ ret = osl_stat(dirname, &statbuf);
free(dirname);
- if (ret < 0) {
- ret = -ERRNO_TO_ERROR(errno);
+ if (ret < 0)
goto err;
- }
- ret = -ERRNO_TO_ERROR(ENOTDIR);
+ ret = -E_OSL_NOTDIR;
if (!S_ISDIR(statbuf.st_mode))
goto err;
}
return 1;
dirname = disk_storage_dirname(t, col_num, ds_name);
if (!dirname)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
ret = osl_mkdir(dirname, 0777);
free(dirname);
- if (ret < 0 && !is_errno(-ret, EEXIST))
+ if (ret < 0 && ret != -E_OSL_DIR_EXISTS)
return ret;
return 1;
}
return ret;
filename = disk_storage_path(t, col_num, ds_name);
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
ret = write_file(filename, obj->data, obj->size);
free(filename);
return ret;
{
char *filename = column_filename(t, col_num);
int ret;
- char header = 0; /* zero means valid object */
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
- ret = append_file(filename, &header, 1, obj->data, obj->size,
- new_size);
+ return -E_OSL_NOMEM;
+ ret = append_file(filename, obj->data, obj->size, new_size);
free(filename);
return ret;
}
return 1;
filename = index_filename(t->desc);
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
- ret = append_file(filename, NULL, 0, row_index,
- t->row_index_size, NULL);
+ return -E_OSL_NOMEM;
+ ret = append_file(filename, row_index, t->row_index_size, NULL);
free(filename);
return ret;
}
-/**
- * A wrapper for truncate(2)
- *
- * \param path Name of the regular file to truncate
- * \param size Number of bytes to \b shave \b off
- *
- * Truncate the regular file named by \a path by \a size bytes.
- *
- * \return Standard.
- *
- * \sa truncate(2)
- */
-int para_truncate(const char *path, off_t size)
-{
- int ret;
- struct stat statbuf;
-
- ret = -E_OSL_STAT;
- if (stat(path, &statbuf) < 0)
- goto out;
- ret = -E_OSL_BAD_SIZE;
- if (statbuf.st_size < size)
- goto out;
- ret = -E_OSL_TRUNC;
- if (truncate(path, statbuf.st_size - size) < 0)
- goto out;
- ret = 1;
-out:
- return ret;
-}
-
static int truncate_mapped_file(const struct osl_table *t, unsigned col_num,
off_t size)
{
char *filename = column_filename(t, col_num);
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
- ret = para_truncate(filename, size);
+ return -E_OSL_NOMEM;
+ ret = truncate_file(filename, size);
free(filename);
return ret;
}
const char *ds_name)
{
char *dirname, *filename = disk_storage_path(t, col_num, ds_name);
- int ret, err;
+ int ret = 1;
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
- ret = unlink(filename);
- err = errno;
+ return -E_OSL_NOMEM;
+ if (unlink(filename) < 0)
+ ret = errno == ENOENT? -E_OSL_NOENT : -E_OSL_UNLINK;
free(filename);
if (ret < 0)
- return -ERRNO_TO_ERROR(err);
+ return ret;
if (!(t->desc->flags & OSL_LARGE_TABLE))
return 1;
dirname = disk_storage_dirname(t, col_num, ds_name);
if (!dirname)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
rmdir(dirname);
free(dirname);
return 1;
return -E_OSL_BAD_TABLE;
rb_parents = malloc(t->num_rbtrees * sizeof(struct rn_node*));
if (!rb_parents)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
rb_links = malloc(t->num_rbtrees * sizeof(struct rn_node**));
if (!rb_links) {
free(rb_parents);
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
}
if (t->num_mapped_columns) {
new_row_index = malloc(t->row_index_size);
if (!new_row_index) {
free(rb_links);
free(rb_parents);
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
}
}
/* pass 1: sanity checks */
if (t->num_disk_storage_columns) {
ds_name = disk_storage_name_of_object(t,
&objects[t->disk_storage_name_column]);
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
if (!ds_name)
goto out;
}
if (ret < 0) { /* truncate index and rollback changes */
char *filename = index_filename(t->desc);
if (filename)
- para_truncate(filename, t->row_index_size);
+ truncate_file(filename, t->row_index_size);
free(filename);
goto rollback;
}
/* pass 3: add entry to rbtrees */
if (t->num_volatile_columns) {
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
volatile_objs = calloc(t->num_volatile_columns,
sizeof(struct osl_object));
if (!volatile_objs)
return 1;
}
-static int mark_mapped_object_invalid(const struct osl_table *t,
- uint32_t row_num, unsigned col_num)
-{
- struct osl_object obj;
- char *p;
- int ret = get_mapped_object(t, col_num, row_num, &obj);
-
- if (ret < 0)
- return ret;
- p = obj.data;
- p--;
- *p = 0xff;
- return 1;
-}
-
__export int osl_del_row(struct osl_table *t, struct osl_row *row)
{
struct osl_row *r = row;
struct osl_column *col = t->columns + i;
enum osl_storage_type st = cd->storage_type;
remove_rb_node(t, i, r);
- if (st == OSL_MAPPED_STORAGE) {
- mark_mapped_object_invalid(t, r->num, i);
+ if (st == OSL_MAPPED_STORAGE)
continue;
- }
if (st == OSL_NO_STORAGE && !(cd->storage_flags & OSL_DONT_FREE))
free(r->volatile_objects[col->volatile_num].data);
}
return 1; /* object did not change */
old_ds_name = disk_storage_name_of_object(t, old_obj);
new_ds_name = disk_storage_name_of_object(t, new_obj);
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
if (!old_ds_name || ! new_ds_name)
goto out;
old_filename = disk_storage_path(t, i, old_ds_name);
new_filename = disk_storage_path(t, i, new_ds_name);
if (!old_filename || !new_filename)
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
else
- ret = para_rename(old_filename, new_filename);
+ ret = osl_rename(old_filename, new_filename);
free(old_filename);
free(new_filename);
if (ret < 0)
}
remove_rb_node(t, col_num, r);
if (cd->storage_type == OSL_NO_STORAGE) { /* TODO: If fixed size, reuse object? */
- free(r->volatile_objects[col->volatile_num].data);
+ if (!(cd->storage_flags & OSL_DONT_FREE))
+ free(r->volatile_objects[col->volatile_num].data);
r->volatile_objects[col->volatile_num] = *obj;
} else if (cd->storage_type == OSL_DISK_STORAGE) {
char *ds_name;
if (ret < 0)
return ret;
ret = delete_disk_storage_file(t, col_num, ds_name);
- if (ret < 0 && !is_errno(-ret, ENOENT)) {
+ if (ret < 0 && ret != -E_OSL_NOENT) {
free(ds_name);
return ret;
}
uint32_t new_data_map_size;
char *row_index;
ret = get_row_index(t, r->num, &row_index);
- if (ret < 0)
- return ret;
- ret = mark_mapped_object_invalid(t, r->num, col_num);
if (ret < 0)
return ret;
unmap_column(t, col_num);
filename = disk_storage_path(t, col_num, ds_name);
free(ds_name);
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
DEBUG_LOG("filename: %s\n", filename);
ret = mmap_full_file(filename, O_RDONLY, &obj->data, &obj->size, NULL);
free(filename);
__export int osl_close_disk_object(struct osl_object *obj)
{
- return para_munmap(obj->data, obj->size);
+ return osl_munmap(obj->data, obj->size);
}
__export int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)
unsigned num_rows;
int ret;
+ *result = NULL;
if (n == 0)
return -E_OSL_RB_KEY_NOT_FOUND;
ret = osl_get_num_rows(t, &num_rows);