X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osl.c;h=b9c23393dddf8d68bbd447d692f5cfbdb3ef8ebc;hb=8d549f29ee743cff2deaab5112dde797476f441f;hp=0a2863dd2a7e3d48463448bca426693b391d6629;hpb=188bc1b06879b7fcd56c599e20db0ac87a0da4e3;p=osl.git

diff --git a/osl.c b/osl.c
index 0a2863d..b9c2339 100644
--- a/osl.c
+++ b/osl.c
@@ -13,7 +13,14 @@
 #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
@@ -198,7 +205,6 @@ static int init_column_descriptions(struct osl_table *t)
 	/* the size of the index header without column descriptions */
 	t->index_header_size = IDX_COLUMN_DESCRIPTIONS;
 	FOR_EACH_COLUMN(i, t->desc, cd) {
-		struct osl_column *col = t->columns + i;
 		if (cd->storage_flags & OSL_RBTREE) {
 			if (!cd->compare_function)
 				return -E_OSL_NO_COMPARE_FUNC;
@@ -212,7 +218,6 @@ static int init_column_descriptions(struct osl_table *t)
 		if (ret < 0)
 			goto err;
 		t->index_header_size += index_column_description_size(cd->name);
-		column_name_hash(cd->name, col->name_hash);
 		ret = -E_OSL_DUPLICATE_COL_NAME;
 		for (j = i + 1; j < t->desc->num_columns; j++) {
 			const char *name2 = get_column_description(t->desc,
@@ -277,6 +282,9 @@ int init_table_structure(const struct osl_table_description *desc,
 		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;
@@ -339,7 +347,7 @@ err:
 int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 {
 	char *buf = map->data;
-	uint8_t version, compat_version, create_version;
+	uint8_t table_version;
 	uint16_t header_size;
 	int ret, i;
 	unsigned offset;
@@ -349,20 +357,11 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 		return -E_OSL_SHORT_TABLE;
 	if (strncmp(buf + IDX_OSL_MAGIC, OSL_MAGIC, strlen(OSL_MAGIC)))
 		return -E_OSL_NO_MAGIC;
-	version = read_u8(buf + IDX_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 */
+	table_version = read_u8(buf + IDX_VERSION);
+	INFO_LOG("osl versions (table/min/current): %u/%u/%u\n",
+		table_version, MIN_TABLE_VERSION, CURRENT_TABLE_VERSION);
+	if (table_version < MIN_TABLE_VERSION /* table too old */
+		|| table_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);
@@ -497,8 +496,7 @@ static int create_table_index(struct osl_table *t)
 	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
-		+ (COMPAT_TABLE_VERSION << 4));
+	write_u8(buf + IDX_VERSION, CURRENT_TABLE_VERSION);
 	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;
@@ -516,7 +514,7 @@ static int create_table_index(struct osl_table *t)
 		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);
@@ -553,6 +551,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
 			if (ret < 0)
 				goto out;
 		}
+		column_name_hash(cd->name, t->columns[i].name_hash);
 		ret = -E_OSL_NOMEM;
 		filename = column_filename(t, i);
 		if (!filename)
@@ -719,13 +718,16 @@ int map_table(struct osl_table *t, enum map_table_flags flags)
 	}
 	mark_table_dirty(t);
 	num_rows = table_num_rows(t);
-	if (!num_rows)
-		return num_rows;
 	/* map data files */
-	FOR_EACH_MAPPED_COLUMN(i, t, cd) {
-		ret = map_column(t, i);
-		if (ret < 0)
-			goto err;
+	FOR_EACH_COLUMN(i, t->desc, cd) {
+		if (cd->storage_type == OSL_NO_STORAGE)
+			continue;
+		column_name_hash(cd->name, t->columns[i].name_hash);
+		if (num_rows > 0 && cd->storage_type == OSL_MAPPED_STORAGE) {
+			ret = map_column(t, i);
+			if (ret < 0)
+				goto err;
+		}
 	}
 	return num_rows;
 err:	/* unmap what is already mapped */
@@ -1070,30 +1072,13 @@ int init_rbtrees(struct osl_table *t)
 __export int osl_open_table(const struct osl_table_description *table_desc,
 		struct osl_table **result)
 {
-	int i, ret;
+	int ret;
 	struct osl_table *t;
-	const struct osl_column_description *cd;
 
 	NOTICE_LOG("opening table %s\n", table_desc->name);
 	ret = init_table_structure(table_desc, &t);
 	if (ret < 0)
 		return ret;
-	FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
-		struct stat statbuf;
-		char *dirname = column_filename(t, i);
-
-		ret = -E_OSL_NOMEM;
-		if (!dirname)
-			goto err;
-		/* check if directory exists */
-		ret = osl_stat(dirname, &statbuf);
-		free(dirname);
-		if (ret < 0)
-			goto err;
-		ret = -E_OSL_NOTDIR;
-		if (!S_ISDIR(statbuf.st_mode))
-			goto err;
-	}
 	ret = map_table(t, MAP_TBL_FL_VERIFY_INDEX);
 	if (ret < 0)
 		goto err;
@@ -1569,7 +1554,8 @@ __export int osl_update_object(struct osl_table *t, const struct osl_row *r,
 	}
 	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;
@@ -1698,6 +1684,7 @@ __export int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
 	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);