--- lbbs/src/test_file_loader.c 2025/05/17 05:54:42 1.2 +++ lbbs/src/test_file_loader.c 2025/05/25 06:48:31 1.5 @@ -15,12 +15,15 @@ ***************************************************************************/ #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", @@ -35,7 +38,12 @@ int main(int argc, char *argv[]) { int ret; int i; - const void *p_file_shm; + 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) { @@ -46,6 +54,19 @@ int main(int argc, char *argv[]) log_std_redirect(STDOUT_FILENO); log_err_redirect(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) < 0) + { + printf("trie_dict_init failed\n"); + return -1; + } + ret = file_loader_init(); if (ret < 0) { @@ -63,7 +84,7 @@ int main(int argc, char *argv[]) for (i = 0; i < files_cnt; i++) { - if (load_file_shm(files[i]) < 0) + if (load_file(files[i]) < 0) { printf("Load file %s error\n", files[i]); } @@ -71,17 +92,22 @@ int main(int argc, char *argv[]) for (i = 0; i < files_cnt; i++) { - if ((p_file_shm = get_file_shm(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 shm %s error\n", files[i]); } else { - printf("File: %s size: %ld lines: %ld\n", files[i], *((size_t *)p_file_shm), *((size_t *)(p_file_shm + sizeof(size_t)))); + printf("File: %s size: %ld lines: %ld\n", files[i], data_len, line_total); - if (shmdt(p_file_shm) == -1) + for (int j = 0; j < line_total; j++) { - log_error("shmdt() error (%d)\n", errno); + 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]); } } } @@ -90,7 +116,7 @@ int main(int argc, char *argv[]) for (i = 0; i < files_cnt; i++) { - if (unload_file_shm(files[i]) < 0) + if (unload_file(files[i]) < 0) { printf("Unload file %s error\n", files[i]); } @@ -98,7 +124,7 @@ int main(int argc, char *argv[]) for (i = 0; i < files_cnt; i++) { - if (load_file_shm(files[i]) < 0) + if (load_file(files[i]) < 0) { printf("Load file %s error\n", files[i]); } @@ -110,7 +136,7 @@ int main(int argc, char *argv[]) { if (i % 2 == 0) { - if (unload_file_shm(files[i]) < 0) + if (unload_file(files[i]) < 0) { printf("Unload file %s error\n", files[i]); } @@ -121,17 +147,17 @@ int main(int argc, char *argv[]) { if (i % 2 != 0) { - if ((p_file_shm = get_file_shm(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 shm %s error\n", files[i]); } else { - printf("File: %s size: %ld lines: %ld\n", files[i], *((size_t *)p_file_shm), *((size_t *)(p_file_shm + sizeof(size_t)))); + printf("File: %s size: %ld lines: %ld\n", files[i], data_len, line_total); - if (shmdt(p_file_shm) == -1) + if (detach_file_shm(p_shm) < 0) { - log_error("shmdt() error (%d)\n", errno); + log_error("detach_file_shm(%s) error\n", files[i]); } } } @@ -140,6 +166,14 @@ int main(int argc, char *argv[]) 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;