/*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "log.h"
#include "osl.h"
-#include "error.h"
#include "util.h"
#include "osl_core.h"
__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];
}
__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);
}
*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)
{
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;
* \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;
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 (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
+ return -E_OSL_NOMEM;
ret = osl_stat(filename, &statbuf);
if (ret < 0) {
free(filename);
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);
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;
int ret;
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
+ 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);
+ return -E_OSL_NOMEM;
ret = append_file(filename, row_index, t->row_index_size, NULL);
free(filename);
return ret;
char *filename = column_filename(t, col_num);
if (!filename)
- return -ERRNO_TO_ERROR(ENOMEM);
+ 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;
}
}
/* 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; /* 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);
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;
}
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);
projects / osl.git / blobdiff