X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osl.c;h=17bddeb5db58b821931bd808f8ab0511ff78b3d9;hb=f497ad60e2191188f6bef05d022a07d17c65a357;hp=430d120fb3a286f61e1eb2a8ab3c2912d6652206;hpb=c9d2589c6764a308142afd17e92cef630c7fe940;p=osl.git diff --git a/osl.c b/osl.c index 430d120..17bddeb 100644 --- a/osl.c +++ b/osl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 Andre Noll + * Copyright (C) 2007-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -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 #define MSGSTRFIELD(line) MSGSTRFIELD1(line) #define MSGSTRFIELD1(line) str##line @@ -61,20 +68,18 @@ static void __attribute ((constructor)) init_loglevel(void) __printf_2_3 void __log(int ll, const char* fmt,...) { va_list argp; - FILE *outfd; struct tm *tm; time_t t1; char str[255] = ""; if (ll < loglevel) return; - outfd = stderr; time(&t1); tm = localtime(&t1); strftime(str, sizeof(str), "%b %d %H:%M:%S", tm); - fprintf(outfd, "%s ", str); + fprintf(stderr, "%s ", str); va_start(argp, fmt); - vfprintf(outfd, fmt, argp); + vfprintf(stderr, fmt, argp); va_end(argp); } @@ -279,6 +284,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; @@ -341,7 +349,7 @@ err: int read_table_desc(struct osl_object *map, struct osl_table_description *desc) { char *buf = map->data; - uint8_t version; + uint8_t version, compat_version, create_version; uint16_t header_size; int ret, i; unsigned offset; @@ -352,7 +360,19 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc) 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) + /* + * 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 */ return -E_OSL_VERSION_MISMATCH; desc->flags = read_u8(buf + IDX_TABLE_FLAGS); desc->num_columns = read_u16(buf + IDX_NUM_COLUMNS); @@ -487,7 +507,8 @@ 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); + write_u8(buf + IDX_VERSION, CURRENT_TABLE_VERSION + + (COMPAT_TABLE_VERSION << 4)); 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; @@ -505,7 +526,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); @@ -981,12 +1002,13 @@ __export int osl_close_table(struct osl_table *t, enum osl_close_flags flags) int row_is_invalid(struct osl_table *t, uint32_t row_num) { char *row_index; - int i, ret = get_row_index(t, row_num, &row_index); + int ret = get_row_index(t, row_num, &row_index); + unsigned n; if (ret < 0) return ret; - for (i = 0; i < t->row_index_size; i++) { - if ((unsigned char)row_index[i] != 0xff) + for (n = 0; n < t->row_index_size; n++) { + if ((unsigned char)row_index[n] != 0xff) return 0; } INFO_LOG("row %d is invalid\n", row_num); @@ -1025,23 +1047,32 @@ int mark_row_invalid(struct osl_table *t, uint32_t row_num) */ int init_rbtrees(struct osl_table *t) { - int i, ret; + int ret; + unsigned n; const struct osl_column_description *cd; /* create rbtrees */ - FOR_EACH_RBTREE_COLUMN(i, t, cd) - t->columns[i].rbtree = RB_ROOT; + FOR_EACH_RBTREE_COLUMN(n, t, cd) + t->columns[n].rbtree = RB_ROOT; /* add valid rows to rbtrees */ t->num_invalid_rows = 0; - for (i = 0; i < t->num_rows; i++) { - ret = row_is_invalid(t, i); + for (n = 0; n < t->num_rows; n++) { + struct osl_object *volatile_objs; + ret = row_is_invalid(t, n); if (ret < 0) return ret; if (ret) { t->num_invalid_rows++; continue; } - ret = add_row_to_rbtrees(t, i, NULL, NULL); + if (t->num_volatile_columns > 0) { + volatile_objs = calloc(t->num_volatile_columns, + sizeof(struct osl_object)); + if (!volatile_objs) + return -E_OSL_NOMEM; + } else + volatile_objs = NULL; + ret = add_row_to_rbtrees(t, n, volatile_objs, NULL); if (ret < 0) return ret; } @@ -1550,7 +1581,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; @@ -1679,6 +1711,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);