/[LeafOK_CVS]/lbbs/src/file_loader.c
ViewVC logotype

Diff of /lbbs/src/file_loader.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.9 by sysadm, Tue May 20 12:29:26 2025 UTC Revision 1.16 by sysadm, Wed Jul 2 03:08:10 2025 UTC
# Line 15  Line 15 
15   ***************************************************************************/   ***************************************************************************/
16    
17  #include "file_loader.h"  #include "file_loader.h"
 #include "trie_dict.h"  
 #include "str_process.h"  
18  #include "log.h"  #include "log.h"
19  #include <fcntl.h>  #include "str_process.h"
20    #include "trie_dict.h"
21  #include <errno.h>  #include <errno.h>
22  #include <unistd.h>  #include <fcntl.h>
23  #include <stdlib.h>  #include <stdlib.h>
24  #include <string.h>  #include <string.h>
25  #include <time.h>  #include <time.h>
26    #include <unistd.h>
27    #include <sys/ipc.h>
28  #include <sys/mman.h>  #include <sys/mman.h>
 #include <sys/stat.h>  
29  #include <sys/shm.h>  #include <sys/shm.h>
30  #include <sys/ipc.h>  #include <sys/stat.h>
   
 #define MAX_SPLIT_FILE_LINES 65536  
31    
32  struct shm_header_t  struct shm_header_t
33  {  {
# Line 60  int file_loader_init() Line 58  int file_loader_init()
58    
59  static void trie_file_dict_cleanup_cb(const char *filename, int64_t value)  static void trie_file_dict_cleanup_cb(const char *filename, int64_t value)
60  {  {
61          const void *p_shm = (const void *)value;          int shmid = (int)value;
         int shmid = *((int *)p_shm);  
   
         if (shmdt(p_shm) == -1)  
         {  
                 log_error("shmdt(shmid=%d) error (%d)\n", shmid, errno);  
         }  
62    
63          if (shmctl(shmid, IPC_RMID, NULL) == -1)          if (shmctl(shmid, IPC_RMID, NULL) == -1)
64          {          {
# Line 82  void file_loader_cleanup(void) Line 74  void file_loader_cleanup(void)
74          }          }
75    
76          trie_dict_traverse(p_trie_file_dict, trie_file_dict_cleanup_cb);          trie_dict_traverse(p_trie_file_dict, trie_file_dict_cleanup_cb);
   
77          trie_dict_destroy(p_trie_file_dict);          trie_dict_destroy(p_trie_file_dict);
78    
79          p_trie_file_dict = NULL;          p_trie_file_dict = NULL;
80  }  }
81    
82  int load_file_shm(const char *filename)  int load_file(const char *filename)
83  {  {
84          int fd;          int fd;
85          struct stat sb;          struct stat sb;
# Line 102  int load_file_shm(const char *filename) Line 94  int load_file_shm(const char *filename)
94          long line_offsets[MAX_SPLIT_FILE_LINES];          long line_offsets[MAX_SPLIT_FILE_LINES];
95          long *p_line_offsets;          long *p_line_offsets;
96          int64_t shmid_old;          int64_t shmid_old;
         void *p_shm_old;  
97    
98          if ((fd = open(filename, O_RDONLY)) < 0)          if ((fd = open(filename, O_RDONLY)) < 0)
99          {          {
# Line 130  int load_file_shm(const char *filename) Line 121  int load_file_shm(const char *filename)
121                  return -1;                  return -1;
122          }          }
123    
124          line_total = split_data_lines(p_data, SCREEN_COLS, line_offsets, MAX_SPLIT_FILE_LINES);          line_total = split_data_lines(p_data, SCREEN_COLS, line_offsets, MAX_SPLIT_FILE_LINES, 1, NULL);
         if (line_total >= MAX_SPLIT_FILE_LINES)  
         {  
                 log_error("split_data_lines() truncated over limit lines\n");  
         }  
125    
126          // Allocate shared memory          // Allocate shared memory
127          proj_id = (int)(time(NULL) % getpid());          proj_id = (int)(time(NULL) % getpid());
# Line 174  int load_file_shm(const char *filename) Line 161  int load_file_shm(const char *filename)
161          p_line_offsets = p_data + data_len + 1;          p_line_offsets = p_data + data_len + 1;
162          memcpy(p_line_offsets, line_offsets, sizeof(long) * (size_t)(line_total + 1));          memcpy(p_line_offsets, line_offsets, sizeof(long) * (size_t)(line_total + 1));
163    
         // Re-mount shm in read-only mode  
164          if (shmdt(p_shm) == -1)          if (shmdt(p_shm) == -1)
165          {          {
166                  log_error("shmdt() error (%d)\n", errno);                  log_error("shmdt(shmid=%d) error (%d)\n", shmid, errno);
                 return -3;  
         }  
   
         p_shm = shmat(shmid, NULL, SHM_RDONLY);  
         if (p_shm == (void *)-1)  
         {  
                 log_error("shmat(shmid=%d) error (%d)\n", shmid, errno);  
167                  return -3;                  return -3;
168          }          }
169    
170          if (trie_dict_get(p_trie_file_dict, filename, (int64_t *)&p_shm_old) == 1)          if (trie_dict_get(p_trie_file_dict, filename, &shmid_old) == 1)
171          {          {
                 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;  
                 }  
   
172                  if (shmctl((int)shmid_old, IPC_RMID, NULL) == -1)                  if (shmctl((int)shmid_old, IPC_RMID, NULL) == -1)
173                  {                  {
174                          log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", (int)shmid_old, errno);                          log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", (int)shmid_old, errno);
# Line 205  int load_file_shm(const char *filename) Line 176  int load_file_shm(const char *filename)
176                  }                  }
177          }          }
178    
179          if (trie_dict_set(p_trie_file_dict, filename, (int64_t)p_shm) != 1)          if (trie_dict_set(p_trie_file_dict, filename, (int64_t)shmid) != 1)
180          {          {
181                  log_error("trie_dict_set(%s) error\n", filename);                  log_error("trie_dict_set(%s) error\n", filename);
182    
# Line 220  int load_file_shm(const char *filename) Line 191  int load_file_shm(const char *filename)
191          return 0;          return 0;
192  }  }
193    
194  int unload_file_shm(const char *filename)  int unload_file(const char *filename)
195  {  {
196          const void *p_shm;          int64_t shmid;
         int shmid;  
197    
198          if (trie_dict_get(p_trie_file_dict, filename, (int64_t *)&p_shm) != 1)          if (trie_dict_get(p_trie_file_dict, filename, &shmid) != 1)
199          {          {
200                  log_error("trie_dict_get(%s) not found\n", filename);                  log_error("trie_dict_get(%s) not found\n", filename);
201                  return -1;                  return -1;
202          }          }
203    
         shmid = *((int *)p_shm);  
   
         if (shmdt(p_shm) == -1)  
         {  
                 log_error("shmdt(shmid=%d) error (%d)\n", shmid, errno);  
         }  
   
204          if (shmctl((int)shmid, IPC_RMID, NULL) == -1)          if (shmctl((int)shmid, IPC_RMID, NULL) == -1)
205          {          {
206                  log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", (int)shmid, errno);                  log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", (int)shmid, errno);
# Line 252  int unload_file_shm(const char *filename Line 215  int unload_file_shm(const char *filename
215          return 0;          return 0;
216  }  }
217    
218  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)  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)
219  {  {
220            int64_t shmid;
221          const void *p_shm;          const void *p_shm;
222    
223          if (p_trie_file_dict == NULL)          if (p_trie_file_dict == NULL)
# Line 262  const void *get_file_shm(const char *fil Line 226  const void *get_file_shm(const char *fil
226                  return NULL;                  return NULL;
227          }          }
228    
229          if (trie_dict_get(p_trie_file_dict, filename, (int64_t *)&p_shm) != 1) // Not exist          if (trie_dict_get(p_trie_file_dict, filename, &shmid) != 1) // Not exist
230          {          {
231                  log_error("trie_dict_get(%s) not found\n", filename);                  log_error("trie_dict_get(%s) not found\n", filename);
232                  return NULL;                  return NULL;
233          }          }
234    
235            p_shm = shmat((int)shmid, NULL, SHM_RDONLY);
236            if (p_shm == (void *)-1)
237            {
238                    log_error("shmat(shmid=%d) error (%d)\n", (int)shmid, errno);
239                    return NULL;
240            }
241    
242          *p_data_len = ((struct shm_header_t *)p_shm)->data_len;          *p_data_len = ((struct shm_header_t *)p_shm)->data_len;
243          *p_line_total = ((struct shm_header_t *)p_shm)->line_total;          *p_line_total = ((struct shm_header_t *)p_shm)->line_total;
244          *pp_data = p_shm + sizeof(struct shm_header_t);          *pp_data = p_shm + sizeof(struct shm_header_t);
# Line 275  const void *get_file_shm(const char *fil Line 246  const void *get_file_shm(const char *fil
246    
247          return p_shm;          return p_shm;
248  }  }
249    
250    int detach_file_shm(const void *p_shm)
251    {
252            if (p_shm == NULL)
253            {
254                    return -2;
255            }
256    
257            if (shmdt(p_shm) == -1)
258            {
259                    log_error("shmdt() error (%d)\n", errno);
260                    return -1;
261            }
262    
263            return 0;
264    }

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
webmaster@leafok.com
 ViewVC Help
Powered by ViewVC 1.3.0-beta1