/*
- * 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.
*/
/** \file osl_core.h Object storage layer details, not visible to users. */
#include "rbtree.h"
-#include "osl.h"
-#include "string.h"
#include "hash.h"
-static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...);
+__must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...);
/** Internal representation of a column of an osl table. */
struct osl_column {
int row_is_invalid(struct osl_table *t, uint32_t row_num);
int get_mapped_object(const struct osl_table *t, unsigned col_num,
uint32_t row_num, struct osl_object *obj);
-int para_truncate(const char *filename, off_t size);
int unmap_table(struct osl_table *t, enum osl_close_flags flags);
int init_rbtrees(struct osl_table *t);
*/
enum index_header_offsets {
/** Bytes 0-8: PARASLASH. */
- IDX_PARA_MAGIC = 0,
+ IDX_OSL_MAGIC = 0,
/** Byte 9: Dirty flag (nonzero if table is mapped). */
IDX_DIRTY_FLAG = 9,
/** Byte 10: osl table version number. */
};
/** Magic string contained in the header of the index file of each osl table. */
-#define PARA_MAGIC "PARASLASH"
+#define OSL_MAGIC "PARASLASH"
/**
* The minimal number of bytes for a column in the index header.
return MIN_IDX_COLUMN_DESCRIPTION_SIZE + strlen(name) - 1;
}
+/*
+ * The version used by this instance of the library. Written to the index of
+ * newly created tables.
+ */
#define CURRENT_TABLE_VERSION 1
+
+/*
+ * The lowest library version that is able to use tables of version
+ * CURRENT_TABLE_VERSION. Also written to the index of new tables. If
+ * compat_version(table) > current_version(lib) the table can not be opened.
+ */
+#define COMPAT_TABLE_VERSION 0
+
+/*
+ * The lowest table version this library understands. On open, if
+ * current_version(table) < min_version(lib) the osl_open_table() call
+ * fails.
+ */
#define MIN_TABLE_VERSION 1
-#define MAX_TABLE_VERSION 1
+
+
/** An index header must be at least that many bytes long. */
#define MIN_INDEX_HEADER_SIZE(num_cols) (MIN_IDX_COLUMN_DESCRIPTION_SIZE \
* num_cols + IDX_COLUMN_DESCRIPTIONS)
index_offset = t->index_header_size + t->row_index_size * row_num;
if (index_offset + 8 > t->index_map.size) {
*row_index = NULL;
- return -E_INDEX_CORRUPTION;
+ return -E_OSL_INDEX_CORRUPTION;
}
*row_index = (char *)(t->index_map.data) + index_offset;
return 1;
_static_inline_ void update_cell_index(char *row_index, struct osl_column *col,
uint32_t map_size, uint32_t object_size)
{
- write_u32(row_index + col->index_offset, map_size - object_size - 1);
- write_u32(row_index + col->index_offset + 4, object_size + 1);
+ write_u32(row_index + col->index_offset, map_size - object_size);
+ write_u32(row_index + col->index_offset + 4, object_size);
}
/**
_static_inline_ char *disk_storage_path(const struct osl_table *t,
unsigned col_num, const char *ds_name)
{
- char *dirname = column_filename(t, col_num);
- char *filename = make_message("%s/%s", dirname, ds_name);
+ char *filename, *dirname = column_filename(t, col_num);
+
+ if (!dirname)
+ return NULL;
+ filename = make_message("%s/%s", dirname, ds_name);
free(dirname);
return filename;
}
*
* \param num_rbtrees The number of rbtrees for this row.
*
- * \return A pointer to a zeroed-out area suitable for holding an osl row
- * with \a num_rbtrees rbtree columns.
+ * \return A pointer to a zeroed-out area suitable for holding an osl row with
+ * \a num_rbtrees rbtree columns or \p NULL if no memory could be allocated.
*/
_static_inline_ struct osl_row *allocate_row(unsigned num_rbtrees)
{
size_t s = RB_NODES_OFFSET + num_rbtrees * sizeof(struct rb_node);
- return para_calloc(s);
+ return calloc(1, s);
}
/**
hash_to_asc(hash, asc);
if (t->desc->flags & OSL_LARGE_TABLE)
return make_message("%.2s/%s", asc, asc + 2);
- return para_strdup(asc);
-}
-
-/**
- * A wrapper for rename(2).
- *
- * \param old_path The source path.
- * \param new_path The destination path.
- *
- * \return Standard.
- *
- * \sa rename(2).
- */
-_static_inline_ int para_rename(const char *old_path, const char *new_path)
-{
- if (rename(old_path, new_path) < 0)
- return -ERRNO_TO_ERROR(errno);
- return 1;
+ return strdup(asc);
}
/**