loglevel adjustments.
[paraslash.git] / osl.c
diff --git a/osl.c b/osl.c
index 54461c1..a71f93c 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -84,11 +84,11 @@ ssize_t para_write(int fd, const void *buf, size_t size)
  */
 ssize_t para_write_all(int fd, const void *buf, size_t size)
 {
-       PARA_DEBUG_LOG("writing %zu bytes\n", size);
+//     PARA_DEBUG_LOG("writing %zu bytes\n", size);
        const char *b = buf;
        while (size) {
                ssize_t ret = para_write(fd, b, size);
-               PARA_DEBUG_LOG("ret: %zd\n", ret);
+//             PARA_DEBUG_LOG("ret: %zd\n", ret);
                if (ret < 0)
                        return ret;
                b += ret;
@@ -170,7 +170,7 @@ static int append_file(const char *filename, char *header, size_t header_size,
 {
        int ret, fd;
 
-       PARA_DEBUG_LOG("appending %zu  + %zu bytes\n", header_size, data_size);
+//     PARA_DEBUG_LOG("appending %zu  + %zu bytes\n", header_size, data_size);
        ret = para_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
        if (ret < 0)
                return ret;
@@ -495,7 +495,7 @@ int init_table_structure(const struct osl_table_description *desc,
 
        if (!desc)
                goto err;
-       PARA_INFO_LOG("creating table structure for '%s' from table "
+       PARA_DEBUG_LOG("creating table structure for '%s' from table "
                "description\n", desc->name);
        ret = -E_NO_COLUMN_DESC;
        if (!desc->column_descriptions)
@@ -551,7 +551,7 @@ int init_table_structure(const struct osl_table_description *desc,
        if (!t->num_rbtrees)
                goto err;
        /* success */
-       PARA_INFO_LOG("OK. Index entry size: %u\n", t->index_entry_size);
+       PARA_DEBUG_LOG("OK. Index entry size: %u\n", t->index_entry_size);
        ret = init_column_descriptions(t);
        if (ret < 0)
                goto err;
@@ -677,7 +677,7 @@ static int compare_table_descriptions(struct osl_table *t)
                if (strcmp(cd1->name, cd2->name))
                        goto out;
        }
-       PARA_INFO_LOG("table description of '%s' matches on-disk data, good\n",
+       PARA_DEBUG_LOG("table description of '%s' matches on-disk data, good\n",
                t->desc->name);
        ret = 1;
 out:
@@ -825,7 +825,7 @@ int unmap_table(struct osl_table *t, enum osl_close_flags flags)
 
        if (!t->num_mapped_columns) /* can this ever happen? */
                return 1;
-       PARA_INFO_LOG("unmapping table '%s'\n", t->desc->name);
+       PARA_DEBUG_LOG("unmapping table '%s'\n", t->desc->name);
        if (!t->index_map.data)
                return -E_NOT_MAPPED;
        if (flags & OSL_MARK_CLEAN)
@@ -955,7 +955,6 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
                return ret;
        offset = read_u32(index_entry);
        obj->size = read_u32(index_entry + 4) - 1;
-       PARA_DEBUG_LOG("index_entry: %p\n", index_entry);
        header = col->data_map.data + offset;
        obj->data = header + 1;
        if (read_u8(header) == 0xff) {
@@ -963,8 +962,6 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
                        obj->size, offset);
                return -E_INVALID_OBJECT;
        }
-       PARA_DEBUG_LOG("mapped obj row_num: %u, col %u, size: %zu\n", row_num,
-               col_num, obj->size);
        return 1;
 }
 
@@ -1062,7 +1059,6 @@ static int add_row_to_rbtrees(struct osl_table *t, uint32_t id,
        struct osl_row *row = allocate_row(t->num_rbtrees);
        const struct osl_column_description *cd;
 
-       PARA_DEBUG_LOG("row: %p, id: %u\n", row, id);
        row->id = id;
        row->volatile_objects = volatile_objs;
        FOR_EACH_RBTREE_COLUMN(i, t, cd) {
@@ -1075,7 +1071,6 @@ static int add_row_to_rbtrees(struct osl_table *t, uint32_t id,
                } else { /* volatile */
                        const struct osl_object *obj
                                = volatile_objs + t->columns[i].volatile_num;
-                       PARA_DEBUG_LOG("inserting %p\n", obj->data);
                        ret = insert_rbtree(t, i, row, obj);
                }
                if (ret < 0)
@@ -1359,7 +1354,7 @@ static int append_map_file(const struct osl_table *t, unsigned col_num,
        int ret;
        char header = 0; /* zero means valid object */
 
-       PARA_DEBUG_LOG("appending %zu + 1 byte\n", obj->size);
+//     PARA_DEBUG_LOG("appending %zu + 1 byte\n", obj->size);
        ret = append_file(filename, &header, 1, obj->data, obj->size,
                new_size);
        free(filename);
@@ -1374,7 +1369,7 @@ static int append_index_entry(const struct osl_table *t, char *new_index_entry)
        if (!t->num_mapped_columns)
                return 1;
        filename = index_filename(t->desc);
-       PARA_DEBUG_LOG("appending %u bytes\n", t->index_entry_size);
+//     PARA_DEBUG_LOG("appending %u bytes\n", t->index_entry_size);
        ret = append_file(filename, NULL, 0, new_index_entry,
                t->index_entry_size, NULL);
        free(filename);
@@ -1485,8 +1480,8 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
        if (t->num_mapped_columns)
                new_index_entry = para_malloc(t->index_entry_size);
        /* pass 1: sanity checks */
-       PARA_DEBUG_LOG("sanity tests: %p:%p\n", objects[0].data,
-               objects[1].data);
+//     PARA_DEBUG_LOG("sanity tests: %p:%p\n", objects[0].data,
+//             objects[1].data);
        FOR_EACH_COLUMN(i, t->desc, cd) {
                enum osl_storage_type st = cd->storage_type;
                enum osl_storage_flags sf = cd->storage_flags;
@@ -1499,16 +1494,16 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
                if (sf & OSL_RBTREE) {
                        unsigned rbtree_num = t->columns[i].rbtree_num;
                        ret = -E_RB_KEY_EXISTS;
-                       PARA_DEBUG_LOG("checking whether %p exists\n",
-                               objects[i].data);
+//                     PARA_DEBUG_LOG("checking whether %p exists\n",
+//                             objects[i].data);
                        if (search_rbtree(objects + i, t, i,
                                        &rb_parents[rbtree_num],
                                        &rb_links[rbtree_num]) > 0)
                                goto out;
                }
                if (sf & OSL_FIXED_SIZE) {
-                       PARA_DEBUG_LOG("fixed size. need: %zu, have: %d\n",
-                               objects[i].size, cd->data_size);
+//                     PARA_DEBUG_LOG("fixed size. need: %zu, have: %d\n",
+//                             objects[i].size, cd->data_size);
                        ret = -E_BAD_DATA_SIZE;
                        if (objects[i].size != cd->data_size)
                                goto out;
@@ -1520,7 +1515,7 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
        ret = unmap_table(t, OSL_MARK_CLEAN);
        if (ret < 0)
                goto out;
-       PARA_DEBUG_LOG("sanity tests passed%s\n", "");
+//     PARA_DEBUG_LOG("sanity tests passed%s\n", "");
        /* pass 2: create data files, append map data */
        FOR_EACH_COLUMN(i, t->desc, cd) {
                enum osl_storage_type st = cd->storage_type;
@@ -1529,8 +1524,8 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
                if (st == OSL_MAPPED_STORAGE) {
                        uint32_t new_size;
                        struct osl_column *col = &t->columns[i];
-                       PARA_DEBUG_LOG("appending object of size %zu\n",
-                               objects[i].size);
+//                     PARA_DEBUG_LOG("appending object of size %zu\n",
+//                             objects[i].size);
                        ret = append_map_file(t, i, objects + i, &new_size);
                        if (ret < 0)
                                goto rollback;
@@ -1561,11 +1556,11 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
                        volatile_objs[t->columns[i].volatile_num] = objects[i];
        }
        t->num_rows++;
-       PARA_DEBUG_LOG("adding new entry as row #%d\n", t->num_rows - 1);
+//     PARA_DEBUG_LOG("adding new entry as row #%d\n", t->num_rows - 1);
        ret = add_row_to_rbtrees(t, t->num_rows - 1, volatile_objs, row);
        if (ret < 0)
                goto out;
-       PARA_DEBUG_LOG("added new entry as row #%d\n", t->num_rows - 1);
+//     PARA_DEBUG_LOG("added new entry as row #%d\n", t->num_rows - 1);
        ret = 1;
        goto out;
 rollback: /* rollback all changes made, ignore further errors */