loglevel adjustments.

Adding many audio files was way to verbose..

diff --git a/afs.c b/afs.c
index a7778a5854ce782221cc7090b09eaa1a07e62049..00aab24b745e16eb95cfeead62d4a4a2cdd7e867 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -178,11 +178,9 @@ int send_callback_request(callback_function *f, struct osl_object *query,
        if (connect(fd, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) < 0) /* FIXME: Use para_connect() */
                goto out;
        ret = send_bin_buffer(fd, buf, sizeof(buf));
        if (connect(fd, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) < 0) /* FIXME: Use para_connect() */
                goto out;
        ret = send_bin_buffer(fd, buf, sizeof(buf));

-       PARA_NOTICE_LOG("bin buffer ret: %d\n", ret);

        if (ret < 0)
                goto out;
        ret = recv_bin_buffer(fd, buf, sizeof(buf));
        if (ret < 0)
                goto out;
        ret = recv_bin_buffer(fd, buf, sizeof(buf));

-       PARA_NOTICE_LOG("ret: %d\n", ret);

        if (ret < 0)
                goto out;
        if (ret != sizeof(int)) {
        if (ret < 0)
                goto out;
        if (ret != sizeof(int)) {


@@ -190,7 +188,6 @@ int send_callback_request(callback_function *f, struct osl_object *query,
                goto out;
        }
        ret = *(int *) buf;
                goto out;
        }
        ret = *(int *) buf;

-       PARA_NOTICE_LOG("result_shmid: %d\n", ret);

        if (ret <= 0)
                goto out;
        result_shmid = ret;
        if (ret <= 0)
                goto out;
        result_shmid = ret;


@@ -214,7 +211,7 @@ out:
                PARA_ERROR_LOG("%s\n", "shm destroy error");
        if (fd >= 0)
                close(fd);
                PARA_ERROR_LOG("%s\n", "shm destroy error");
        if (fd >= 0)
                close(fd);

-       PARA_DEBUG_LOG("callback_ret: %d\n", ret);
+//     PARA_DEBUG_LOG("callback_ret: %d\n", ret);

        return ret;
 }
 
        return ret;
 }
 


@@ -673,36 +670,29 @@ static void command_post_select(struct sched *s, struct task *t)
        t->ret = recv_bin_buffer(fd, buf, sizeof(buf));
        if (t->ret < 0) {
                PARA_NOTICE_LOG("%s (%d)\n", PARA_STRERROR(-t->ret), t->ret);
        t->ret = recv_bin_buffer(fd, buf, sizeof(buf));
        if (t->ret < 0) {
                PARA_NOTICE_LOG("%s (%d)\n", PARA_STRERROR(-t->ret), t->ret);

-               t->ret = 1;

                goto out;
        }
        if (t->ret != sizeof(buf)) {
                PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n",
                        t->ret, (long unsigned) sizeof(buf));
                goto out;
        }
        if (t->ret != sizeof(buf)) {
                PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n",
                        t->ret, (long unsigned) sizeof(buf));

-               t->ret = 1;

                goto out;
        }
        cookie = *(uint32_t *)buf;
        if (cookie != ct->cookie) {
                PARA_NOTICE_LOG("received invalid cookie(got %u, expected %u)\n",
                        (unsigned)cookie, (unsigned)ct->cookie);
                goto out;
        }
        cookie = *(uint32_t *)buf;
        if (cookie != ct->cookie) {
                PARA_NOTICE_LOG("received invalid cookie(got %u, expected %u)\n",
                        (unsigned)cookie, (unsigned)ct->cookie);

-               t->ret = 1;

                goto out;
        }
        query_shmid = *(int *)(buf + sizeof(cookie));
        if (query_shmid < 0) {
                PARA_WARNING_LOG("received invalid query shmid %d)\n",
                        query_shmid);
                goto out;
        }
        query_shmid = *(int *)(buf + sizeof(cookie));
        if (query_shmid < 0) {
                PARA_WARNING_LOG("received invalid query shmid %d)\n",
                        query_shmid);

-               t->ret = 1;
-               goto out;
-       }
-       t->ret = call_callback(fd, query_shmid);
-       if (t->ret < 0) {
-               PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
-               t->ret = 1;

                goto out;
        }
                goto out;
        }

+       /* Ignore return value: Errors might be ok here. */
+       call_callback(fd, query_shmid);

 out:
 out:

+       t->ret = 1;

        close(fd);
 }
 
        close(fd);
 }
 

