X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=osl.c;h=c92412fbce765444c7a0d713cdeeffca35d824c1;hp=d41923f0f602b75c20eb7d6bcfec5b779896428d;hb=5498b872d9e28af6210b957c2336be65b1900522;hpb=57b98a922b02c22d27ab69cbdcd3e2f028f4447e

diff --git a/osl.c b/osl.c
index d41923f..c92412f 100644
--- a/osl.c
+++ b/osl.c
@@ -8,80 +8,32 @@
 #include <dirent.h> /* readdir() */
 #include <assert.h>
 
-
 #include "log.h"
 #include "osl.h"
 #include "error.h"
-#include "fd.h"
-#include "list.h"
+#include "util.h"
 #include "osl_core.h"
 
-/**
- * Allocate a sufficiently large string and print into it.
- *
- * \param fmt A usual format string.
- *
- * Produce output according to \p fmt. No artificial bound on the length of the
- * resulting string is imposed.
- *
- * \return This function either returns a pointer to a string that must be
- * freed by the caller or \p NULL if memory allocation failed.
- *
- * \sa printf(3).
- */
-static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
-{
-	int n;
-	size_t size = 100;
-	char *p = malloc(size);
-
-	if (!p)
-		return NULL;
-	while (1) {
-		char *q;
-		va_list ap;
-		/* Try to print in the allocated space. */
-		va_start(ap, fmt);
-		n = vsnprintf(p, size, fmt, ap);
-		va_end(ap);
-		/* If that worked, return the string. */
-		if (n > -1 && n < size)
-			break;
-		/* Else try again with more space. */
-		if (n > -1) /* glibc 2.1 */
-			size = n + 1; /* precisely what is needed */
-		else /* glibc 2.0 */
-			size *= 2; /* twice the old size */
-		q = realloc(p, size);
-		if (!q) {
-			free(p);
-			return NULL;
-		}
-		p = q;
-	}
-	return p;
-}
-
 /* Taken from Drepper: How to write shared libraries, Appendix B. */
 #include <stddef.h>
 #define MSGSTRFIELD(line) MSGSTRFIELD1(line)
 #define MSGSTRFIELD1(line) str##line
 static const union msgstr_t {
 	struct {
-#define _S(n, s) char MSGSTRFIELD(__LINE__)[sizeof(s)];
+#define OSL_ERROR(n, s) char MSGSTRFIELD(__LINE__)[sizeof(s)];
 #include "errtab.h"
-#undef _S
+#undef OSL_ERROR
 	};
 	char str[0];
 } msgstr = { {
-#define _S(n, s) s,
+#define OSL_ERROR(n, s) s,
 #include "errtab.h"
-#undef _S
+#undef OSL_ERROR
 } };
 static const unsigned int errmsgidx[] = {
-#define _S(n, s) [n] = offsetof(union msgstr_t, MSGSTRFIELD(__LINE__)),
+#define OSL_ERROR(n, s) [n] = offsetof(union msgstr_t, MSGSTRFIELD(__LINE__)),
 #include "errtab.h"
-#undef _S
+#undef OSL_ERROR
 };
 
 __export const char *osl_strerror(int num)
@@ -91,7 +43,7 @@ __export const char *osl_strerror(int num)
 	return msgstr.str + errmsgidx[num];
 }
 
-static int loglevel;
+int loglevel = 0;
 
 static void __attribute ((constructor)) init_loglevel(void)
 {
@@ -154,90 +106,8 @@ static int __lseek(int fd, off_t *offset, int whence)
 	return 1;
 }
 
