--- lbbs/src/file_loader.c	2025/05/17 05:54:42	1.3
+++ lbbs/src/file_loader.c	2025/05/25 06:48:31	1.11
@@ -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,12 +58,13 @@ 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)
 {
-	log_std("Cleanup: %s %ld\n", filename, shmid);
-	if (shmctl((int)shmid, IPC_RMID, NULL) == -1)
+	int shmid = (int)value;
+
+	if (shmctl(shmid, IPC_RMID, NULL) == -1)
 	{
-		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", (int)shmid, errno);
+		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", shmid, errno);
 	}
 }
 
@@ -69,10 +77,11 @@ 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;
 }
 
-int load_file_shm(const char *filename)
+int load_file(const char *filename)
 {
 	int fd;
 	struct stat sb;
@@ -82,11 +91,11 @@ 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;
 
 	if ((fd = open(filename, O_RDONLY)) < 0)
 	{
@@ -129,7 +138,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)
 	{
@@ -139,13 +148,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)
 	{
@@ -153,13 +163,13 @@ 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)
 	{
-		log_error("shmdt() error (%d)\n", errno);
+		log_error("shmdt(shmid=%d) error (%d)\n", shmid, errno);
 		return -3;
 	}
 
@@ -187,11 +197,11 @@ int load_file_shm(const char *filename)
 	return 0;
 }
 
-int unload_file_shm(const char *filename)
+int unload_file(const char *filename)
 {
-	int64_t shmid = 0;
+	int64_t shmid;
 
-	if (trie_dict_get(p_trie_file_dict, filename, (int64_t *)&shmid) != 1)
+	if (trie_dict_get(p_trie_file_dict, filename, &shmid) != 1)
 	{
 		log_error("trie_dict_get(%s) not found\n", filename);
 		return -1;
@@ -211,7 +221,7 @@ int unload_file_shm(const char *filename
 	return 0;
 }
 
-const void *get_file_shm(const char *filename)
+const void *get_file_shm_readonly(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;
@@ -231,9 +241,30 @@ const void *get_file_shm(const char *fil
 	p_shm = shmat((int)shmid, NULL, SHM_RDONLY);
 	if (p_shm == (void *)-1)
 	{
-		log_error("shmat() error (%d)\n", errno);
+		log_error("shmat(shmid=%d) error (%d)\n", (int)shmid, 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;
 }
+
+int detach_file_shm(const void *p_shm)
+{
+	if (p_shm == NULL)
+	{
+		return -2;
+	}
+
+	if (shmdt(p_shm) == -1)
+	{
+		log_error("shmdt() error (%d)\n", errno);
+		return -1;
+	}
+
+	return 0;
+}