#include "log.h"
#include "osl.h"
#include "error.h"
-#include "fd.h"
-#include "list.h"
+#include "util.h"
#include "osl_core.h"
/* Taken from Drepper: How to write shared libraries, Appendix B. */
#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)
return 1;
}
-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);
if (ret < 0)
goto out;
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;
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);
+ return -E_OSL_NOMEM;
sprintf(buf + IDX_PARA_MAGIC, "%s", PARA_MAGIC);
write_u8(buf + IDX_TABLE_FLAGS, t->desc->flags);
write_u8(buf + IDX_DIRTY_FLAG, 0);
if (filename)
ret = write_file(filename, buf, size);
else
- ret = -ERRNO_TO_ERROR(ENOMEM);
+ ret = -E_OSL_NOMEM;
free(buf);
free(filename);
return ret;
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;
{
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);
{
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) {
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);
free(dirname);
if (ret < 0) {
- ret = -ERRNO_TO_ERROR(errno);
+ ret = -E_OSL_STAT;
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))
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;
}
int ret, err;
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
ret = unlink(filename);
err = errno;
free(filename);
if (ret < 0)
- return -ERRNO_TO_ERROR(err);
+ return -E_OSL_UNLINK;
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 = osl_rename(old_filename, new_filename);
free(old_filename);
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);