--- lbbs/src/file_loader.c	2025/05/17 05:59:14	1.4
+++ lbbs/src/file_loader.c	2025/05/23 14:11:38	1.10
@@ -31,6 +31,13 @@
 
 #define MAX_SPLIT_FILE_LINES 65536
 
+struct shm_header_t
+{
+	int shmid;
+	size_t data_len;
+	long line_total;
+};
+
 static TRIE_NODE *p_trie_file_dict = NULL;
 
 int file_loader_init()
@@ -51,11 +58,19 @@ int file_loader_init()
 	return 0;
 }
 
-static void trie_file_dict_cleanup_cb(const char *filename, int64_t shmid)
+static void trie_file_dict_cleanup_cb(const char *filename, int64_t value)
 {
-	if (shmctl((int)shmid, IPC_RMID, NULL) == -1)
+	const void *p_shm = (const void *)value;
+	int shmid = *((int *)p_shm);
+
+	if (shmdt(p_shm) == -1)
 	{
-		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", (int)shmid, errno);
+		log_error("shmdt(shmid=%d) error (%d)\n", shmid, errno);
+	}
+
+	if (shmctl(shmid, IPC_RMID, NULL) == -1)
+	{
+		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", shmid, errno);
 	}
 }
 
@@ -67,6 +82,7 @@ void file_loader_cleanup(void)
 	}
 
 	trie_dict_traverse(p_trie_file_dict, trie_file_dict_cleanup_cb);
+
 	trie_dict_destroy(p_trie_file_dict);
 	p_trie_file_dict = NULL;
 }
@@ -81,11 +97,12 @@ int load_file_shm(const char *filename)
 	key_t key;
 	size_t size;
 	int shmid;
-	int64_t shmid_old;
 	void *p_shm;
 	long line_total;
 	long line_offsets[MAX_SPLIT_FILE_LINES];
 	long *p_line_offsets;
+	int64_t shmid_old;
+	void *p_shm_old;
 
 	if ((fd = open(filename, O_RDONLY)) < 0)
 	{
@@ -128,7 +145,7 @@ int load_file_shm(const char *filename)
 		return -2;
 	}
 
-	size = sizeof(data_len) + sizeof(line_total) + data_len + 1 + sizeof(long) * (size_t)(line_total + 1);
+	size = sizeof(struct shm_header_t) + data_len + 1 + sizeof(long) * (size_t)(line_total + 1);
 	shmid = shmget(key, size, IPC_CREAT | IPC_EXCL | 0600);
 	if (shmid == -1)
 	{
@@ -138,13 +155,14 @@ int load_file_shm(const char *filename)
 	p_shm = shmat(shmid, NULL, 0);
 	if (p_shm == (void *)-1)
 	{
-		log_error("shmat() error (%d)\n", errno);
+		log_error("shmat(shmid=%d) error (%d)\n", shmid, errno);
 		return -3;
 	}
 
-	*((size_t *)p_shm) = data_len;
-	*((long *)(p_shm + sizeof(data_len))) = line_total;
-	memcpy(p_shm + sizeof(data_len) + sizeof(line_total), p_data, data_len);
+	((struct shm_header_t *)p_shm)->shmid = shmid;
+	((struct shm_header_t *)p_shm)->data_len = data_len;
+	((struct shm_header_t *)p_shm)->line_total = line_total;
+	memcpy(p_shm + sizeof(struct shm_header_t), p_data, data_len);
 
 	if (munmap(p_data, data_len) < 0)
 	{
@@ -152,18 +170,28 @@ int load_file_shm(const char *filename)
 		return -2;
 	}
 
-	p_data = p_shm + sizeof(data_len) + sizeof(line_total);
+	p_data = p_shm + sizeof(struct shm_header_t);
 	p_line_offsets = p_data + data_len + 1;
 	memcpy(p_line_offsets, line_offsets, sizeof(long) * (size_t)(line_total + 1));
 
-	if (shmdt(p_shm) == -1)
+	// Remap shared memory in read-only mode
+	p_shm = shmat(shmid, p_shm, SHM_RDONLY | SHM_REMAP);
+	if (p_shm == (void *)-1)
 	{
-		log_error("shmdt() error (%d)\n", errno);
+		log_error("shmat(shmid=%d) error (%d)\n", shmid, errno);
 		return -3;
 	}
 
-	if (trie_dict_get(p_trie_file_dict, filename, &shmid_old) == 1)
+	if (trie_dict_get(p_trie_file_dict, filename, (int64_t *)&p_shm_old) == 1)
 	{
+		shmid_old = *((int *)p_shm_old);
+
+		if (shmdt(p_shm_old) == -1)
+		{
+			log_error("shmdt(shmid=%d) error (%d)\n", shmid_old, errno);
+			return -3;
+		}
+
 		if (shmctl((int)shmid_old, IPC_RMID, NULL) == -1)
 		{
 			log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", (int)shmid_old, errno);
@@ -171,7 +199,7 @@ int load_file_shm(const char *filename)
 		}
 	}
 
-	if (trie_dict_set(p_trie_file_dict, filename, (int64_t)shmid) != 1)
+	if (trie_dict_set(p_trie_file_dict, filename, (int64_t)p_shm) != 1)
 	{
 		log_error("trie_dict_set(%s) error\n", filename);
 
@@ -188,14 +216,22 @@ int load_file_shm(const char *filename)
 
 int unload_file_shm(const char *filename)
 {
-	int64_t shmid = 0;
+	const void *p_shm;
+	int shmid;
 
-	if (trie_dict_get(p_trie_file_dict, filename, (int64_t *)&shmid) != 1)
+	if (trie_dict_get(p_trie_file_dict, filename, (int64_t *)&p_shm) != 1)
 	{
 		log_error("trie_dict_get(%s) not found\n", filename);
 		return -1;
 	}
 
+	shmid = *((int *)p_shm);
+
+	if (shmdt(p_shm) == -1)
+	{
+		log_error("shmdt(shmid=%d) error (%d)\n", shmid, errno);
+	}
+
 	if (shmctl((int)shmid, IPC_RMID, NULL) == -1)
 	{
 		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", (int)shmid, errno);
@@ -210,9 +246,8 @@ int unload_file_shm(const char *filename
 	return 0;
 }
 
-const void *get_file_shm(const char *filename)
+const void *get_file_shm(const char *filename, size_t *p_data_len, long *p_line_total, const void **pp_data, const long **pp_line_offsets)
 {
-	int64_t shmid;
 	const void *p_shm;
 
 	if (p_trie_file_dict == NULL)
@@ -221,18 +256,16 @@ const void *get_file_shm(const char *fil
 		return NULL;
 	}
 
-	if (trie_dict_get(p_trie_file_dict, filename, &shmid) != 1) // Not exist
+	if (trie_dict_get(p_trie_file_dict, filename, (int64_t *)&p_shm) != 1) // Not exist
 	{
 		log_error("trie_dict_get(%s) not found\n", filename);
 		return NULL;
 	}
 
-	p_shm = shmat((int)shmid, NULL, SHM_RDONLY);
-	if (p_shm == (void *)-1)
-	{
-		log_error("shmat() error (%d)\n", errno);
-		return NULL;
-	}
+	*p_data_len = ((struct shm_header_t *)p_shm)->data_len;
+	*p_line_total = ((struct shm_header_t *)p_shm)->line_total;
+	*pp_data = p_shm + sizeof(struct shm_header_t);
+	*pp_line_offsets = *pp_data + *p_data_len + 1;
 
 	return p_shm;
 }