e2fsck: merge counts after threads finish

[tools/e2fsprogs.git] / e2fsck / pass1.c

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 9c0d23e..d651db2 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -2501,6 +2501,23 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx
        ext2fs_block_bitmap inodes_to_rebuild = global_ctx->inodes_to_rebuild;
        ext2_icount_t inode_count = global_ctx->inode_count;
        ext2_icount_t inode_link_info = global_ctx->inode_link_info;
+       __u32 fs_directory_count = global_ctx->fs_directory_count;
+       __u32 fs_regular_count = global_ctx->fs_regular_count;
+       __u32 fs_blockdev_count = global_ctx->fs_blockdev_count;
+       __u32 fs_chardev_count = global_ctx->fs_chardev_count;
+       __u32 fs_links_count = global_ctx->fs_links_count;
+       __u32 fs_symlinks_count = global_ctx->fs_symlinks_count;
+       __u32 fs_fast_symlinks_count = global_ctx->fs_fast_symlinks_count;
+       __u32 fs_fifo_count = global_ctx->fs_fifo_count;
+       __u32 fs_total_count = global_ctx->fs_total_count;
+       __u32 fs_badblocks_count = global_ctx->fs_badblocks_count;
+       __u32 fs_sockets_count = global_ctx->fs_sockets_count;
+       __u32 fs_ind_count = global_ctx->fs_ind_count;
+       __u32 fs_dind_count = global_ctx->fs_dind_count;
+       __u32 fs_tind_count = global_ctx->fs_tind_count;
+       __u32 fs_fragmented = global_ctx->fs_fragmented;
+       __u32 fs_fragmented_dir = global_ctx->fs_fragmented_dir;
+       __u32 large_files = global_ctx->large_files;
 
 #ifdef HAVE_SETJMP_H
        jmp_buf          old_jmp;
@@ -2527,6 +2544,23 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx
        e2fsck_pass1_merge_dir_info(global_ctx, thread_ctx);
        global_ctx->inode_count = inode_count;
        global_ctx->inode_link_info = inode_link_info;
+       global_ctx->fs_directory_count += fs_directory_count;
+       global_ctx->fs_regular_count += fs_regular_count;
+       global_ctx->fs_blockdev_count += fs_blockdev_count;
+       global_ctx->fs_chardev_count += fs_chardev_count;
+       global_ctx->fs_links_count += fs_links_count;
+       global_ctx->fs_symlinks_count += fs_symlinks_count;
+       global_ctx->fs_fast_symlinks_count += fs_fast_symlinks_count;
+       global_ctx->fs_fifo_count += fs_fifo_count;
+       global_ctx->fs_total_count += fs_total_count;
+       global_ctx->fs_badblocks_count += fs_badblocks_count;
+       global_ctx->fs_sockets_count += fs_sockets_count;
+       global_ctx->fs_ind_count += fs_ind_count;
+       global_ctx->fs_dind_count += fs_dind_count;
+       global_ctx->fs_tind_count += fs_tind_count;
+       global_ctx->fs_fragmented += fs_fragmented;
+       global_ctx->fs_fragmented_dir += fs_fragmented_dir;
+       global_ctx->large_files += large_files;
 
        /* Keep the global singal flags*/
        global_ctx->flags |= (flags & E2F_FLAG_SIGNAL_MASK) |
@@ -2678,6 +2712,18 @@ static void *e2fsck_pass1_thread(void *arg)
 {
        struct e2fsck_thread_info       *info = arg;
        e2fsck_t                         thread_ctx = info->eti_thread_ctx;
+#ifdef DEBUG_THREADS
+       struct e2fsck_thread_debug      *thread_debug = info->eti_debug;
+#endif
+
+#ifdef DEBUG_THREADS
+       pthread_mutex_lock(&thread_debug->etd_mutex);
+       while (info->eti_thread_index > thread_debug->etd_finished_threads) {
+               pthread_cond_wait(&thread_debug->etd_cond,
+                                 &thread_debug->etd_mutex);
+       }
+       pthread_mutex_unlock(&thread_debug->etd_mutex);
+#endif
 
 #ifdef HAVE_SETJMP_H
        /*
@@ -2702,6 +2748,14 @@ out:
                        thread_ctx->thread_info.et_group_start,
                        thread_ctx->thread_info.et_group_end,
                        thread_ctx->thread_info.et_inode_number);
+
+#ifdef DEBUG_THREADS
+       pthread_mutex_lock(&thread_debug->etd_mutex);
+       thread_debug->etd_finished_threads++;
+       pthread_cond_broadcast(&thread_debug->etd_cond);
+       pthread_mutex_unlock(&thread_debug->etd_mutex);
+#endif
+
        return NULL;
 }
 
@@ -2715,6 +2769,12 @@ static int e2fsck_pass1_threads_start(struct e2fsck_thread_info **pinfo,
        struct e2fsck_thread_info       *tmp_pinfo;
        int                              i;
        e2fsck_t                         thread_ctx;
+#ifdef DEBUG_THREADS
+       struct e2fsck_thread_debug       thread_debug =
+               {PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0};
+
+       thread_debug.etd_finished_threads = 0;
+#endif
 
        retval = pthread_attr_init(&attr);
        if (retval) {
@@ -2735,6 +2795,9 @@ static int e2fsck_pass1_threads_start(struct e2fsck_thread_info **pinfo,
        for (i = 0; i < num_threads; i++) {
                tmp_pinfo = &infos[i];
                tmp_pinfo->eti_thread_index = i;
+#ifdef DEBUG_THREADS
+               tmp_pinfo->eti_debug = &thread_debug;
+#endif
                retval = e2fsck_pass1_thread_prepare(global_ctx, &thread_ctx,
                                                     i, num_threads);
                if (retval) {