Diff for /freem/src/global_bltin.h between versions 1.5 and 1.12

version 1.5, 2025/04/08 16:46:11 version 1.12, 2025/04/11 16:23:18
Line 24 Line 24
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.   *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *   *
  *   $Log$   *   $Log$
    *   Revision 1.12  2025/04/11 16:23:18  snw
    *   Avoid re-reading the same block consecutively when possible
    *
    *   Revision 1.11  2025/04/11 14:21:03  snw
    *   Make all but one of the read/write calls in global_bltin use gbl_read_block or gbl_write_block
    *
    *   Revision 1.10  2025/04/11 00:52:40  snw
    *   Replace all lseek/read calls in global handler to use gbl_read_block function
    *
    *   Revision 1.9  2025/04/09 14:34:30  snw
    *   Further work on global_bltin.c refactor
    *
    *   Revision 1.8  2025/04/09 00:43:07  snw
    *   Exit with fatal error if a header mismatch found
    *
    *   Revision 1.7  2025/04/08 21:41:13  snw
    *   Make insert, update, and splitp global handler functions take a ptr to a global_handle instead of a file descriptor
    *
    *   Revision 1.6  2025/04/08 20:00:56  snw
    *   Global handler now uses a header file and maintains the last journaling transaction ID
    *
  *   Revision 1.5  2025/04/08 16:46:11  snw   *   Revision 1.5  2025/04/08 16:46:11  snw
  *   Add global file header and offsets   *   Add global file header and offsets
  *   *
Line 46 Line 67
 #define GBL_FORMAT_VERSION 2  #define GBL_FORMAT_VERSION 2
 #define GBL_MAGIC "FRMGL"  #define GBL_MAGIC "FRMGL"
   
   #define GBL_HDR_OK 0
   #define GBL_HDR_NOTOPEN 1
   #define GBL_HDR_BADMAGIC 2
   #define GBL_HDR_BADVERSION 3
   #define GBL_HDR_BADBLOCKSIZE 4
   
 typedef struct global_header {  typedef struct global_header {
           
     char magic[5]; /* FRMGL */      char magic[5]; /* FRMGL */
     int format_version;      int format_version;
     char host_triplet[40];      char host_triplet[40];
       char host_id[256];
       
     unsigned long block_size;      unsigned long block_size;
     unsigned long last_transaction_id;      unsigned long last_transaction_id;
   
Line 65  typedef struct global_handle { Line 93  typedef struct global_handle {
     int fd; /* file descriptor */      int fd; /* file descriptor */
   
     global_header header;      global_header header;
     long use_count; /* how many times has it been accessed? */     
     long age;      long age;
       long last_read_time;
       
     short opened;      short opened;
     short locked;      short locked;
     unsigned long last_block;      unsigned long last_block;
       short have_cached_block;
       unsigned long cached_block_num;
       
       char *last_block_accessed;
       
       unsigned long use_count; /* how many times has it been accessed? */
       unsigned long read_ops;
       unsigned long write_ops;
       unsigned long memory_reads;
       unsigned long splits;    
       unsigned long cache_misses;
       unsigned long cache_hits;
           
     short fast_path;      short fast_path;
           
Line 82  typedef struct global_handle { Line 124  typedef struct global_handle {
 } global_handle;  } global_handle;
   
 extern global_handle *global_handles_head;  extern global_handle *global_handles_head;
   extern unsigned long gbl_cache_misses;
   extern unsigned long gbl_cache_hits;
   
   extern inline long gbl_path(char *key, char *buf);
   extern void gbl_cache_hit(global_handle *g);
   extern void gbl_cache_miss(global_handle *g);
   extern int gbl_lock(global_handle *g, int type);
   extern int gbl_unlock(global_handle *g);
   extern void gbl_close(global_handle *g);
   extern void gbl_close_all(void);
   extern int gbl_write_initial_header(global_handle *g);
   extern int gbl_write_header(global_handle *g, global_header *hdr);
   extern int gbl_read_header(global_handle *g, global_header *h);
   extern int gbl_update_tid(global_handle *g);
   extern int gbl_create(global_handle *g);
   extern short gbl_open(global_handle *g, short action);
   extern int gbl_read_block(global_handle *g, unsigned long blocknum, char *block);
   extern int gbl_write_block(global_handle *g, unsigned long blocknum, char *block);
   extern global_handle *gbl_handle(char *key);
   
 #endif  #endif

Removed from v.1.5  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>