diff --git a/aft.c b/aft.c
index ac7d9a1a34c69412242bef6631841238f07d8aea..04846a7658e34979f6bdcab62669b2c1c826a1a6 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -351,7 +351,6 @@ int aft_get_row_of_path(char *path, struct osl_row **row)
 {
        struct osl_object obj = {.data = path, .size = strlen(path) + 1};
 
 {
        struct osl_object obj = {.data = path, .size = strlen(path) + 1};
 

-       PARA_NOTICE_LOG("audio_file_table: %p\n", audio_file_table);

        return osl_get_row(audio_file_table, AFTCOL_PATH, &obj, row);
 }
 
        return osl_get_row(audio_file_table, AFTCOL_PATH, &obj, row);
 }
 


@@ -1347,8 +1346,6 @@ static int com_add_callback(const struct osl_object *query,
        default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60;
        default_afsi.audio_format_id = read_u8(buf + AFTROW_AUDIO_FORMAT_OFFSET);
 
        default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60;
        default_afsi.audio_format_id = read_u8(buf + AFTROW_AUDIO_FORMAT_OFFSET);
 

-       if (flags & ADD_FLAG_VERBOSE)
-               PARA_NOTICE_LOG("adding %s\n", path);

        objs[AFTCOL_AFSI].data = &afsi_buf;
        objs[AFTCOL_AFSI].size = AFSI_SIZE;
        save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);
        objs[AFTCOL_AFSI].data = &afsi_buf;
        objs[AFTCOL_AFSI].size = AFSI_SIZE;
        save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);


@@ -1458,6 +1455,8 @@ static int add_one_audio_file(const char *arg, const void *private_data)
                format_num = ret;
                afhi_ptr = &afhi;
        }
                format_num = ret;
                afhi_ptr = &afhi;
        }

+       if (pad->flags & ADD_FLAG_VERBOSE)
+               send_va_buffer(pad->fd, "adding %s\n", path);

        munmap(map.data, map.size);
        save_audio_file_info(hash, path, afhi_ptr, pad->flags, format_num, &obj);
        /* Ask afs to consider this entry for adding. */
        munmap(map.data, map.size);
        save_audio_file_info(hash, path, afhi_ptr, pad->flags, format_num, &obj);
        /* Ask afs to consider this entry for adding. */


@@ -1483,7 +1482,6 @@ int com_add(int fd, int argc, char * const * const argv)
        struct private_add_data pad = {.fd = fd, .flags = 0};
        struct stat statbuf;
 
        struct private_add_data pad = {.fd = fd, .flags = 0};
        struct stat statbuf;
 

-       PARA_NOTICE_LOG("argv[1]: %s\n", argv[1]);

        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
                if (arg[0] != '-')
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
                if (arg[0] != '-')

diff --git a/ogg_afh.c b/ogg_afh.c
index ef7d4f75029b3cf1f7525a8cab55195bb05f101d..2b4c100a9f32c7f1091b568680aee97598a6d7e0 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -154,7 +154,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
        ret = -E_VORBIS;
        if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
                goto err2;
        ret = -E_VORBIS;
        if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
                goto err2;

-       PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
+       PARA_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);

        ogg_stream_packetin(stream_out, &packet);
 
        ret = ogg_sync_pageout(sync_in, &page);
        ogg_stream_packetin(stream_out, &packet);
 
        ret = ogg_sync_pageout(sync_in, &page);


@@ -178,7 +178,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
        afi->header_len = 0;
        while (ogg_stream_flush(stream_out, &page))
                afi->header_len += page.body_len + page.header_len;
        afi->header_len = 0;
        while (ogg_stream_flush(stream_out, &page))
                afi->header_len += page.body_len + page.header_len;

-       PARA_INFO_LOG("header_len = %d\n", afi->header_len);
+       PARA_DEBUG_LOG("header_len = %d\n", afi->header_len);

        afi->header_offset = 0;
        ret = 1;
 err2:
        afi->header_offset = 0;
        ret = 1;
 err2:


@@ -229,7 +229,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
        }
        num_chunks = i - 1;
 //fi->chunk_table[i] = pos;
        }
        num_chunks = i - 1;
 //fi->chunk_table[i] = pos;

-       PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+       PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",

                num_chunks, chunk_time, max_chunk_len, min);
        return num_chunks;
 }
                num_chunks, chunk_time, max_chunk_len, min);
        return num_chunks;
 }

diff --git a/osl.c b/osl.c
index 54461c1dd46026ae509bae25b56bfe291238bca0..a71f93c3243153d20504eae0fed91a88141145ff 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)
 {
  */
 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);
        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;
                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;
 
 {
        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;
        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;
 
        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)
                "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 */
        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;
        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;
        }
                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:
                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;
 
        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)
        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;
                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) {
        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;
        }
                        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;
 }
 
        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;
 
        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) {
        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;
                } 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)
                        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 */
 
        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);
        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);
        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);
        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 */
        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;
        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;
                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) {
                        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;
                        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;
        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;
        /* 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];
                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;
                        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++;
                        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;
        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 */
        ret = 1;
        goto out;
 rollback: /* rollback all changes made, ignore further errors */