--- lbbs/src/article_cache.c 2025/05/31 13:01:29 1.7 +++ lbbs/src/article_cache.c 2025/07/02 03:08:10 1.23 @@ -15,19 +15,20 @@ ***************************************************************************/ #include "article_cache.h" +#include "lml.h" #include "log.h" #include -#include #include +#include #include +#include +#include #include #include #include -#include -#define _POSIX_C_SOURCE 200809L -#include #define ARTICLE_HEADER_MAX_LEN 4096 +#define ARTICLE_CONTENT_MAX_LEN 1024 * 1024 * 4 // 4MB #define ARTICLE_FOOTER_MAX_LEN 4096 #define SUB_DT_MAX_LEN 50 @@ -42,6 +43,8 @@ static const char *BBS_article_footer_co }; static const int BBS_article_footer_color_count = 7; +static char *content_f; // static buffer in large size + inline static int article_cache_path(char *file_path, size_t buf_len, const char *cache_dir, const ARTICLE *p_article) { if (file_path == NULL || cache_dir == NULL || p_article == NULL) @@ -77,6 +80,12 @@ int article_cache_generate(const char *c return -1; } + if (content_f == NULL && (content_f = malloc(ARTICLE_CONTENT_MAX_LEN)) == NULL) + { + log_error("malloc(content_f) error: OOM\n"); + return -1; + } + if (article_cache_path(data_file, sizeof(data_file), cache_dir, p_article) < 0) { log_error("article_cache_path(dir=%s, cid=%d) error\n", cache_dir, p_article->cid); @@ -98,7 +107,7 @@ int article_cache_generate(const char *c return -2; } - bzero(&cache, sizeof(cache)); + memset(&cache, 0, sizeof(cache)); // Generate article header / footer localtime_r(&(p_article->sub_dt), &tm_sub_dt); @@ -108,22 +117,36 @@ int article_cache_generate(const char *c p_article->username, p_article->nickname, p_section->sname, p_section->stitle, p_article->title, BBS_name, str_sub_dt); snprintf(footer, sizeof(footer), - "--\n%s¡ù À´Ô´: %s http://%s [FROM: %s]\033[m\n", + "\n--\n%s¡ù À´Ô´: %s http://%s [FROM: %s]\033[m\n\n", BBS_article_footer_color[p_article->aid % BBS_article_footer_color_count], BBS_name, BBS_server, sub_ip); header_len = strnlen(header, sizeof(header)); footer_len = strnlen(footer, sizeof(footer)); - cache.data_len = header_len + strlen(content); + header_line_cnt = split_data_lines(header, SCREEN_COLS, cache.line_offsets, MAX_SPLIT_FILE_LINES, 1, NULL); + + if (header_len != cache.line_offsets[header_line_cnt]) + { +#ifdef _DEBUG + log_error("Header of article(aid=%d) is truncated from %ld to %ld\n", p_article->aid, header_len, cache.line_offsets[header_line_cnt]); +#endif + header_len = (size_t)cache.line_offsets[header_line_cnt]; + } + + // Apply LML render to content body + cache.data_len = header_len + (size_t)lml_plain(content, content_f, ARTICLE_CONTENT_MAX_LEN); - header_line_cnt = split_data_lines(header, SCREEN_COLS, cache.line_offsets, MAX_SPLIT_FILE_LINES); cache.line_total = header_line_cnt + - split_data_lines(content, SCREEN_COLS, cache.line_offsets + header_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt); - if (cache.line_total >= MAX_SPLIT_FILE_LINES) + split_data_lines(content_f, SCREEN_COLS, cache.line_offsets + header_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt, 1, NULL); + + if (cache.data_len - header_len != (size_t)cache.line_offsets[cache.line_total]) { - log_error("split_data_lines(%s) truncated over limit lines %d >= %d\n", data_file, cache.line_total, MAX_SPLIT_FILE_LINES); - return -3; +#ifdef _DEBUG + log_error("Body of article(aid=%d) is truncated from %ld to %ld\n", + p_article->aid, cache.data_len - header_len, cache.line_offsets[cache.line_total]); +#endif + cache.data_len = header_len + (size_t)(cache.line_offsets[cache.line_total]); } for (i = header_line_cnt; i <= cache.line_total; i++) @@ -131,11 +154,15 @@ int article_cache_generate(const char *c cache.line_offsets[i] += (long)header_len; } - footer_line_cnt = split_data_lines(footer, SCREEN_COLS, cache.line_offsets + cache.line_total, MAX_SPLIT_FILE_LINES - cache.line_total); - if (cache.line_total + footer_line_cnt >= MAX_SPLIT_FILE_LINES) + footer_line_cnt = split_data_lines(footer, SCREEN_COLS, cache.line_offsets + cache.line_total, MAX_SPLIT_FILE_LINES - cache.line_total, 1, NULL); + + if (footer_len != cache.line_offsets[cache.line_total + footer_line_cnt]) { - log_error("split_data_lines(%s) truncated over limit lines %d >= %d\n", data_file, cache.line_total + footer_line_cnt, MAX_SPLIT_FILE_LINES); - return -3; +#ifdef _DEBUG + log_error("Footer of article(aid=%d) is truncated from %ld to %ld\n", + p_article->aid, footer_len, cache.line_offsets[cache.line_total + footer_line_cnt]); +#endif + footer_len = (size_t)(cache.line_offsets[cache.line_total + footer_line_cnt]); } for (i = 0; i <= footer_line_cnt; i++) @@ -145,8 +172,9 @@ int article_cache_generate(const char *c cache.data_len += footer_len; cache.line_total += footer_line_cnt; + cache.mmap_len = sizeof(cache) - sizeof(long) * (MAX_SPLIT_FILE_LINES - (size_t)(cache.line_total) - 1) + cache.data_len; - if (write(fd, &cache, sizeof(cache)) == -1) + if (write(fd, &cache, cache.mmap_len - cache.data_len) == -1) { log_error("write(%s, cache) error (%d)\n", data_file, errno); close(fd); @@ -158,7 +186,7 @@ int article_cache_generate(const char *c close(fd); return -3; } - if (write(fd, content, cache.data_len - header_len - footer_len) == -1) + if (write(fd, content_f, cache.data_len - header_len - footer_len) == -1) { log_error("write(%s, content) error (%d)\n", data_file, errno); close(fd); @@ -180,6 +208,15 @@ int article_cache_generate(const char *c return 0; } +void article_cache_cleanup(void) +{ + if (content_f) + { + free(content_f); + content_f = NULL; + } +} + int article_cache_load(ARTICLE_CACHE *p_cache, const char *cache_dir, const ARTICLE *p_article) { char data_file[FILE_PATH_LEN]; @@ -227,23 +264,17 @@ int article_cache_load(ARTICLE_CACHE *p_ return -2; } - memcpy((void *)p_cache, p_mmap, sizeof(ARTICLE_CACHE)); - - if (sizeof(ARTICLE_CACHE) + p_cache->data_len != mmap_len) + if (((ARTICLE_CACHE *)p_mmap)->mmap_len != mmap_len) { - log_error("Inconsistent length, cache_len(%ld) + data_len(%ld) != mmap_len(%ld)\n", - sizeof(ARTICLE_CACHE), p_cache->data_len, mmap_len); - - if (munmap(p_mmap, mmap_len) < 0) - { - log_error("munmap() error (%d)\n", errno); - } - + log_error("Inconsistent mmap len of article (cid=%d), %ld != %ld\n", p_article->cid, p_cache->mmap_len, mmap_len); return -3; } + memset(p_cache, 0, sizeof(*p_cache)); + memcpy((void *)p_cache, p_mmap, (size_t)(((ARTICLE_CACHE *)p_mmap)->mmap_len - ((ARTICLE_CACHE *)p_mmap)->data_len)); + p_cache->p_mmap = p_mmap; - p_cache->p_data = p_mmap + sizeof(ARTICLE_CACHE); + p_cache->p_data = p_mmap + (p_cache->mmap_len - p_cache->data_len); return 0; } @@ -256,7 +287,7 @@ int article_cache_unload(ARTICLE_CACHE * return -1; } - if (munmap(p_cache->p_mmap, sizeof(ARTICLE_CACHE) + p_cache->data_len) < 0) + if (munmap(p_cache->p_mmap, p_cache->mmap_len) < 0) { log_error("munmap() error (%d)\n", errno); return -2;