/*
- * 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 "log.h"
#include "osl.h"
-#include "error.h"
#include "util.h"
#include "osl_core.h"
-/* Taken from Drepper: How to write shared libraries, Appendix B. */
+/*
+ * Taken from Drepper: How to write shared libraries, Appendix B.
+ *
+ * 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.
+ */
#include <stddef.h>
#define MSGSTRFIELD(line) MSGSTRFIELD1(line)
#define MSGSTRFIELD1(line) str##line
__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);
}
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);
buf = calloc(1, size);
if (!buf)
return -E_OSL_NOMEM;
- sprintf(buf + IDX_PARA_MAGIC, "%s", PARA_MAGIC);
+ 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);
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);
int row_is_invalid(struct osl_table *t, uint32_t row_num)
{
char *row_index;
- int i, ret = get_row_index(t, row_num, &row_index);
+ int ret = get_row_index(t, row_num, &row_index);
+ unsigned n;
if (ret < 0)
return ret;
- for (i = 0; i < t->row_index_size; i++) {
- if ((unsigned char)row_index[i] != 0xff)
+ for (n = 0; n < t->row_index_size; n++) {
+ if ((unsigned char)row_index[n] != 0xff)
return 0;
}
INFO_LOG("row %d is invalid\n", row_num);
*/
int init_rbtrees(struct osl_table *t)
{
- int i, ret;
+ int ret;
+ unsigned n;
const struct osl_column_description *cd;
/* create rbtrees */
- FOR_EACH_RBTREE_COLUMN(i, t, cd)
- t->columns[i].rbtree = RB_ROOT;
+ FOR_EACH_RBTREE_COLUMN(n, t, cd)
+ t->columns[n].rbtree = RB_ROOT;
/* add valid rows to rbtrees */
t->num_invalid_rows = 0;
- for (i = 0; i < t->num_rows; i++) {
- ret = row_is_invalid(t, i);
+ for (n = 0; n < t->num_rows; n++) {
+ struct osl_object *volatile_objs;
+ ret = row_is_invalid(t, n);
if (ret < 0)
return ret;
if (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, n, volatile_objs, NULL);
if (ret < 0)
return ret;
}
if (!dirname)
goto err;
/* check if directory exists */
- ret = stat(dirname, &statbuf);
+ ret = osl_stat(dirname, &statbuf);
free(dirname);
- if (ret < 0) {
- ret = -E_OSL_STAT;
+ if (ret < 0)
goto err;
- }
ret = -E_OSL_NOTDIR;
if (!S_ISDIR(statbuf.st_mode))
goto err;
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;
}
const char *ds_name)
{
char *dirname, *filename = disk_storage_path(t, col_num, ds_name);
- int ret, err;
+ int ret = 1;
if (!filename)
return -E_OSL_NOMEM;
- ret = unlink(filename);
- err = errno;
+ if (unlink(filename) < 0)
+ ret = errno == ENOENT? -E_OSL_NOENT : -E_OSL_UNLINK;
free(filename);
if (ret < 0)
- return -E_OSL_UNLINK;
+ return ret;
if (!(t->desc->flags & OSL_LARGE_TABLE))
return 1;
dirname = disk_storage_dirname(t, col_num, ds_name);
}
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;
}
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);
projects / osl.git / blobdiff