-/**
- * Wrapper for the write system call.
- *
- * \param fd The file descriptor to write to.
- * \param buf The buffer to write.
- * \param size The length of \a buf in bytes.
- *
- * This function writes out the given buffer and retries if an interrupt
- * occurred during the write.
- *
- * \return On success, the number of bytes written is returned, otherwise, the
- * function returns \p -E_OSL_WRITE.
- *
- * \sa write(2).
- */
-static ssize_t __write(int fd, const void *buf, size_t size)
-{
-	ssize_t ret;
-
-	for (;;) {
-		ret = write(fd, buf, size);
-		if ((ret < 0) && (errno == EAGAIN || errno == EINTR))
-			continue;
-		return ret >= 0? ret : -E_OSL_WRITE;
-	}
-}
-
-/**
- * Write the whole buffer to a file descriptor.
- *
- * \param fd The file descriptor to write to.
- * \param buf The buffer to write.
- * \param size The length of \a buf in bytes.
- *
- * This function writes the given buffer and continues on short writes and
- * when interrupted by a signal.
- *
- * \return Positive on success, negative on errors. Possible errors: any
- * errors returned by para_write().
- *
- * \sa para_write().
- */
-static ssize_t write_all(int fd, const void *buf, size_t size)
-{
-//	DEBUG_LOG("writing %zu bytes\n", size);
-	const char *b = buf;
-	while (size) {
-		ssize_t ret = __write(fd, b, size);
-//		DEBUG_LOG("ret: %zd\n", ret);
-		if (ret < 0)
-			return ret;
-		b += ret;
-		size -= ret;
-	}
-	return 1;
-}
-/**
- * Open a file, write the given buffer and close the file.
- *
- * \param filename Full path to the file to open.
- * \param buf The buffer to write to the file.
- * \param size The size of \a buf.
- *
- * \return Standard.
- */
-static int write_file(const char *filename, const void *buf, size_t size)
-{
-	int ret, fd;
-
-	ret = osl_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
-	if (ret < 0)
-		return ret;
-	fd = ret;
-	ret = write_all(fd, buf, size);
-	if (ret < 0)
-		goto out;
-	ret = 1;
-out:
-	close(fd);
-	return ret;
-}
-
-static int append_file(const char *filename, char *header, size_t header_size,
-	char *data, size_t data_size, uint32_t *new_pos)
+static int append_file(const char *filename, char *data, size_t data_size,
+		uint32_t *new_pos)
 {
 	int ret, fd;
 
@@ -246,12 +116,7 @@ static int append_file(const char *filename, char *header, size_t header_size,
 	if (ret < 0)
 		return ret;
 	fd = ret;
-	if (header && header_size) {
-		ret = write_all(fd, header, header_size);
-		if (ret < 0)
-			goto out;
-	}
-	ret = write_all(fd, data, data_size);
+	ret = write_all(fd, data, &data_size);
 	if (ret < 0)
 		goto out;
 	if (new_pos) {
@@ -674,7 +539,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
 		if (cd->storage_type == OSL_NO_STORAGE)
 			continue;
 		if (!table_dir) {
-			ret = para_mkdir(desc->dir, 0777);
+			ret = osl_mkdir(desc->dir, 0777);
 			if (ret < 0 && !is_errno(-ret, EEXIST))
 				goto out;
 			table_dir = make_message("%s/%s", desc->dir,
@@ -682,7 +547,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
 			ret = -ERRNO_TO_ERROR(ENOMEM);
 			if (!table_dir)
 				goto out;
-			ret = para_mkdir(table_dir, 0777);
+			ret = osl_mkdir(table_dir, 0777);
 			if (ret < 0)
 				goto out;
 		}
@@ -701,7 +566,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
 			continue;
 		}
 		/* DISK STORAGE */
-		ret = para_mkdir(filename, 0777);
+		ret = osl_mkdir(filename, 0777);
 		free(filename);
 		if (ret < 0)
 			goto out;
@@ -744,7 +609,7 @@ static void unmap_column(struct osl_table *t, unsigned col_num)
 	int ret;
 	if (!map.data)
 		return;
-	ret = para_munmap(map.data, map.size);
+	ret = osl_munmap(map.data, map.size);
 	assert(ret > 0);
 	map.data = NULL;
 }
@@ -757,7 +622,7 @@ static void unmap_column(struct osl_table *t, unsigned col_num)
  *
  * \return Positive on success, negative on errors.
  *
- * \sa map_table(), enum osl_close_flags, para_munmap().
+ * \sa map_table(), enum osl_close_flags, osl_munmap().
  */
 int unmap_table(struct osl_table *t, enum osl_close_flags flags)
 {
@@ -772,7 +637,7 @@ int unmap_table(struct osl_table *t, enum osl_close_flags flags)
 		return -E_OSL_NOT_MAPPED;
 	if (flags & OSL_MARK_CLEAN)
 		mark_table_clean(t);
-	ret = para_munmap(t->index_map.data, t->index_map.size);
+	ret = osl_munmap(t->index_map.data, t->index_map.size);
 	if (ret < 0)
 		return ret;
 	t->index_map.data = NULL;
@@ -787,11 +652,12 @@ static int map_column(struct osl_table *t, unsigned col_num)
 {
 	struct stat statbuf;
 	char *filename = column_filename(t, col_num);
-	int ret = -E_OSL_STAT;
+	int ret;
 
 	if (!filename)
 		return -ERRNO_TO_ERROR(ENOMEM);
-	if (stat(filename, &statbuf) < 0) {
+	ret = osl_stat(filename, &statbuf);
+	if (ret < 0) {
 		free(filename);
 		return ret;
 	}
@@ -863,10 +729,10 @@ int map_table(struct osl_table *t, enum map_table_flags flags)
 err:	/* unmap what is already mapped */
 	for (i--; i >= 0; i--) {
 		struct osl_object map = t->columns[i].data_map;
-		para_munmap(map.data, map.size);
+		osl_munmap(map.data, map.size);
 		map.data = NULL;
 	}
-	para_munmap(t->index_map.data, t->index_map.size);
+	osl_munmap(t->index_map.data, t->index_map.size);
 	t->index_map.data = NULL;
 	return ret;
 }
@@ -891,7 +757,6 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
 {
 	struct osl_column *col = &t->columns[col_num];
 	uint32_t offset;
-	char *header;
 	char *cell_index;
 	int ret;
 
@@ -901,17 +766,15 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
 	if (ret < 0)
 		return ret;
 	offset = read_u32(cell_index);
-	obj->size = read_u32(cell_index + 4) - 1;
-	header = col->data_map.data + offset;
-	obj->data = header + 1;
-	if (read_u8(header) == 0xff) {
-		ERROR_LOG("col %u, size %zu, offset %u\n", col_num,
-			obj->size, offset);
-		return -E_OSL_INVALID_OBJECT;
-	}
+	obj->size = read_u32(cell_index + 4);
+	obj->data = col->data_map.data + offset;
 	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)
@@ -1252,7 +1115,7 @@ static int create_disk_storage_object_dir(const struct osl_table *t,
 	dirname = disk_storage_dirname(t, col_num, ds_name);
 	if (!dirname)
 		return -ERRNO_TO_ERROR(ENOMEM);
-	ret = para_mkdir(dirname, 0777);
+	ret = osl_mkdir(dirname, 0777);
 	free(dirname);
 	if (ret < 0 && !is_errno(-ret, EEXIST))
 		return ret;
@@ -1281,12 +1144,10 @@ static int append_map_file(const struct osl_table *t, unsigned col_num,
 {
 	char *filename = column_filename(t, col_num);
 	int ret;
-	char header = 0; /* zero means valid object */
 
 	if (!filename)
 		return -ERRNO_TO_ERROR(ENOMEM);
-	ret = append_file(filename, &header, 1, obj->data, obj->size,
-		new_size);
+	ret = append_file(filename, obj->data, obj->size, new_size);
 	free(filename);
 	return ret;
 }
@@ -1301,43 +1162,11 @@ static int append_row_index(const struct osl_table *t, char *row_index)
 	filename = index_filename(t->desc);
 	if (!filename)
 		return -ERRNO_TO_ERROR(ENOMEM);
-	ret = append_file(filename, NULL, 0, row_index,
-		t->row_index_size, NULL);
+	ret = append_file(filename, row_index, t->row_index_size, NULL);
 	free(filename);
 	return ret;
 }
 
-/**
- * A wrapper for truncate(2)
- *
- * \param path Name of the regular file to truncate
- * \param size Number of bytes to \b shave \b off
- *
- * Truncate the regular file named by \a path by \a size bytes.
- *
- * \return Standard.
- *
- * \sa truncate(2)
- */
-int para_truncate(const char *path, off_t size)
-{
-	int ret;
-	struct stat statbuf;
-
-	ret = -E_OSL_STAT;
-	if (stat(path, &statbuf) < 0)
-		goto out;
-	ret = -E_OSL_BAD_SIZE;
-	if (statbuf.st_size < size)
-		goto out;
-	ret = -E_OSL_TRUNC;
-	if (truncate(path, statbuf.st_size - size) < 0)
-		goto out;
-	ret = 1;
-out:
-	return ret;
-}
-
 static int truncate_mapped_file(const struct osl_table *t, unsigned col_num,
 		off_t size)
 {
@@ -1346,7 +1175,7 @@ static int truncate_mapped_file(const struct osl_table *t, unsigned col_num,
 
 	if (!filename)
 		return -ERRNO_TO_ERROR(ENOMEM);
-	ret = para_truncate(filename, size);
+	ret = truncate_file(filename, size);
 	free(filename);
 	return ret;
 }
@@ -1472,7 +1301,7 @@ __export int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects
 	if (ret < 0) { /* truncate index and rollback changes */
 		char *filename = index_filename(t->desc);
 		if (filename)
-			para_truncate(filename, t->row_index_size);
+			truncate_file(filename, t->row_index_size);
 		free(filename);
 		goto rollback;
 	}
@@ -1539,21 +1368,6 @@ __export int osl_get_object(const struct osl_table *t, const struct osl_row *r,
 	return 1;
 }
 
-static int mark_mapped_object_invalid(const struct osl_table *t,
-		uint32_t row_num, unsigned col_num)
-{
-	struct osl_object obj;
-	char *p;
-	int ret = get_mapped_object(t, col_num, row_num, &obj);
-
-	if (ret < 0)
-		return ret;
-	p = obj.data;
-	p--;
-	*p = 0xff;
-	return 1;
-}
-
 __export int osl_del_row(struct osl_table *t, struct osl_row *row)
 {
 	struct osl_row *r = row;
@@ -1577,10 +1391,8 @@ __export int osl_del_row(struct osl_table *t, struct osl_row *row)
 		struct osl_column *col = t->columns + i;
 		enum osl_storage_type st = cd->storage_type;
 		remove_rb_node(t, i, r);
-		if (st == OSL_MAPPED_STORAGE) {
-			mark_mapped_object_invalid(t, r->num, i);
+		if (st == OSL_MAPPED_STORAGE)
 			continue;
-		}
 		if (st == OSL_NO_STORAGE && !(cd->storage_flags & OSL_DONT_FREE))
 			free(r->volatile_objects[col->volatile_num].data);
 	}
@@ -1713,7 +1525,7 @@ static int rename_disk_storage_objects(struct osl_table *t,
 		if (!old_filename || !new_filename)
 			ret = -ERRNO_TO_ERROR(ENOMEM);
 		else
-			ret = para_rename(old_filename, new_filename);
+			ret = osl_rename(old_filename, new_filename);
 		free(old_filename);
 		free(new_filename);
 		if (ret < 0)
@@ -1786,9 +1598,6 @@ __export int osl_update_object(struct osl_table *t, const struct osl_row *r,
 			uint32_t new_data_map_size;
 			char *row_index;
 			ret = get_row_index(t, r->num, &row_index);
-			if (ret < 0)
-				return ret;
-			ret = mark_mapped_object_invalid(t, r->num, col_num);
 			if (ret < 0)
 				return ret;
 			unmap_column(t, col_num);
@@ -1839,7 +1648,7 @@ __export int osl_open_disk_object(const struct osl_table *t, const struct osl_ro
 
 __export int osl_close_disk_object(struct osl_object *obj)
 {
-	return para_munmap(obj->data, obj->size);
+	return osl_munmap(obj->data, obj->size);
 }
 
 __export int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)