From 491c00b9d46a789afa80f7b9f892c12a9062cbd5 Mon Sep 17 00:00:00 2001 From: nova Date: Sun, 10 May 2026 18:28:54 +0200 Subject: [PATCH] improvements to the threading --- threading.c | 145 +++++++++++++++++++++++----------------------------- 1 file changed, 64 insertions(+), 81 deletions(-) diff --git a/threading.c b/threading.c index f65bc1b..37157b3 100644 --- a/threading.c +++ b/threading.c @@ -47,8 +47,13 @@ unsigned int btm_status; void *thread_mid(){ + dir tmp; + tmp.current_file = NULL; + tmp.file_list = NULL; + tmp.file_count = 0; while(!(status & STATUS_QUIT_PROGRAM)){ + pthread_mutex_lock(&mutex_mid); pthread_cond_wait(&cond_mid, &mutex_mid); unsigned int local_status = status; @@ -62,35 +67,35 @@ void *thread_mid(){ memcpy(path, global_path, strlen(global_path)+1); if (local_status & STATUS_RELOAD_DIRECTORY) { - long index = (long)mid_dir.current_file; + long index = mid_dir.current_file - mid_dir.file_list; + tmp = mid_dir; - dir tmp; - tmp.file_count = get_dir_size(global_path); - tmp.file_list = malloc(tmp.file_count * sizeof(file)); - if (tmp.file_count) { /* fails if dir empty */ - get_dir_content(global_path, &tmp); + mid_dir.file_count = get_dir_size(path); + mid_dir.file_list = malloc(mid_dir.file_count * sizeof(file)); + if (mid_dir.file_count) { /* fails if dir empty */ + get_dir_content(path, &mid_dir); + mid_dir.current_file = &mid_dir.file_list[index]; + } else { /* the hovered dir is empty */ - tmp.current_file = NULL; + mid_dir.current_file = NULL; } - long i; - for (i = 0; i < mid_dir.file_count; i++) { - free(mid_dir.file_list[i].file_name); - } - free(mid_dir.file_list); - mid_dir.file_list = tmp.file_list; - mid_dir.current_file = tmp.file_list; - mid_dir.file_count = tmp.file_count; - - update_selected_file(); } + pthread_cond_signal(&cond_rgt); btm_status = local_status; - pthread_cond_signal(&cond_rgt); pthread_cond_signal(&cond_btm); - free(path); pthread_mutex_unlock(&mutex_mid); + + long i; + for (i = 0; i < tmp.file_count; i++) { + free(tmp.file_list[i].file_name); + } + free(tmp.file_list); + tmp.current_file = NULL; + tmp.file_list = NULL; + tmp.file_count = 0; } pthread_exit(0); } @@ -145,22 +150,26 @@ void *thread_lft(){ } void *thread_rgt(){ + dir tmp; + tmp.current_file = NULL; + tmp.file_list = NULL; + tmp.file_count = 0; while(!(status & STATUS_QUIT_PROGRAM)){ pthread_mutex_lock(&mutex_rgt); pthread_cond_wait(&cond_rgt, &mutex_rgt); + pthread_mutex_lock(&mutex_mid); - rgt_dir.current_file = mid_dir.current_file; - rgt_dir.file_count = 1; + char *file_name = malloc(strlen(mid_dir.current_file->file_name)+1); + file_name = memcpy(file_name, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name)+1); + rgt_dir.file_list = malloc(sizeof(file)); - - char *file_name = malloc(strlen(rgt_dir.current_file->file_name)+1); - memcpy(file_name, mid_dir.current_file->file_name, strlen(mid_dir.current_file->file_name)+1); - memcpy(rgt_dir.file_list, rgt_dir.current_file, sizeof(file)); + memcpy(rgt_dir.file_list, mid_dir.current_file, sizeof(file)); + rgt_dir.file_list->file_name = file_name; rgt_dir.current_file = rgt_dir.file_list; - rgt_dir.current_file->file_name = file_name; + rgt_dir.file_count = 1; pthread_mutex_unlock(&mutex_mid); @@ -170,64 +179,40 @@ void *thread_rgt(){ images_clear(); #endif - dir tmp; - tmp.file_count = get_dir_size(rgt_dir.current_file->file_name); - tmp.file_list = malloc(tmp.file_count * sizeof(file)); - if (tmp.file_count) { /* fails if dir empty */ - get_dir_content(rgt_dir.current_file->file_name, &tmp); + tmp = rgt_dir; + + rgt_dir.file_count = get_dir_size(rgt_dir.current_file->file_name); + rgt_dir.file_list = malloc(rgt_dir.file_count * sizeof(file)); + if (rgt_dir.file_count) { /* fails if dir empty */ + get_dir_content(tmp.current_file->file_name, &rgt_dir); } else { /* the hovered dir is empty */ - tmp.current_file = NULL; + rgt_dir.current_file = NULL; } - long i; - for (i = 0; i < rgt_dir.file_count; i++) { - free(rgt_dir.file_list[i].file_name); - } - free(rgt_dir.file_list); - rgt_dir.file_list = tmp.file_list; - rgt_dir.current_file = tmp.file_list; - rgt_dir.file_count = tmp.file_count; } else if ((status & STATUS_DELTA_TIME) != STATUS_DELTA_TIME && mid_dir.file_count > 0) { free(rgt_buffer); - rgt_dir.current_file->status = FILE_STATUS_HOVER; rgt_buffer = preview_file(rgt_dir.current_file); - rgt_dir.current_file->file_type = FILE_TYPE_OPEN_FILE; + rgt_dir.current_file->file_type |= FILE_TYPE_OPEN_FILE; - /* - unsigned long i = 0; - for (i = 0; i < rgt_dir.file_count; i++) { - if (rgt_dir.file_list[i].file_name) { - free(rgt_dir.file_list[i].file_name); - } - } - free(rgt_dir.file_list); - rgt_dir.file_count = 0; - rgt_dir.file_list = malloc(sizeof(file)); - rgt_dir.current_file = rgt_dir.file_list; - */ } } else { - unsigned long i = 0; - for (i = 0; i < rgt_dir.file_count; i++) { - if (rgt_dir.current_file[i].file_name) { - free(rgt_dir.current_file[i].file_name); - } - } - free(rgt_dir.file_list); - rgt_dir.file_count = 0; - rgt_dir.file_list = malloc(sizeof(file)); - rgt_dir.current_file = rgt_dir.file_list; - free(rgt_buffer); - rgt_buffer = malloc(sizeof(char)); - rgt_buffer[0] = '\0'; } pthread_mutex_unlock(&mutex_rgt); + long i; + for (i = 0; i < tmp.file_count; i++) { + free(tmp.file_list[i].file_name); + } + free(tmp.file_list); + tmp.current_file = NULL; + tmp.file_list = NULL; + tmp.file_count = 0; + } pthread_exit(0); } @@ -377,20 +362,18 @@ void threading_init(){ memset(btm_buffer, '\0', sizeof(char)); - - volatile char vol; /* needed to make sure higher optimization steps dont move these around */ - vol = pthread_mutex_init(&mutex_top, NULL); - vol = pthread_mutex_init(&mutex_mid, NULL); - vol = pthread_mutex_init(&mutex_lft, NULL); - vol = pthread_mutex_init(&mutex_btm, NULL); - vol = pthread_mutex_init(&mutex_rgt, NULL); - vol = pthread_mutex_init(&mutex_selection, NULL); - vol = pthread_cond_init(&cond_rgt, NULL); - vol = pthread_cond_init(&cond_lft, NULL); - vol = pthread_cond_init(&cond_mid, NULL); - vol = pthread_cond_init(&cond_top, NULL); - vol = pthread_cond_init(&cond_btm, NULL); - vol; + pthread_mutex_init(&mutex_top, NULL); + pthread_mutex_init(&mutex_mid, NULL); + pthread_mutex_init(&mutex_lft, NULL); + pthread_mutex_init(&mutex_btm, NULL); + pthread_mutex_init(&mutex_rgt, NULL); + pthread_mutex_init(&mutex_selection, NULL); + pthread_cond_init(&cond_rgt, NULL); + pthread_cond_init(&cond_lft, NULL); + pthread_cond_init(&cond_mid, NULL); + pthread_cond_init(&cond_top, NULL); + pthread_cond_init(&cond_btm, NULL); + } void threading_free(){ free(top_buffer);