--- lbbs/src/test_file_loader.c 2025/05/16 12:22:35 1.1 +++ lbbs/src/test_file_loader.c 2025/06/04 13:42:53 1.7 @@ -15,25 +15,35 @@ ***************************************************************************/ #include "file_loader.h" +#include "trie_dict.h" #include "log.h" #include #include +#include +#include + +#define TRIE_DICT_SHM_FILE "~trie_dict_shm.dat" const char *files[] = { "../data/welcome.txt", "../data/copyright.txt", "../data/register.txt", "../data/license.txt", - "../data/login_error.txt"}; + "../data/login_error.txt", + "../data/read_help.txt"}; -int files_cnt = 5; +int files_cnt = 6; int main(int argc, char *argv[]) { int ret; - int file_loader_pool_size = 2; int i; - const FILE_MMAP *p_file_mmap; + const void *p_shm; + size_t data_len; + long line_total; + const void *p_data; + const long *p_line_offsets; + FILE *fp; if (log_begin("../log/bbsd.log", "../log/error.log") < 0) { @@ -41,17 +51,30 @@ int main(int argc, char *argv[]) return -1; } - log_std_redirect(STDOUT_FILENO); - log_err_redirect(STDERR_FILENO); + log_common_redir(STDOUT_FILENO); + log_error_redir(STDERR_FILENO); + + if ((fp = fopen(TRIE_DICT_SHM_FILE, "w")) == NULL) + { + log_error("fopen(%s) error\n", TRIE_DICT_SHM_FILE); + return -1; + } + fclose(fp); + + if (trie_dict_init(TRIE_DICT_SHM_FILE, TRIE_NODE_PER_POOL) < 0) + { + printf("trie_dict_init failed\n"); + return -1; + } - ret = file_loader_init(file_loader_pool_size); + ret = file_loader_init(); if (ret < 0) { printf("file_loader_init() error (%d)\n", ret); return ret; } - ret = file_loader_init(file_loader_pool_size); + ret = file_loader_init(); if (ret == 0) { printf("Rerun file_loader_init() error\n"); @@ -59,32 +82,33 @@ int main(int argc, char *argv[]) printf("Testing #1\n"); - for (i = 0; i < file_loader_pool_size; i++) + for (i = 0; i < files_cnt; i++) { - if (load_file_mmap(files[i]) < 0) + if (load_file(files[i]) < 0) { printf("Load file %s error\n", files[i]); } } - for (i = 0; i < file_loader_pool_size; i++) + for (i = 0; i < files_cnt; i++) { - if ((p_file_mmap = get_file_mmap(files[i])) == NULL) + if ((p_shm = get_file_shm_readonly(files[i], &data_len, &line_total, &p_data, &p_line_offsets)) == NULL) { - printf("Get file mmap %s error\n", files[i]); + printf("Get file shm %s error\n", files[i]); } else { - printf("File: %s size: ", files[i]); - printf("size: %ld lines: %ld\n", p_file_mmap->size, p_file_mmap->line_total); - } - } + printf("File: %s size: %ld lines: %ld\n", files[i], data_len, line_total); - for (i = 0; i < file_loader_pool_size; i++) - { - if (unload_file_mmap(files[i]) < 0) - { - printf("Unload file %s error\n", files[i]); + for (int j = 0; j < line_total; j++) + { + printf("Line %d: %ld ~ %ld\n", j, p_line_offsets[j], p_line_offsets[j + 1]); + } + + if (detach_file_shm(p_shm) < 0) + { + log_error("detach_file_shm(%s) error\n", files[i]); + } } } @@ -92,15 +116,15 @@ int main(int argc, char *argv[]) for (i = 0; i < files_cnt; i++) { - if (i >= file_loader_pool_size) + if (unload_file(files[i]) < 0) { - if (unload_file_mmap(files[i - file_loader_pool_size]) < 0) - { - printf("Unload file %s error\n", files[i]); - } + printf("Unload file %s error\n", files[i]); } + } - if (load_file_mmap(files[i]) < 0) + for (i = 0; i < files_cnt; i++) + { + if (load_file(files[i]) < 0) { printf("Load file %s error\n", files[i]); } @@ -110,20 +134,46 @@ int main(int argc, char *argv[]) for (i = 0; i < files_cnt; i++) { - if ((p_file_mmap = get_file_mmap(files[i])) == NULL) + if (i % 2 == 0) { - printf("Get file mmap %s error\n", files[i]); + if (unload_file(files[i]) < 0) + { + printf("Unload file %s error\n", files[i]); + } } - else + } + + for (i = 0; i < files_cnt; i++) + { + if (i % 2 != 0) { - printf("File: %s size: ", files[i]); - printf("size: %ld lines: %ld\n", p_file_mmap->size, p_file_mmap->line_total); + if ((p_shm = get_file_shm_readonly(files[i], &data_len, &line_total, &p_data, &p_line_offsets)) == NULL) + { + printf("Get file shm %s error\n", files[i]); + } + else + { + printf("File: %s size: %ld lines: %ld\n", files[i], data_len, line_total); + + if (detach_file_shm(p_shm) < 0) + { + log_error("detach_file_shm(%s) error\n", files[i]); + } + } } } file_loader_cleanup(); file_loader_cleanup(); + trie_dict_cleanup(); + + if (unlink(TRIE_DICT_SHM_FILE) < 0) + { + log_error("unlink(%s) error\n", TRIE_DICT_SHM_FILE); + return -1; + } + log_end(); return 0;