diff options
-rw-r--r-- | src/bucket.c | 6 | ||||
-rw-r--r-- | src/falloc.c | 4 | ||||
-rw-r--r-- | src/findkey.c | 2 | ||||
-rw-r--r-- | src/fullio.c | 4 | ||||
-rw-r--r-- | src/gdbmclose.c | 2 | ||||
-rw-r--r-- | src/gdbmopen.c | 4 | ||||
-rw-r--r-- | src/gdbmsetopt.c | 2 | ||||
-rw-r--r-- | src/gdbmstore.c | 2 | ||||
-rw-r--r-- | src/gdbmsync.c | 2 | ||||
-rw-r--r-- | src/gdbmtool.c | 4 | ||||
-rw-r--r-- | src/proto.h | 20 | ||||
-rw-r--r-- | src/recover.c | 2 | ||||
-rw-r--r-- | src/systems.h | 16 | ||||
-rw-r--r-- | src/update.c | 8 |
14 files changed, 41 insertions, 37 deletions
diff --git a/src/bucket.c b/src/bucket.c index 2289594..e17019c 100644 --- a/src/bucket.c +++ b/src/bucket.c | |||
@@ -114,3 +114,3 @@ _gdbm_get_bucket (GDBM_FILE dbf, int dir_index) | |||
114 | /* Position the file pointer */ | 114 | /* Position the file pointer */ |
115 | file_pos = __lseek (dbf, bucket_adr, SEEK_SET); | 115 | file_pos = gdbm_file_seek (dbf, bucket_adr, SEEK_SET); |
116 | if (file_pos != bucket_adr) | 116 | if (file_pos != bucket_adr) |
@@ -189,3 +189,3 @@ _gdbm_read_bucket_at (GDBM_FILE dbf, off_t off, hash_bucket *bucket, | |||
189 | /* Read the bucket. */ | 189 | /* Read the bucket. */ |
190 | file_pos = __lseek (dbf, off, SEEK_SET); | 190 | file_pos = gdbm_file_seek (dbf, off, SEEK_SET); |
191 | if (file_pos != off) | 191 | if (file_pos != off) |
@@ -434,3 +434,3 @@ _gdbm_write_bucket (GDBM_FILE dbf, cache_elem *ca_entry) | |||
434 | 434 | ||
435 | file_pos = __lseek (dbf, ca_entry->ca_adr, SEEK_SET); | 435 | file_pos = gdbm_file_seek (dbf, ca_entry->ca_adr, SEEK_SET); |
436 | if (file_pos != ca_entry->ca_adr) | 436 | if (file_pos != ca_entry->ca_adr) |
diff --git a/src/falloc.c b/src/falloc.c index 13ee0ed..2f21ebe 100644 --- a/src/falloc.c +++ b/src/falloc.c | |||
@@ -193,3 +193,3 @@ pop_avail_block (GDBM_FILE dbf) | |||
193 | /* Read the block. */ | 193 | /* Read the block. */ |
194 | file_pos = __lseek (dbf, new_el.av_adr, SEEK_SET); | 194 | file_pos = gdbm_file_seek (dbf, new_el.av_adr, SEEK_SET); |
195 | if (file_pos != new_el.av_adr) | 195 | if (file_pos != new_el.av_adr) |
@@ -323,3 +323,3 @@ push_avail_block (GDBM_FILE dbf) | |||
323 | /* Update the disk. */ | 323 | /* Update the disk. */ |
324 | file_pos = __lseek (dbf, av_adr, SEEK_SET); | 324 | file_pos = gdbm_file_seek (dbf, av_adr, SEEK_SET); |
325 | if (file_pos != av_adr) | 325 | if (file_pos != av_adr) |
diff --git a/src/findkey.c b/src/findkey.c index 9bb4553..9c8fd71 100644 --- a/src/findkey.c +++ b/src/findkey.c | |||
@@ -85,3 +85,3 @@ _gdbm_read_entry (GDBM_FILE dbf, int elem_loc) | |||
85 | /* Read into the cache. */ | 85 | /* Read into the cache. */ |
86 | file_pos = __lseek (dbf, dbf->bucket->h_table[elem_loc].data_pointer, | 86 | file_pos = gdbm_file_seek (dbf, dbf->bucket->h_table[elem_loc].data_pointer, |
87 | SEEK_SET); | 87 | SEEK_SET); |
diff --git a/src/fullio.c b/src/fullio.c index bdb51cb..84eea60 100644 --- a/src/fullio.c +++ b/src/fullio.c | |||
@@ -29,3 +29,3 @@ _gdbm_full_read (GDBM_FILE dbf, void *buffer, size_t size) | |||
29 | { | 29 | { |
30 | ssize_t rdbytes = __read (dbf, ptr, size); | 30 | ssize_t rdbytes = gdbm_file_read (dbf, ptr, size); |
31 | if (rdbytes == -1) | 31 | if (rdbytes == -1) |
@@ -57,3 +57,3 @@ _gdbm_full_write (GDBM_FILE dbf, void *buffer, size_t size) | |||
57 | { | 57 | { |
58 | ssize_t wrbytes = __write (dbf, ptr, size); | 58 | ssize_t wrbytes = gdbm_file_write (dbf, ptr, size); |
59 | if (wrbytes == -1) | 59 | if (wrbytes == -1) |
diff --git a/src/gdbmclose.c b/src/gdbmclose.c index c638183..ead9187 100644 --- a/src/gdbmclose.c +++ b/src/gdbmclose.c | |||
@@ -37,3 +37,3 @@ gdbm_close (GDBM_FILE dbf) | |||
37 | if (dbf->read_write != GDBM_READER) | 37 | if (dbf->read_write != GDBM_READER) |
38 | __fsync (dbf); | 38 | gdbm_file_sync (dbf); |
39 | 39 | ||
diff --git a/src/gdbmopen.c b/src/gdbmopen.c index 22e7ca6..53d62a4 100644 --- a/src/gdbmopen.c +++ b/src/gdbmopen.c | |||
@@ -431,3 +431,3 @@ gdbm_fd_open (int fd, const char *file_name, int block_size, | |||
431 | /* Wait for initial configuration to be written to disk. */ | 431 | /* Wait for initial configuration to be written to disk. */ |
432 | __fsync (dbf); | 432 | gdbm_file_sync (dbf); |
433 | 433 | ||
@@ -510,3 +510,3 @@ gdbm_fd_open (int fd, const char *file_name, int block_size, | |||
510 | /* Read the hash table directory. */ | 510 | /* Read the hash table directory. */ |
511 | file_pos = __lseek (dbf, dbf->header->dir, SEEK_SET); | 511 | file_pos = gdbm_file_seek (dbf, dbf->header->dir, SEEK_SET); |
512 | if (file_pos != dbf->header->dir) | 512 | if (file_pos != dbf->header->dir) |
diff --git a/src/gdbmsetopt.c b/src/gdbmsetopt.c index ca62290..69e244c 100644 --- a/src/gdbmsetopt.c +++ b/src/gdbmsetopt.c | |||
@@ -192,3 +192,3 @@ setopt_gdbm_setmmap (GDBM_FILE dbf, void *optval, int optlen) | |||
192 | } | 192 | } |
193 | __fsync (dbf); | 193 | gdbm_file_sync (dbf); |
194 | if (n == dbf->memory_mapping) | 194 | if (n == dbf->memory_mapping) |
diff --git a/src/gdbmstore.c b/src/gdbmstore.c index 6b498b2..b8a1e66 100644 --- a/src/gdbmstore.c +++ b/src/gdbmstore.c | |||
@@ -162,3 +162,3 @@ gdbm_store (GDBM_FILE dbf, datum key, datum content, int flags) | |||
162 | /* Write the data to the file. */ | 162 | /* Write the data to the file. */ |
163 | file_pos = __lseek (dbf, file_adr, SEEK_SET); | 163 | file_pos = gdbm_file_seek (dbf, file_adr, SEEK_SET); |
164 | if (file_pos != file_adr) | 164 | if (file_pos != file_adr) |
diff --git a/src/gdbmsync.c b/src/gdbmsync.c index 10fbaad..5d94cbe 100644 --- a/src/gdbmsync.c +++ b/src/gdbmsync.c | |||
@@ -36,3 +36,3 @@ gdbm_sync (GDBM_FILE dbf) | |||
36 | /* Do the sync on the file. */ | 36 | /* Do the sync on the file. */ |
37 | __fsync (dbf); | 37 | gdbm_file_sync (dbf); |
38 | 38 | ||
diff --git a/src/gdbmtool.c b/src/gdbmtool.c index 11b6f20..dbb7510 100644 --- a/src/gdbmtool.c +++ b/src/gdbmtool.c | |||
@@ -229,3 +229,3 @@ _gdbm_avail_list_size (GDBM_FILE dbf, size_t min_size) | |||
229 | { | 229 | { |
230 | if (__lseek (dbf, temp, SEEK_SET) != temp) | 230 | if (gdbm_file_seek (dbf, temp, SEEK_SET) != temp) |
231 | { | 231 | { |
@@ -287,3 +287,3 @@ _gdbm_print_avail_list (FILE *fp, GDBM_FILE dbf) | |||
287 | { | 287 | { |
288 | if (__lseek (dbf, temp, SEEK_SET) != temp) | 288 | if (gdbm_file_seek (dbf, temp, SEEK_SET) != temp) |
289 | { | 289 | { |
diff --git a/src/proto.h b/src/proto.h index 9592f52..563505f 100644 --- a/src/proto.h +++ b/src/proto.h | |||
@@ -85,2 +85,22 @@ int _gdbm_next_bucket_dir (GDBM_FILE dbf, int bucket_dir); | |||
85 | 85 | ||
86 | /* I/O macros. */ | ||
87 | #if HAVE_MMAP | ||
88 | # define gdbm_file_read(_dbf, _buf, _size) \ | ||
89 | _gdbm_mapped_read(_dbf, _buf, _size) | ||
90 | # define gdbm_file_write(_dbf, _buf, _size) \ | ||
91 | _gdbm_mapped_write(_dbf, _buf, _size) | ||
92 | # define gdbm_file_seek(_dbf, _off, _whn) \ | ||
93 | _gdbm_mapped_lseek(_dbf, _off, _whn) | ||
94 | # define gdbm_file_sync(_dbf) \ | ||
95 | _gdbm_mapped_sync(_dbf) | ||
96 | #else | ||
97 | # define gdbm_file_read(_dbf, _buf, _size) read(_dbf->desc, _buf, _size) | ||
98 | # define gdbm_file_write(_dbf, _buf, _size) write(_dbf->desc, _buf, _size) | ||
99 | # define gdbm_file_seek(_dbf, _off, _whn) lseek(_dbf->desc, _off, _whn) | ||
100 | # if HAVE_FSYNC | ||
101 | # define gdbm_file_sync(_dbf) fsync(_dbf->desc) | ||
102 | # else | ||
103 | # define gdbm_file_sync(_dbf) { sync(); sync(); } | ||
104 | # endif | ||
105 | #endif | ||
86 | 106 | ||
diff --git a/src/recover.c b/src/recover.c index 074c76f..f6859ea 100644 --- a/src/recover.c +++ b/src/recover.c | |||
@@ -180,3 +180,3 @@ _gdbm_finish_transfer (GDBM_FILE dbf, GDBM_FILE new_dbf, | |||
180 | /* Make sure the new database is all on disk. */ | 180 | /* Make sure the new database is all on disk. */ |
181 | __fsync (dbf); | 181 | gdbm_file_sync (dbf); |
182 | 182 | ||
diff --git a/src/systems.h b/src/systems.h index c678573..750aa51 100644 --- a/src/systems.h +++ b/src/systems.h | |||
@@ -65,18 +65,2 @@ | |||
65 | 65 | ||
66 | /* I/O macros. */ | ||
67 | #if HAVE_MMAP | ||
68 | # define __read(_dbf, _buf, _size) _gdbm_mapped_read(_dbf, _buf, _size) | ||
69 | # define __write(_dbf, _buf, _size) _gdbm_mapped_write(_dbf, _buf, _size) | ||
70 | # define __lseek(_dbf, _off, _whn) _gdbm_mapped_lseek(_dbf, _off, _whn) | ||
71 | # define __fsync(_dbf) _gdbm_mapped_sync(_dbf) | ||
72 | #else | ||
73 | # define __read(_dbf, _buf, _size) read(_dbf->desc, _buf, _size) | ||
74 | # define __write(_dbf, _buf, _size) write(_dbf->desc, _buf, _size) | ||
75 | # define __lseek(_dbf, _off, _whn) lseek(_dbf->desc, _off, _whn) | ||
76 | # if HAVE_FSYNC | ||
77 | # define __fsync(_dbf) fsync(_dbf->desc) | ||
78 | # else | ||
79 | # define __fsync(_dbf) { sync(); sync(); } | ||
80 | # endif | ||
81 | #endif | ||
82 | 66 | ||
diff --git a/src/update.c b/src/update.c index f4b8b78..e3ee717 100644 --- a/src/update.c +++ b/src/update.c | |||
@@ -32,3 +32,3 @@ write_header (GDBM_FILE dbf) | |||
32 | 32 | ||
33 | file_pos = __lseek (dbf, 0L, SEEK_SET); | 33 | file_pos = gdbm_file_seek (dbf, 0L, SEEK_SET); |
34 | if (file_pos != 0) | 34 | if (file_pos != 0) |
@@ -52,3 +52,3 @@ write_header (GDBM_FILE dbf) | |||
52 | if (dbf->fast_write == FALSE) | 52 | if (dbf->fast_write == FALSE) |
53 | __fsync (dbf); | 53 | gdbm_file_sync (dbf); |
54 | 54 | ||
@@ -96,3 +96,3 @@ _gdbm_end_update (GDBM_FILE dbf) | |||
96 | { | 96 | { |
97 | file_pos = __lseek (dbf, dbf->header->dir, SEEK_SET); | 97 | file_pos = gdbm_file_seek (dbf, dbf->header->dir, SEEK_SET); |
98 | if (file_pos != dbf->header->dir) | 98 | if (file_pos != dbf->header->dir) |
@@ -116,3 +116,3 @@ _gdbm_end_update (GDBM_FILE dbf) | |||
116 | if (!dbf->header_changed && dbf->fast_write == FALSE) | 116 | if (!dbf->header_changed && dbf->fast_write == FALSE) |
117 | __fsync (dbf); | 117 | gdbm_file_sync (dbf); |
118 | } | 118 | } |