X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl.c;h=6294fbbe3f8900f3bf9830a30ccb8bfed150383a;hp=19d7961ecc261dfe497e2a81361ae24ba53eb529;hb=51cab2aba416fc1d57336f4e72da6b76ec60174c;hpb=c458b9d45e7c6ddda6285fca3797fddff815bd0a

diff --git a/osl.c b/osl.c
index 19d7961e..6294fbbe 100644
--- a/osl.c
+++ b/osl.c
@@ -156,54 +156,6 @@ out:
 	return ret;
 }
 
-/**
- * Map a file into memory.
- *
- * \param path Name of the regular file to map.
- * \param open_mode Either \p O_RDONLY or \p O_RDWR.
- * \param obj On success, the mapping is returned here.
- *
- * \return Positive on success, negative on errors. Possible errors include: \p
- * E_FSTAT, any errors returned by para_open(), \p E_EMPTY, \p E_MMAP.
- *
- * \sa para_open(), mmap(2).
- */
-int mmap_full_file(const char *path, int open_mode, struct osl_object *obj)
-{
-	int fd, ret, mmap_prot, mmap_flags;
-	struct stat file_status;
-
-	if (open_mode == O_RDONLY) {
-		mmap_prot = PROT_READ;
-		mmap_flags = MAP_PRIVATE;
-	} else {
-		mmap_prot = PROT_READ | PROT_WRITE;
-		mmap_flags = MAP_SHARED;
-	}
-	ret = para_open(path, open_mode, 0);
-	if (ret < 0)
-		return ret;
-	fd = ret;
-	ret = -E_FSTAT;
-	if (fstat(fd, &file_status) < 0)
-		goto out;
-	obj->size = file_status.st_size;
-	ret = -E_EMPTY;
-	PARA_DEBUG_LOG("%s: size %zu\n", path, obj->size);
-	if (!obj->size)
-		goto out;
-	obj->data = mmap(NULL, obj->size, mmap_prot, mmap_flags, fd, 0);
-	if (obj->data == MAP_FAILED) {
-		obj->data = NULL;
-		ret = -E_MMAP;
-		goto out;
-	}
-	ret = 1;
-out:
-	close(fd);
-	return ret;
-}
-
 /**
  * Traverse the given directory recursively.
  *
@@ -366,7 +318,7 @@ static int init_column_descriptions(struct osl_table *t)
 	if (ret < 0)
 		goto err;
 	ret = -E_BAD_DB_DIR;
-	if (!t->desc->dir)
+	if (!t->desc->dir && (t->num_disk_storage_columns || t->num_mapped_columns))
 		goto err;
 	/* the size of the index header without column descriptions */
 	t->index_header_size = IDX_COLUMN_DESCRIPTIONS;
@@ -659,10 +611,7 @@ static int create_table_index(struct osl_table *t)
  *
  * \param desc Pointer to the table description.
  *
- * \return Positive on success, negative on errors. Possible errors include: \p
- * E_BAD_TABLE_DESC, \p E_BAD_DB_DIR, \p E_BAD_NAME, \p E_NO_COMPARE_FUNC, \p
- * E_NO_COLUMN_NAME, \p E_DUPLICATE_COL_NAME, \p E_MKDIR, any errors returned
- * by para_open().
+ * \return Standard.
  */
 int osl_create_table(const struct osl_table_description *desc)
 {
@@ -795,7 +744,9 @@ static int map_column(struct osl_table *t, unsigned col_num)
 		return ret;
 	}
 	ret = mmap_full_file(filename, O_RDWR,
-		&t->columns[col_num].data_map);
+		&t->columns[col_num].data_map.data,
+		&t->columns[col_num].data_map.size,
+		NULL);
 	free(filename);
 	return ret;
 }
@@ -824,7 +775,7 @@ int map_table(struct osl_table *t, enum map_table_flags flags)
 	filename = index_filename(t->desc);
 	PARA_DEBUG_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);
+		O_RDONLY : O_RDWR, &t->index_map.data, &t->index_map.size, NULL);
 	free(filename);
 	if (ret < 0)
 		return ret;
@@ -1203,10 +1154,7 @@ int init_rbtrees(struct osl_table *t)
  * The table description given by \a desc should coincide with the
  * description used at creation time.
  *
- * \return Positive on success, negative on errors. Possible errors include:
- * errors returned by init_table_structure(), \p E_NOENT, \p E_STAT, \p \p
- * E_NOTDIR, \p E_BAD_TABLE_DESC, \p E_BAD_DB_DIR, \p E_NO_COMPARE_FUNC, \p
- * E_NO_COLUMN_NAME, errors returned by init_rbtrees().
+ * \return Standard.
  */
 int osl_open_table(const struct osl_table_description *table_desc,
 		struct osl_table **result)
@@ -1836,9 +1784,7 @@ out:
  * mapped columns of constant size (which may be updated directly if \p
  * OSL_RBTREE is not set).  Otherwise the rbtree might become corrupted.
  *
- * \return Positive on success, negative on errors. Possible errors include: \p
- * E_BAD_TABLE, \p E_RB_KEY_EXISTS, \p E_BAD_SIZE, \p E_NOENT, \p E_UNLINK,
- * errors returned by para_write_file(), \p E_MKDIR.
+ * \return Standard
  */
 int osl_update_object(struct osl_table *t, const struct osl_row *r,
 		unsigned col_num, struct osl_object *obj)
@@ -1960,7 +1906,7 @@ int osl_open_disk_object(const struct osl_table *t, const struct osl_row *r,
 	filename = disk_storage_path(t, col_num, ds_name);
 	free(ds_name);
 	PARA_DEBUG_LOG("filename: %s\n", filename);
-	ret = mmap_full_file(filename, O_RDONLY, obj);
+	ret = mmap_full_file(filename, O_RDONLY, &obj->data, &obj->size, NULL);
 	free(filename);
 	return ret;
 }
@@ -2007,7 +1953,7 @@ int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)
  * \param rank Result pointer.
  *
  * The rank is, by definition, the position of the row in the linear order
- * determined by an inorder tree walk of the rbtree associated with column
+ * determined by an in-order tree walk of the rbtree associated with column
  * number \a col_num of \a table.
  *
  * \return Positive on success, negative on errors.