--- lbbs/src/main.c 2025/07/16 05:46:17 1.61 +++ lbbs/src/main.c 2025/11/02 08:13:50 1.68 @@ -23,6 +23,7 @@ #include "menu.h" #include "net_server.h" #include "section_list_loader.h" +#include "user_list.h" #include #include #include @@ -170,13 +171,15 @@ int main(int argc, char *argv[]) goto cleanup; } - // Initialize data pools - if ((fp = fopen(VAR_TRIE_DICT_SHM, "w")) == NULL) + // Check section aid location dir + ret = mkdir(VAR_SECTION_AID_LOC_DIR, 0750); + if (ret == -1 && errno != EEXIST) { - log_error("fopen(%s) error\n", VAR_TRIE_DICT_SHM); + log_error("mkdir(%s) error (%d)\n", VAR_SECTION_AID_LOC_DIR, errno); goto cleanup; } - fclose(fp); + + // Initialize data pools if ((fp = fopen(VAR_ARTICLE_BLOCK_SHM, "w")) == NULL) { log_error("fopen(%s) error\n", VAR_ARTICLE_BLOCK_SHM); @@ -189,10 +192,22 @@ int main(int argc, char *argv[]) goto cleanup; } fclose(fp); + if ((fp = fopen(VAR_TRIE_DICT_SHM, "w")) == NULL) + { + log_error("fopen(%s) error\n", VAR_TRIE_DICT_SHM); + goto cleanup; + } + fclose(fp); + if ((fp = fopen(VAR_USER_LIST_SHM, "w")) == NULL) + { + log_error("fopen(%s) error\n", VAR_USER_LIST_SHM); + goto cleanup; + } + fclose(fp); if (trie_dict_init(VAR_TRIE_DICT_SHM, TRIE_NODE_PER_POOL) < 0) { - printf("trie_dict_init failed\n"); + printf("trie_dict_init(%s, %d) error\n", VAR_TRIE_DICT_SHM, TRIE_NODE_PER_POOL); goto cleanup; } if (article_block_init(VAR_ARTICLE_BLOCK_SHM, BBS_article_limit_per_section * BBS_max_section / ARTICLE_PER_BLOCK) < 0) @@ -215,8 +230,15 @@ int main(int argc, char *argv[]) // Load menus if (load_menu(&bbs_menu, CONF_MENU) < 0) { + log_error("load_menu(%s) error\n", CONF_MENU); goto cleanup; } + if (load_menu(&top10_menu, CONF_TOP10_MENU) < 0) + { + log_error("load_menu(%s) error\n", CONF_TOP10_MENU); + goto cleanup; + } + top10_menu.allow_exit = 1; // Load data files if (file_loader_init() < 0) @@ -228,10 +250,27 @@ int main(int argc, char *argv[]) { if (load_file(data_files_load_startup[i]) < 0) { - log_error("load_file_mmap(%s) error\n", data_files_load_startup[i]); + log_error("load_file(%s) error\n", data_files_load_startup[i]); } } + // Load user_list and online_user_list + if (user_list_pool_init(VAR_USER_LIST_SHM) < 0) + { + log_error("user_list_pool_init(%s) error\n", VAR_USER_LIST_SHM); + goto cleanup; + } + if (user_list_pool_reload(0) < 0) + { + log_error("user_list_pool_reload(all_user) error\n"); + goto cleanup; + } + if (user_list_pool_reload(1) < 0) + { + log_error("user_list_pool_reload(online_user) error\n"); + goto cleanup; + } + // Load section config and gen_ex if (load_section_config_from_db(1) < 0) { @@ -256,6 +295,12 @@ int main(int argc, char *argv[]) log_common("Initially load %d articles, last_aid = %d\n", article_block_article_count(), article_block_last_aid()); + if ((ret = user_stat_update()) < 0) + { + log_error("user_stat_update() error\n"); + goto cleanup; + } + // Set signal handler act.sa_handler = sig_hup_handler; if (sigaction(SIGHUP, &act, NULL) == -1) @@ -292,16 +337,14 @@ cleanup: // Cleanup menu unload_menu(&bbs_menu); + unload_menu(&top10_menu); // Cleanup data pools section_list_cleanup(); article_block_cleanup(); trie_dict_cleanup(); + user_list_pool_cleanup(); - if (unlink(VAR_TRIE_DICT_SHM) < 0) - { - log_error("unlink(%s) error\n", VAR_TRIE_DICT_SHM); - } if (unlink(VAR_ARTICLE_BLOCK_SHM) < 0) { log_error("unlink(%s) error\n", VAR_ARTICLE_BLOCK_SHM); @@ -310,6 +353,14 @@ cleanup: { log_error("unlink(%s) error\n", VAR_SECTION_LIST_SHM); } + if (unlink(VAR_TRIE_DICT_SHM) < 0) + { + log_error("unlink(%s) error\n", VAR_TRIE_DICT_SHM); + } + if (unlink(VAR_USER_LIST_SHM) < 0) + { + log_error("unlink(%s) error\n", VAR_SECTION_LIST_SHM); + } log_common("Main process exit normally\n");