X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=osl.c;h=5a0dde80ea6eb623172caa2f538834cf12b0a01b;hp=e1b535c563b7ae99570950f7c0152be2f3412883;hb=2dba3a38dcfe721842404f01e9b2adb59c302604;hpb=8f8ea26e0fb2fcc1fbe584f6e7fe3b9b6199d555 diff --git a/osl.c b/osl.c index e1b535c..5a0dde8 100644 --- a/osl.c +++ b/osl.c @@ -8,88 +8,48 @@ #include /* readdir() */ #include - #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; - } - } - return p; -} - /* Taken from Drepper: How to write shared libraries, Appendix B. */ #include #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) { - if (IS_SYSTEM_ERROR(num)) - return strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1)); return msgstr.str + errmsgidx[num]; } +int loglevel = 0; + +static void __attribute ((constructor)) init_loglevel(void) +{ + char *p = getenv("OSL_LOGLEVEL"); + + /* don't log anything if unset */ + loglevel = p? atoi(p) : EMERG + 1; +} + /** * The log function. * @@ -106,7 +66,7 @@ __printf_2_3 void __log(int ll, const char* fmt,...) time_t t1; char str[255] = ""; - if (ll < 2) + if (ll < loglevel) return; outfd = stderr; time(&t1); @@ -143,90 +103,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; @@ -235,12 +113,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) { @@ -272,21 +145,6 @@ static int verify_name(const char *name) return 1; } -/** - * Compare two osl objects pointing to hash values. - * - * \param obj1 Pointer to the first hash object. - * \param obj2 Pointer to the second hash object. - * - * \return The values required for an osl compare function. - * - * \sa osl_compare_func, uint32_compare(). - */ -int osl_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2) -{ - return hash_compare((HASH_TYPE *)obj1->data, (HASH_TYPE *)obj2->data); -} - static char *disk_storage_dirname(const struct osl_table *t, unsigned col_num, const char *ds_name) { @@ -320,7 +178,7 @@ static int disk_storage_name_of_row(const struct osl_table *t, *name = disk_storage_name_of_object(t, &obj); if (*name) return 1; - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; } static void column_name_hash(const char *col_name, HASH_TYPE *hash) @@ -333,7 +191,6 @@ static int init_column_descriptions(struct osl_table *t) int i, j, ret; const struct osl_column_description *cd; - ret = -E_OSL_BAD_TABLE_DESC; ret = verify_name(t->desc->name); if (ret < 0) goto err; @@ -390,7 +247,7 @@ int init_table_structure(const struct osl_table_description *desc, { const struct osl_column_description *cd; struct osl_table *t = calloc(1, sizeof(*t)); - int i, ret = -ERRNO_TO_ERROR(ENOMEM), have_disk_storage_name_column = 0; + int i, ret = -E_OSL_NOMEM, have_disk_storage_name_column = 0; if (!t) return ret; @@ -405,7 +262,7 @@ int init_table_structure(const struct osl_table_description *desc, ret = -E_OSL_NO_COLUMNS; if (!desc->num_columns) goto err; - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; t->columns = calloc(desc->num_columns, sizeof(struct osl_column)); if (!t->columns) goto err; @@ -474,8 +331,8 @@ 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. * @@ -492,14 +349,14 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc) 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) return -E_OSL_VERSION_MISMATCH; desc->flags = read_u8(buf + IDX_TABLE_FLAGS); desc->num_columns = read_u16(buf + IDX_NUM_COLUMNS); - DEBUG_LOG("%u columns\n", desc->num_columns); + INFO_LOG("%u columns\n", desc->num_columns); if (!desc->num_columns) return -E_OSL_NO_COLUMNS; header_size = read_u16(buf + IDX_HEADER_SIZE); @@ -508,7 +365,7 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc) desc->column_descriptions = calloc(desc->num_columns, sizeof(struct osl_column_description)); if (!desc->column_descriptions) - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; offset = IDX_COLUMN_DESCRIPTIONS; FOR_EACH_COLUMN(i, desc, cd) { char *null_byte; @@ -528,7 +385,7 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc) ret = -E_OSL_INDEX_CORRUPTION; if (!null_byte) goto err; - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; cd->name = strdup(buf + offset + IDX_CD_NAME); if (!cd->name) goto err; @@ -571,7 +428,7 @@ static int compare_table_descriptions(struct osl_table *t) struct osl_column_description *cd; unsigned diff = t->desc->num_columns - desc.num_columns; INFO_LOG("extending table by %u volatile columns\n", diff); - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; desc.column_descriptions = realloc(desc.column_descriptions, t->desc->num_columns * sizeof(struct osl_column_description)); if (!desc.column_descriptions) @@ -604,7 +461,7 @@ static int compare_table_descriptions(struct osl_table *t) if (strcmp(cd1->name, cd2->name)) goto out; } - DEBUG_LOG("table description of '%s' matches on-disk data, good\n", + INFO_LOG("table description of '%s' matches on-disk data, good\n", t->desc->name); ret = 1; out: @@ -626,8 +483,8 @@ static int create_table_index(struct osl_table *t) t->desc->name); buf = calloc(1, size); if (!buf) - return -ERRNO_TO_ERROR(ENOMEM); - sprintf(buf + IDX_PARA_MAGIC, "%s", PARA_MAGIC); + return -E_OSL_NOMEM; + 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); @@ -653,19 +510,12 @@ static int create_table_index(struct osl_table *t) if (filename) ret = write_file(filename, buf, size); else - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; free(buf); free(filename); return ret; } -/** - * Create a new osl table. - * - * \param desc Pointer to the table description. - * - * \return Standard. - */ __export int osl_create_table(const struct osl_table_description *desc) { const struct osl_column_description *cd; @@ -680,19 +530,19 @@ __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); - if (ret < 0 && !is_errno(-ret, EEXIST)) + ret = osl_mkdir(desc->dir, 0777); + if (ret < 0 && ret != -E_OSL_DIR_EXISTS) goto out; table_dir = make_message("%s/%s", desc->dir, desc->name); - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; if (!table_dir) goto out; - ret = para_mkdir(table_dir, 0777); + ret = osl_mkdir(table_dir, 0777); if (ret < 0) goto out; } - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; filename = column_filename(t, i); if (!filename) goto out; @@ -707,7 +557,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; @@ -750,7 +600,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; } @@ -763,7 +613,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) { @@ -773,12 +623,12 @@ int unmap_table(struct osl_table *t, enum osl_close_flags flags) if (!t->num_mapped_columns) /* can this ever happen? */ return 1; - DEBUG_LOG("unmapping table '%s'\n", t->desc->name); + INFO_LOG("unmapping table '%s'\n", t->desc->name); if (!t->index_map.data) 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; @@ -793,11 +643,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) { + return -E_OSL_NOMEM; + ret = osl_stat(filename, &statbuf); + if (ret < 0) { free(filename); return ret; } @@ -836,8 +687,8 @@ int map_table(struct osl_table *t, enum map_table_flags flags) return -E_OSL_ALREADY_MAPPED; filename = index_filename(t->desc); if (!filename) - return -ERRNO_TO_ERROR(ENOMEM); - DEBUG_LOG("mapping table '%s' (index: %s)\n", t->desc->name, filename); + return -E_OSL_NOMEM; + INFO_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.data, &t->index_map.size, NULL); free(filename); @@ -869,10 +720,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; } @@ -897,7 +748,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; @@ -907,17 +757,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) @@ -1013,7 +861,7 @@ static int add_row_to_rbtrees(struct osl_table *t, uint32_t row_num, const struct osl_column_description *cd; if (!row) - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; row->num = row_num; row->volatile_objects = volatile_objs; FOR_EACH_RBTREE_COLUMN(i, t, cd) { @@ -1101,26 +949,13 @@ void clear_rbtrees(struct osl_table *t) } -/** - * Close an osl table. - * - * \param t Pointer to the table to be closed. - * \param flags Options for what should be cleaned up. - * - * If osl_open_table() succeeds, the resulting table pointer must later be - * passed to this function in order to flush all changes to the file system and - * to free the resources that were allocated by osl_open_table(). - * - * \return Standard. - * - * \sa osl_open_table(), unmap_table(). - */ __export int osl_close_table(struct osl_table *t, enum osl_close_flags flags) { int ret; if (!t) return -E_OSL_BAD_TABLE; + NOTICE_LOG("closing table %s\n", t->desc->name); free_volatile_objects(t, flags); clear_rbtrees(t); ret = unmap_table(t, flags); @@ -1213,19 +1048,6 @@ int init_rbtrees(struct osl_table *t) return 1; } -/** - * Open an osl table. - * - * Each osl table must be opened before its data can be accessed. - * - * \param table_desc Describes the table to be opened. - * \param result Contains a pointer to the open table on success. - * - * The table description given by \a desc should coincide with the - * description used at creation time. - * - * \return Standard. - */ __export int osl_open_table(const struct osl_table_description *table_desc, struct osl_table **result) { @@ -1233,7 +1055,7 @@ __export int osl_open_table(const struct osl_table_description *table_desc, struct osl_table *t; const struct osl_column_description *cd; - INFO_LOG("opening table %s\n", table_desc->name); + NOTICE_LOG("opening table %s\n", table_desc->name); ret = init_table_structure(table_desc, &t); if (ret < 0) return ret; @@ -1241,17 +1063,15 @@ __export int osl_open_table(const struct osl_table_description *table_desc, struct stat statbuf; char *dirname = column_filename(t, i); - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; if (!dirname) goto err; /* check if directory exists */ - ret = stat(dirname, &statbuf); + ret = osl_stat(dirname, &statbuf); free(dirname); - if (ret < 0) { - ret = -ERRNO_TO_ERROR(errno); + if (ret < 0) goto err; - } - ret = -ERRNO_TO_ERROR(ENOTDIR); + ret = -E_OSL_NOTDIR; if (!S_ISDIR(statbuf.st_mode)) goto err; } @@ -1283,10 +1103,10 @@ static int create_disk_storage_object_dir(const struct osl_table *t, return 1; dirname = disk_storage_dirname(t, col_num, ds_name); if (!dirname) - return -ERRNO_TO_ERROR(ENOMEM); - ret = para_mkdir(dirname, 0777); + 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; } @@ -1302,7 +1122,7 @@ static int write_disk_storage_file(const struct osl_table *t, unsigned col_num, return ret; filename = disk_storage_path(t, col_num, ds_name); if (!filename) - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; ret = write_file(filename, obj->data, obj->size); free(filename); return ret; @@ -1313,12 +1133,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); + return -E_OSL_NOMEM; + ret = append_file(filename, obj->data, obj->size, new_size); free(filename); return ret; } @@ -1332,44 +1150,12 @@ static int append_row_index(const struct osl_table *t, char *row_index) return 1; 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); + return -E_OSL_NOMEM; + 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) { @@ -1377,8 +1163,8 @@ static int truncate_mapped_file(const struct osl_table *t, unsigned col_num, char *filename = column_filename(t, col_num); if (!filename) - return -ERRNO_TO_ERROR(ENOMEM); - ret = para_truncate(filename, size); + return -E_OSL_NOMEM; + ret = truncate_file(filename, size); free(filename); return ret; } @@ -1387,48 +1173,25 @@ static int delete_disk_storage_file(const struct osl_table *t, unsigned col_num, const char *ds_name) { char *dirname, *filename = disk_storage_path(t, col_num, ds_name); - int ret, err; + int ret = 1; if (!filename) - return -ERRNO_TO_ERROR(ENOMEM); - ret = unlink(filename); - err = errno; + return -E_OSL_NOMEM; + if (unlink(filename) < 0) + ret = errno == ENOENT? -E_OSL_NOENT : -E_OSL_UNLINK; free(filename); if (ret < 0) - return -ERRNO_TO_ERROR(err); + return ret; if (!(t->desc->flags & OSL_LARGE_TABLE)) return 1; dirname = disk_storage_dirname(t, col_num, ds_name); if (!dirname) - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; rmdir(dirname); free(dirname); return 1; } -/** - * Add a new row to an osl table and retrieve this row. - * - * \param t Pointer to an open osl table. - * \param objects Array of objects to be added. - * \param row Result pointer. - * - * The \a objects parameter must point to an array containing one object per - * column. The order of the objects in the array is given by the table - * description of \a table. Several sanity checks are performed during object - * insertion and the function returns without modifying the table if any of - * these tests fail. In fact, it is atomic in the sense that it either - * succeeds or leaves the table unchanged (i.e. either all or none of the - * objects are added to the table). - * - * It is considered an error if an object is added to a column with associated - * rbtree if this object is equal to an object already contained in that column - * (i.e. the compare function for the column's rbtree returns zero). - * - * \return Standard. - * - * \sa struct osl_table_description, osl_compare_func, osl_add_row(). - */ __export int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects, struct osl_row **row) { @@ -1443,18 +1206,18 @@ __export int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects return -E_OSL_BAD_TABLE; rb_parents = malloc(t->num_rbtrees * sizeof(struct rn_node*)); if (!rb_parents) - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; rb_links = malloc(t->num_rbtrees * sizeof(struct rn_node**)); if (!rb_links) { free(rb_parents); - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; } if (t->num_mapped_columns) { new_row_index = malloc(t->row_index_size); if (!new_row_index) { free(rb_links); free(rb_parents); - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; } } /* pass 1: sanity checks */ @@ -1490,7 +1253,7 @@ __export int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects if (t->num_disk_storage_columns) { ds_name = disk_storage_name_of_object(t, &objects[t->disk_storage_name_column]); - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; if (!ds_name) goto out; } @@ -1527,13 +1290,13 @@ __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; } /* pass 3: add entry to rbtrees */ if (t->num_volatile_columns) { - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; volatile_objs = calloc(t->num_volatile_columns, sizeof(struct osl_object)); if (!volatile_objs) @@ -1571,37 +1334,11 @@ out: return ret; } -/** - * Add a new row to an osl table. - * - * \param t Same meaning as osl_add_and_get_row(). - * \param objects Same meaning as osl_add_and_get_row(). - * - * \return The return value of the underlying call to osl_add_and_get_row(). - * - * This is equivalent to osl_add_and_get_row(t, objects, NULL). - */ __export int osl_add_row(struct osl_table *t, struct osl_object *objects) { return osl_add_and_get_row(t, objects, NULL); } -/** - * Retrieve an object identified by row and column - * - * \param t Pointer to an open osl table. - * \param r Pointer to the row. - * \param col_num The column number. - * \param object The result pointer. - * - * The column determined by \a col_num must be of type \p OSL_MAPPED_STORAGE - * or \p OSL_NO_STORAGE, i.e. no disk storage objects may be retrieved by this - * function. - * - * \return Standard. - * - * \sa osl_storage_type, osl_open_disk_object(). - */ __export int osl_get_object(const struct osl_table *t, const struct osl_row *r, unsigned col_num, struct osl_object *object) { @@ -1620,34 +1357,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; -} - -/** - * Delete a row from an osl table. - * - * \param t Pointer to an open osl table. - * \param row Pointer to the row to delete. - * - * This removes all disk storage objects, removes all rbtree nodes, and frees - * all volatile objects belonging to the given row. For mapped columns, the - * data is merely marked invalid and may be pruned from time to time by - * para_fsck. - * - * \return Standard. - */ __export int osl_del_row(struct osl_table *t, struct osl_row *row) { struct osl_row *r = row; @@ -1671,10 +1380,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); } @@ -1704,21 +1411,6 @@ static int check_rbtree_col(const struct osl_table *t, unsigned col_num, return 1; } -/** - * Get the row that contains the given object. - * - * \param t Pointer to an open osl table. - * \param col_num The number of the column to be searched. - * \param obj The object to be looked up. - * \param result Points to the row containing \a obj. - * - * Lookup \a obj in \a t and return the row containing \a obj. The column - * specified by \a col_num must have an associated rbtree. - * - * \return Standard. - * - * \sa osl_storage_flags - */ __export int osl_get_row(const struct osl_table *t, unsigned col_num, const struct osl_object *obj, struct osl_row **result) { @@ -1739,7 +1431,7 @@ __export int osl_get_row(const struct osl_table *t, unsigned col_num, return 1; } -static int rbtree_loop(struct osl_column *col, void *private_data, +static int rbtree_loop(struct osl_column *col, void *private_data, osl_rbtree_loop_func *func) { struct rb_node *n, *tmp; @@ -1749,14 +1441,13 @@ static int rbtree_loop(struct osl_column *col, void *private_data, n; n = tmp, tmp = tmp? rb_next(tmp) : NULL) { struct osl_row *r = get_row_pointer(n, col->rbtree_num); - int ret = func(r, private_data); - if (ret < 0) - return ret; + if (func(r, private_data) < 0) + return -E_OSL_LOOP; } return 1; } -static int rbtree_loop_reverse(struct osl_column *col, void *private_data, +static int rbtree_loop_reverse(struct osl_column *col, void *private_data, osl_rbtree_loop_func *func) { struct rb_node *n, *tmp; @@ -1766,36 +1457,12 @@ static int rbtree_loop_reverse(struct osl_column *col, void *private_data, n; n = tmp, tmp = tmp? rb_prev(tmp) : NULL) { struct osl_row *r = get_row_pointer(n, col->rbtree_num); - int ret = func(r, private_data); - if (ret < 0) - return ret; + if (func(r, private_data) < 0) + return -E_OSL_LOOP; } return 1; } -/** - * Loop over all nodes in an rbtree. - * - * \param t Pointer to an open osl table. - * \param col_num The column to use for iterating over the elements. - * \param private_data Pointer that gets passed to \a func. - * \param func The function to be called for each node in the rbtree. - * - * This function does an in-order walk of the rbtree associated with \a - * col_num. It is an error if the \p OSL_RBTREE flag is not set for this - * column. For each node in the rbtree, the given function \a func is called - * with two pointers as arguments: The first osl_row* argument points to the - * row that contains the object corresponding to the rbtree node currently - * traversed, and the \a private_data pointer is passed verbatim to \a func as the - * second argument. The loop terminates either if \a func returns a negative - * value, or if all nodes of the tree have been visited. - * - * - * \return Standard. If the termination of the loop was caused by \a func - * returning a negative value, this value is returned. - * - * \sa osl_storage_flags, osl_rbtree_loop_reverse(), osl_compare_func. - */ __export int osl_rbtree_loop(const struct osl_table *t, unsigned col_num, void *private_data, osl_rbtree_loop_func *func) { @@ -1807,21 +1474,6 @@ __export int osl_rbtree_loop(const struct osl_table *t, unsigned col_num, return rbtree_loop(col, private_data, func); } -/** - * Loop over all nodes in an rbtree in reverse order. - * - * \param t Identical meaning as in \p osl_rbtree_loop(). - * \param col_num Identical meaning as in \p osl_rbtree_loop(). - * \param private_data Identical meaning as in \p osl_rbtree_loop(). - * \param func Identical meaning as in \p osl_rbtree_loop(). - * - * This function is identical to \p osl_rbtree_loop(), the only difference - * is that the tree is walked in reverse order. - * - * \return The same return value as \p osl_rbtree_loop(). - * - * \sa osl_rbtree_loop(). - */ __export int osl_rbtree_loop_reverse(const struct osl_table *t, unsigned col_num, void *private_data, osl_rbtree_loop_func *func) { @@ -1848,7 +1500,7 @@ static int rename_disk_storage_objects(struct osl_table *t, return 1; /* object did not change */ old_ds_name = disk_storage_name_of_object(t, old_obj); new_ds_name = disk_storage_name_of_object(t, new_obj); - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; if (!old_ds_name || ! new_ds_name) goto out; @@ -1860,9 +1512,9 @@ static int rename_disk_storage_objects(struct osl_table *t, old_filename = disk_storage_path(t, i, old_ds_name); new_filename = disk_storage_path(t, i, new_ds_name); if (!old_filename || !new_filename) - ret = -ERRNO_TO_ERROR(ENOMEM); + ret = -E_OSL_NOMEM; else - ret = para_rename(old_filename, new_filename); + ret = osl_rename(old_filename, new_filename); free(old_filename); free(new_filename); if (ret < 0) @@ -1876,25 +1528,6 @@ out: } -/** - * Change an object in an osl table. - * - * \param t Pointer to an open osl table. - * \param r Pointer to the row containing the object to be updated. - * \param col_num Number of the column containing the object to be updated. - * \param obj Pointer to the replacement object. - * - * This function gets rid of all references to the old object. This includes - * removal of the rbtree node in case there is an rbtree associated with \a - * col_num. It then inserts \a obj into the table and the rbtree if necessary. - * - * If the \p OSL_RBTREE flag is set for \a col_num, you \b MUST call this - * function in order to change the contents of an object, even for volatile or - * mapped columns of constant size (which may be updated directly if \p - * OSL_RBTREE is not set). Otherwise the rbtree might become corrupted. - * - * \return Standard - */ __export int osl_update_object(struct osl_table *t, const struct osl_row *r, unsigned col_num, struct osl_object *obj) { @@ -1925,7 +1558,7 @@ __export int osl_update_object(struct osl_table *t, const struct osl_row *r, 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; } @@ -1954,9 +1587,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); @@ -1979,22 +1609,6 @@ __export int osl_update_object(struct osl_table *t, const struct osl_row *r, return 1; } -/** - * Retrieve an object of type \p OSL_DISK_STORAGE by row and column. - * - * \param t Pointer to an open osl table. - * \param r Pointer to the row containing the object. - * \param col_num The column number. - * \param obj Points to the result upon successful return. - * - * For columns of type \p OSL_DISK_STORAGE, this function must be used to - * retrieve one of its containing objects. Afterwards, osl_close_disk_object() - * must be called in order to deallocate the resources. - * - * \return Standard. - * - * \sa osl_get_object(), osl_storage_type, osl_close_disk_object(). - */ __export int osl_open_disk_object(const struct osl_table *t, const struct osl_row *r, unsigned col_num, struct osl_object *obj) { @@ -2014,37 +1628,18 @@ __export int osl_open_disk_object(const struct osl_table *t, const struct osl_ro filename = disk_storage_path(t, col_num, ds_name); free(ds_name); if (!filename) - return -ERRNO_TO_ERROR(ENOMEM); + return -E_OSL_NOMEM; DEBUG_LOG("filename: %s\n", filename); ret = mmap_full_file(filename, O_RDONLY, &obj->data, &obj->size, NULL); free(filename); return ret; } -/** - * Free resources that were allocated during osl_open_disk_object(). - * - * \param obj Pointer to the object previously returned by open_disk_object(). - * - * \return The return value of the underlying call to para_munmap(). - * - * \sa para_munmap(). - */ __export int osl_close_disk_object(struct osl_object *obj) { - return para_munmap(obj->data, obj->size); + return osl_munmap(obj->data, obj->size); } -/** - * Get the number of rows of the given table. - * - * \param t Pointer to an open osl table. - * \param num_rows Result is returned here. - * - * The number of rows returned via \a num_rows excluding any invalid rows. - * - * \return Positive on success, \p -E_OSL_BAD_TABLE if \a t is \p NULL. - */ __export int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows) { if (!t) @@ -2054,22 +1649,6 @@ __export int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows) return 1; } -/** - * Get the rank of a row. - * - * \param t An open osl table. - * \param r The row to get the rank of. - * \param col_num The number of an rbtree column. - * \param rank Result pointer. - * - * The rank is, by definition, the position of the row in the linear order - * determined by an in-order tree walk of the rbtree associated with column - * number \a col_num of \a table. - * - * \return Standard. - * - * \sa osl_get_nth_row(). - */ __export int osl_get_rank(const struct osl_table *t, struct osl_row *r, unsigned col_num, unsigned *rank) { @@ -2092,25 +1671,6 @@ __export int osl_get_rank(const struct osl_table *t, struct osl_row *r, return 1; } -/** - * Get the row with n-th greatest value. - * - * \param t Pointer to an open osl table. - * \param col_num The column number. - * \param n The rank of the desired row. - * \param result Row is returned here. - * - * Retrieve the n-th order statistic with respect to the compare function - * of the rbtree column \a col_num. In other words, get that row with - * \a n th greatest value in column \a col_num. It's an error if - * \a col_num is not a rbtree column, or if \a n is larger than the - * number of rows in the table. - * - * \return Standard. - * - * \sa osl_storage_flags, osl_compare_func, osl_get_row(), - * osl_rbtree_last_row(), osl_rbtree_first_row(), osl_get_rank(). - */ __export int osl_get_nth_row(const struct osl_table *t, unsigned col_num, unsigned n, struct osl_row **result) { @@ -2136,43 +1696,12 @@ __export int osl_get_nth_row(const struct osl_table *t, unsigned col_num, return 1; } -/** - * Get the row corresponding to the smallest rbtree node of a column. - * - * \param t An open rbtree table. - * \param col_num The number of the rbtree column. - * \param result A pointer to the first row is returned here. - * - * The rbtree node of the smallest object (with respect to the corresponding - * compare function) is selected and the row containing this object is - * returned. It is an error if \a col_num refers to a column without an - * associated rbtree. - * - * \return Standard. - * - * \sa osl_get_nth_row(), osl_rbtree_last_row(). - */ __export int osl_rbtree_first_row(const struct osl_table *t, unsigned col_num, struct osl_row **result) { return osl_get_nth_row(t, col_num, 1, result); } -/** - * Get the row corresponding to the greatest rbtree node of a column. - * - * \param t The same meaning as in \p osl_rbtree_first_row(). - * \param col_num The same meaning as in \p osl_rbtree_first_row(). - * \param result The same meaning as in \p osl_rbtree_first_row(). - * - * This function works just like osl_rbtree_first_row(), the only difference - * is that the row containing the greatest rather than the smallest object is - * returned. - * - * \return Standard. - * - * \sa osl_get_nth_row(), osl_rbtree_first_row(). - */ __export int osl_rbtree_last_row(const struct osl_table *t, unsigned col_num, struct osl_row **result) {