Mercurial > hg > dmlib
annotate dmres.c @ 630:6e2b53f2878b
Win32 compatibility.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 15 Apr 2013 04:11:44 +0300 |
| parents | 3af0d6e39629 |
| children | eb4bd1f7b679 bb14d7907eb2 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * dmlib | |
| 3 * -- Resource management | |
| 4 * Programmed and designed by Matti 'ccr' Hamalainen | |
| 5 * (C) Copyright 2003-2012 Tecnic Software productions (TNSP) | |
| 6 */ | |
| 7 #include "dmres.h" | |
| 8 #include <time.h> | |
| 9 | |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
10 #ifdef DM_USE_STDIO |
| 630 | 11 #include <sys/types.h> |
| 12 #include <sys/stat.h> | |
| 13 #include <unistd.h> | |
| 14 #include <dirent.h> | |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
15 #endif |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
16 |
| 0 | 17 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
18 DMResource *dmres_new(DMResourceLib *lib, const char *filename, int flags, size_t size) |
| 0 | 19 { |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
20 DMResource *node = dmMalloc0(sizeof(DMResource)); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
21 if (node == NULL) |
| 0 | 22 return NULL; |
| 23 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
24 node->lib = lib; |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
25 node->filename = dm_strdup(filename); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
26 node->flags = flags; |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
27 node->dataSize = size; |
| 0 | 28 |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
29 return node; |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
30 } |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
31 |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
32 |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
33 void dmres_free_res_data(DMResource *node) |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
34 { |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
35 if (node->rdata != NULL && |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
36 node->rops != NULL && |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
37 node->rops->free != NULL) |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
38 { |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
39 node->rops->free(node); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
40 } |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
41 |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
42 node->rdata = NULL; |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
43 node->flags &= !DMF_LOADED_RES; |
| 0 | 44 } |
| 45 | |
| 46 | |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
47 void dmres_free_raw_data(DMResource *node) |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
48 { |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
49 dmFree(node->data); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
50 node->data = NULL; |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
51 node->flags &= !DMF_LOADED_RAW; |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
52 } |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
53 |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
54 |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
55 void dmres_purge_raw_data(DMResource *node) |
| 0 | 56 { |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
57 if ((node->flags & DMF_PRELOAD_RAW) == 0 && |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
58 (node->flags & DMF_LOADED_RAW) && |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
59 node->data != NULL) |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
60 dmres_free_raw_data(node); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
61 } |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
62 |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
63 |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
64 void dmres_free(DMResource *node) |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
65 { |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
66 if (node != NULL) |
| 0 | 67 { |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
68 dmres_free_res_data(node); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
69 dmres_free_raw_data(node); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
70 dmFree(node->filename); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
71 dmFree(node); |
| 0 | 72 } |
| 73 } | |
| 74 | |
| 75 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
76 void dmres_insert(DMResourceLib *lib, DMResource * node) |
| 0 | 77 { |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
78 if (lib == NULL || node == NULL) |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
79 return; |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
80 |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
81 node->lib = lib; |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
82 |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
83 if (lib->resources != NULL) |
| 0 | 84 { |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
85 node->prev = lib->resources->prev; |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
86 lib->resources->prev->next = node; |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
87 lib->resources->prev = node; |
| 0 | 88 } |
| 89 else | |
| 90 { | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
91 lib->resources = node->prev = node; |
| 0 | 92 } |
| 93 | |
| 94 node->next = NULL; | |
| 95 } | |
| 96 | |
| 97 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
98 void dmres_delete(DMResourceLib *lib, DMResource * node) |
| 0 | 99 { |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
100 if (lib == NULL) |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
101 return; |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
102 |
| 0 | 103 if (node->prev) |
| 104 node->prev->next = node->next; | |
| 105 | |
| 106 if (node->next) | |
| 107 node->next->prev = node->prev; | |
| 108 else | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
109 lib->resources->prev = node->prev; |
| 0 | 110 |
| 111 node->prev = node->next = NULL; | |
| 112 } | |
| 113 | |
| 114 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
115 DMResource * dmres_find(DMResourceLib *lib, const char *filename) |
| 0 | 116 { |
| 117 DMResource *node, *found = NULL; | |
| 118 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
119 if (lib == NULL) |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
120 return NULL; |
| 0 | 121 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
122 dmMutexLock(lib->mutex); |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
123 |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
124 for (node = lib->resources; node != NULL; node = node->next) |
| 0 | 125 { |
| 126 if (strcmp(node->filename, filename) == 0) | |
| 127 { | |
| 128 found = node; | |
| 129 break; | |
| 130 } | |
| 131 } | |
| 132 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
133 dmMutexUnlock(lib->mutex); |
| 0 | 134 |
| 135 return found; | |
| 136 } | |
| 137 | |
| 138 | |
|
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
139 #ifdef DM_USE_STDIO |
| 0 | 140 /* Basic stdio file routines |
| 141 */ | |
| 142 static int dm_stdio_fopen(DMResource *handle) | |
| 143 { | |
| 144 char *rfilename = dm_strdup_printf("%s%s", DMRES_DATA_PATH, handle->filename); | |
| 145 if (rfilename == NULL) | |
| 146 return DMERR_MALLOC; | |
| 147 | |
| 148 handle->fh = fopen(rfilename, "rb"); | |
| 149 dmFree(rfilename); | |
| 150 | |
| 151 handle->error = dmGetErrno(); | |
| 152 return (handle->fh != NULL) ? DMERR_OK : DMERR_FOPEN; | |
| 153 } | |
| 154 | |
| 155 | |
| 156 static void dm_stdio_fclose(DMResource * f) | |
| 157 { | |
| 158 if (f->fh != NULL) | |
| 159 { | |
| 160 fclose(f->fh); | |
| 161 f->fh = NULL; | |
| 162 } | |
| 163 } | |
| 164 | |
| 165 | |
| 166 static int dm_stdio_ferror(DMResource * f) | |
| 167 { | |
| 168 return f->error; | |
| 169 } | |
| 170 | |
| 171 | |
| 172 static int dm_stdio_fseek(DMResource *f, const off_t pos, const int whence) | |
| 173 { | |
| 174 int ret = fseek(f->fh, pos, whence); | |
| 175 f->error = dmGetErrno(); | |
| 176 return ret; | |
| 177 } | |
| 178 | |
| 179 | |
| 180 static off_t dm_stdio_fsize(DMResource *f) | |
| 181 { | |
| 182 off_t savePos, fileSize; | |
| 183 | |
| 184 // Check if the size is cached | |
| 185 if (f->dataSize != 0) | |
| 186 return f->dataSize; | |
| 187 | |
| 188 // Get file size | |
|
406
a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
189 savePos = ftello(f->fh); |
|
a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
190 if (fseeko(f->fh, 0L, SEEK_END) != 0) |
| 0 | 191 { |
| 192 f->error = dmGetErrno(); | |
| 193 return -1; | |
| 194 } | |
| 195 | |
|
406
a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
196 fileSize = ftello(f->fh); |
|
a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
197 if (fseeko(f->fh, savePos, SEEK_SET) != 0) |
| 0 | 198 { |
| 199 f->error = dmGetErrno(); | |
| 200 return -1; | |
| 201 } | |
| 202 | |
| 203 f->dataSize = fileSize; | |
| 204 return fileSize; | |
| 205 } | |
| 206 | |
| 207 | |
| 208 static off_t dm_stdio_ftell(DMResource * f) | |
| 209 { | |
| 210 return ftell(f->fh); | |
| 211 } | |
| 212 | |
| 213 | |
| 214 static BOOL dm_stdio_feof(DMResource * f) | |
| 215 { | |
| 216 return feof(f->fh); | |
| 217 } | |
| 218 | |
| 219 | |
| 220 static int dm_stdio_fgetc(DMResource * f) | |
| 221 { | |
| 222 int ret = fgetc(f->fh); | |
| 223 f->error = dmGetErrno(); | |
| 224 return ret; | |
| 225 } | |
| 226 | |
| 227 | |
|
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
228 static int dm_stdio_fputc(int v, DMResource * f) |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
229 { |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
230 int ret = fputc(v, f->fh); |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
231 f->error = dmGetErrno(); |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
232 return ret; |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
233 } |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
234 |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
235 |
| 0 | 236 static size_t dm_stdio_fread(void *ptr, size_t size, size_t nmemb, DMResource * f) |
| 237 { | |
| 238 size_t ret = fread(ptr, size, nmemb, f->fh); | |
| 239 f->error = dmGetErrno(); | |
| 240 return ret; | |
| 241 } | |
| 242 | |
| 243 | |
|
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
244 static size_t dm_stdio_fwrite(void *ptr, size_t size, size_t nmemb, DMResource * f) |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
245 { |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
246 size_t ret = fwrite(ptr, size, nmemb, f->fh); |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
247 f->error = dmGetErrno(); |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
248 return ret; |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
249 } |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
250 |
|
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
251 |
| 0 | 252 static int dm_stdio_preload(DMResource *handle) |
| 253 { | |
| 254 int ret = dm_stdio_fopen(handle); | |
| 255 if (ret != DMERR_OK) | |
| 256 return ret; | |
| 257 | |
| 258 dm_stdio_fsize(handle); | |
| 259 | |
| 260 handle->data = dmMalloc(handle->dataSize); | |
| 261 if (handle->data == NULL) | |
| 262 return DMERR_MALLOC; | |
| 263 | |
| 264 if (dm_stdio_fread(handle->data, sizeof(Uint8), handle->dataSize, handle) != handle->dataSize) | |
| 265 return DMERR_FREAD; | |
| 266 | |
| 267 return DMERR_OK; | |
| 268 } | |
| 269 | |
| 270 | |
| 271 DMResourceOps dfStdioFileOps = | |
| 272 { | |
| 273 dm_stdio_ferror, | |
| 274 dm_stdio_fseek, | |
| 275 dm_stdio_fsize, | |
| 276 dm_stdio_ftell, | |
| 277 dm_stdio_feof, | |
| 278 dm_stdio_fgetc, | |
|
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
279 dm_stdio_fputc, |
| 0 | 280 dm_stdio_fread, |
|
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
281 dm_stdio_fwrite, |
| 0 | 282 |
| 283 dm_stdio_fopen, | |
| 284 dm_stdio_fclose, | |
| 285 dm_stdio_preload | |
| 286 }; | |
| 287 | |
| 288 DMResourceOps dfStdioFHOps = | |
| 289 { | |
| 290 dm_stdio_ferror, | |
| 291 dm_stdio_fseek, | |
| 292 dm_stdio_fsize, | |
| 293 dm_stdio_ftell, | |
| 294 dm_stdio_feof, | |
| 295 dm_stdio_fgetc, | |
|
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
296 dm_stdio_fputc, |
| 0 | 297 dm_stdio_fread, |
|
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
298 dm_stdio_fwrite, |
| 0 | 299 |
| 300 NULL, | |
| 301 NULL, | |
| 302 NULL | |
| 303 }; | |
| 304 #endif | |
| 305 | |
| 306 | |
| 307 // Some mingw/windows headers define these as macros, which is bad for us | |
| 308 #ifdef __WIN32 | |
| 309 #undef ferror | |
| 310 #undef feof | |
| 311 #endif | |
| 312 | |
| 313 | |
| 314 /* | |
| 315 * PACK file routines | |
| 316 */ | |
|
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
317 #ifdef DM_USE_PACKFS |
| 0 | 318 static int dm_pack_preload(DMResource *handle) |
| 319 { | |
| 320 DMPackEntry *node; | |
| 321 int res = DMERR_OK, cres, cdataLeft; | |
| 322 z_stream cstream; | |
| 323 Uint8 * cbuffer = NULL; | |
| 324 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
325 if (handle->lib == NULL || handle->lib->packFile == NULL) |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
326 return DMERR_NULLPTR; |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
327 |
| 0 | 328 // Search PACK nodelist for file |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
329 if ((node = dm_pack_find(handle->lib->packFile->entries, handle->filename)) == NULL) |
| 0 | 330 { |
| 331 dmError("Entry '%s' not found in PACK file.\n", handle->filename); | |
| 332 res = DMERR_NOT_FOUND; | |
| 333 goto error; | |
| 334 } | |
| 335 | |
| 336 // Seek to entry | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
337 if (fseek(handle->lib->packFile->file, node->offset, SEEK_SET) == -1) |
| 0 | 338 { |
| 339 dmError("Could not seek node position in PACK file.\n"); | |
| 340 res = DMERR_FSEEK; | |
| 341 goto error; | |
| 342 } | |
| 343 | |
| 344 // Allocate a structures and buffers | |
| 345 cbuffer = (Uint8 *) dmMalloc(DPACK_TMPSIZE); | |
| 346 if (cbuffer == NULL) | |
| 347 { | |
| 348 res = DMERR_MALLOC; | |
| 349 goto error; | |
| 350 } | |
| 351 | |
| 352 // Initialize fields | |
| 353 handle->dataOffset = 0; | |
| 354 handle->dataSize = node->size; | |
| 355 handle->data = (Uint8 *) dmMalloc(node->size); | |
| 356 if (handle->data == NULL) | |
| 357 { | |
| 358 res = DMERR_MALLOC; | |
| 359 goto error; | |
| 360 } | |
| 361 | |
| 362 // Initialize decompression | |
| 363 cstream.zalloc = (alloc_func) Z_NULL; | |
| 364 cstream.zfree = (free_func) Z_NULL; | |
| 365 cstream.opaque = (voidpf) Z_NULL; | |
| 366 cstream.next_out = handle->data; | |
| 367 cstream.avail_out = handle->dataSize; | |
| 368 cdataLeft = node->length; | |
| 369 cres = inflateInit(&(cstream)); | |
| 370 if (cres != Z_OK) | |
| 371 { | |
| 372 dmError("Could not initialize zlib stream inflation.\n"); | |
| 373 res = DMERR_INIT_FAIL; | |
| 374 goto error; | |
| 375 } | |
| 376 | |
| 377 // Uncompress the data | |
| 378 while (cdataLeft > 0 && | |
| 379 cstream.avail_out > 0 && cres == Z_OK) | |
| 380 { | |
| 381 cstream.avail_in = fread( | |
| 382 cbuffer, sizeof(Uint8), | |
| 383 (cdataLeft >= DPACK_TMPSIZE) ? DPACK_TMPSIZE : cdataLeft, | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
384 handle->lib->packFile->file); |
| 0 | 385 |
| 386 cdataLeft -= cstream.avail_in; | |
| 387 cstream.next_in = cbuffer; | |
| 388 cres = inflate(&cstream, Z_FULL_FLUSH); | |
| 389 } | |
| 390 | |
| 391 // Cleanup | |
| 392 inflateEnd(&(cstream)); | |
| 393 | |
| 394 error: | |
| 395 dmFree(cbuffer); | |
| 396 return res; | |
| 397 } | |
| 398 | |
| 399 | |
|
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
400 static void dm_pack_fclose(DMResource * f) |
| 0 | 401 { |
| 402 f->dataSize = 0; | |
| 403 f->dataOffset = 0; | |
| 404 dmFree(f->data); | |
| 405 f->data = NULL; | |
| 406 } | |
|
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
407 #endif |
| 0 | 408 |
| 409 | |
| 410 static int dm_mem_ferror(DMResource * f) | |
| 411 { | |
| 412 return f->error; | |
| 413 } | |
| 414 | |
| 415 | |
| 416 static int dm_mem_fseek(DMResource * f, const off_t offset, const int whence) | |
| 417 { | |
| 418 off_t newPos; | |
| 419 | |
| 420 // Calculate the new position | |
| 421 switch (whence) | |
| 422 { | |
| 423 case SEEK_SET: | |
| 424 newPos = offset; | |
| 425 break; | |
| 426 | |
| 427 case SEEK_CUR: | |
| 428 newPos = f->dataOffset + offset; | |
| 429 break; | |
| 430 | |
| 431 case SEEK_END: | |
| 432 newPos = f->dataSize + offset; | |
| 433 break; | |
| 434 | |
| 435 default: | |
| 436 return -1; | |
| 437 } | |
| 438 | |
| 439 // Set the new position | |
| 440 f->dataOffset = newPos; | |
| 441 | |
| 442 // Check the new position | |
| 443 if (newPos < 0 && (size_t) newPos >= f->dataSize) | |
| 444 return -1; | |
| 445 | |
| 446 return 0; | |
| 447 } | |
| 448 | |
| 449 | |
| 450 static off_t dm_mem_fsize(DMResource * f) | |
| 451 { | |
| 452 return f->dataSize; | |
| 453 } | |
| 454 | |
| 455 | |
| 456 static off_t dm_mem_ftell(DMResource * f) | |
| 457 { | |
| 458 return f->dataOffset; | |
| 459 } | |
| 460 | |
| 461 | |
| 462 static BOOL dm_mem_feof(DMResource * f) | |
| 463 { | |
| 464 // Check for EOF | |
| 465 if ((size_t) f->dataOffset <= f->dataSize) | |
| 466 return FALSE; | |
| 467 else | |
| 468 return TRUE; | |
| 469 } | |
| 470 | |
| 471 | |
| 472 static int dm_mem_fgetc(DMResource * f) | |
| 473 { | |
| 474 // Check for EOF | |
| 475 if ((size_t) f->dataOffset < f->dataSize) | |
|
439
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
476 return f->data[f->dataOffset++]; |
| 0 | 477 else |
| 478 return EOF; | |
| 479 } | |
| 480 | |
| 481 | |
| 482 static size_t dm_mem_fread(void *buf, size_t size, size_t nmemb, DMResource * f) | |
| 483 { | |
| 484 size_t length = (size * nmemb); | |
| 485 | |
| 486 // Check if we can read the whole chunk | |
| 487 if (((size_t) f->dataOffset + length) >= f->dataSize) | |
| 488 { | |
| 489 nmemb = (f->dataSize - f->dataOffset) / size; | |
| 490 length = size * nmemb; | |
| 491 } | |
| 492 | |
| 493 memcpy(buf, f->data + f->dataOffset, length); | |
| 494 f->dataOffset += length; | |
| 495 return nmemb; | |
| 496 } | |
| 497 | |
| 498 | |
|
439
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
499 static int dm_mem_fputc(int ch, DMResource * f) |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
500 { |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
501 // Check for EOF |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
502 if ((size_t) f->dataOffset < f->dataSize) |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
503 { |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
504 f->data[f->dataOffset++] = ch; |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
505 return ch; |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
506 } |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
507 else |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
508 return EOF; |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
509 } |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
510 |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
511 |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
512 static size_t dm_mem_fwrite(void *buf, size_t size, size_t nmemb, DMResource * f) |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
513 { |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
514 size_t length = (size * nmemb); |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
515 |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
516 // Check if we can write the whole chunk |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
517 if (((size_t) f->dataOffset + length) >= f->dataSize) |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
518 { |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
519 nmemb = (f->dataSize - f->dataOffset) / size; |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
520 length = size * nmemb; |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
521 } |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
522 |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
523 if (length > 0) |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
524 { |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
525 memcpy(f->data + f->dataOffset, buf, length); |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
526 f->dataOffset += length; |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
527 } |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
528 return nmemb; |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
529 } |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
530 |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
531 |
|
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
532 |
|
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
533 #ifdef DM_USE_PACKFS |
| 0 | 534 DMResourceOps dfPackFileOps = |
| 535 { | |
| 536 dm_mem_ferror, | |
| 537 dm_mem_fseek, | |
| 538 dm_mem_fsize, | |
| 539 dm_mem_ftell, | |
| 540 dm_mem_feof, | |
| 541 dm_mem_fgetc, | |
|
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
542 NULL, |
| 0 | 543 dm_mem_fread, |
|
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
544 NULL, |
| 0 | 545 |
| 546 NULL, | |
|
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
547 dm_pack_fclose, |
| 0 | 548 dm_pack_preload |
| 549 }; | |
|
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
550 #endif |
| 0 | 551 |
| 552 | |
| 553 DMResourceOps dfMemIOFileOps = | |
| 554 { | |
| 555 dm_mem_ferror, | |
| 556 dm_mem_fseek, | |
| 557 dm_mem_fsize, | |
| 558 dm_mem_ftell, | |
| 559 dm_mem_feof, | |
| 560 dm_mem_fgetc, | |
|
439
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
561 dm_mem_fputc, |
| 0 | 562 dm_mem_fread, |
|
439
bc1da1f4cb4b
Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write.
Matti Hamalainen <ccr@tnsp.org>
parents:
437
diff
changeset
|
563 dm_mem_fwrite, |
| 0 | 564 |
| 565 NULL, | |
| 566 NULL, | |
| 567 NULL | |
| 568 }; | |
| 569 | |
| 570 | |
| 571 /* FS file handling functions. These functions call the actual | |
| 572 * functions depending on where the file is located. | |
| 573 */ | |
|
603
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
574 static void dmf_reset(DMResource *handle) |
|
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
575 { |
|
609
877dba1b8a1f
Fix some resource code checks.
Matti Hamalainen <ccr@tnsp.org>
parents:
604
diff
changeset
|
576 if (handle != NULL && handle->fops != NULL) |
|
603
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
577 dmfseek(handle, 0, SEEK_SET); |
|
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
578 } |
|
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
579 |
|
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
580 |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
581 static void dmf_init_fops(DMResource *handle) |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
582 { |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
583 // Check fops |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
584 if (handle->fops == NULL) |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
585 { |
|
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
586 #ifdef DM_USE_PACKFS |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
587 if (handle->lib->flags & DRF_USE_PACK) |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
588 handle->fops = &dfPackFileOps; |
|
613
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
589 |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
590 # ifdef DM_USE_STDIO |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
591 else |
|
613
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
592 if (handle->lib->flags & DRF_USE_STDIO) |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
593 handle->fops = &dfStdioFileOps; |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
594 # else |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
595 handle->fops = &dfPackFileOps; |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
596 # endif |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
597 #endif |
|
609
877dba1b8a1f
Fix some resource code checks.
Matti Hamalainen <ccr@tnsp.org>
parents:
604
diff
changeset
|
598 |
|
877dba1b8a1f
Fix some resource code checks.
Matti Hamalainen <ccr@tnsp.org>
parents:
604
diff
changeset
|
599 dmf_reset(handle); |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
600 } |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
601 } |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
602 |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
603 |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
604 int dmf_preload(DMResource *handle) |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
605 { |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
606 int ret = DMERR_INIT_FAIL; |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
607 |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
608 // Check if we want to preload raw data? |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
609 if ((handle->flags & DMF_PRELOAD_RAW) || |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
610 (handle->lib->flags & DRF_PRELOAD_ALL)) |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
611 { |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
612 if (handle->flags & DMF_LOADED_RAW) |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
613 ret = DMERR_OK; |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
614 else |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
615 if (handle->fops->preload != NULL) |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
616 { |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
617 ret = handle->fops->preload(handle); |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
618 if (ret == DMERR_OK) |
| 604 | 619 { |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
620 handle->flags |= DMF_LOADED_RAW; |
| 604 | 621 } |
| 627 | 622 dmf_reset(handle); |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
623 } |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
624 } |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
625 else |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
626 { |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
627 if (handle->fops->fopen != NULL) |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
628 ret = handle->fops->fopen(handle); |
|
603
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
629 else |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
630 return DMERR_FOPEN; |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
631 } |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
632 |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
633 |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
634 // Check if resource data is to be preloaded |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
635 if ((handle->flags & DMF_PRELOAD_RES) || (handle->lib->flags & DRF_PRELOAD_RES)) |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
636 { |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
637 if (handle->flags & DMF_LOADED_RES) |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
638 ret = DMERR_OK; |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
639 else |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
640 if (handle->rops != NULL && |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
641 handle->rops->load != NULL) |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
642 { |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
643 ret = handle->rops->load(handle); |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
644 if (ret == DMERR_OK) |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
645 { |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
646 // Okay, mark as loaded |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
647 handle->flags |= DMF_LOADED_RES; |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
648 |
|
602
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
649 // Check if we can purge the raw data now |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
650 if ((handle->flags & DMF_PERSIST) == 0) |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
651 dmres_purge_raw_data(handle); |
|
c1a5652e473d
Sanitize resource preloading function a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
553
diff
changeset
|
652 } |
| 627 | 653 |
| 654 dmf_reset(handle); | |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
655 } |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
656 } |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
657 |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
658 return ret; |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
659 } |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
660 |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
661 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
662 DMResource *dmf_open(DMResourceLib *lib, const char *filename) |
| 0 | 663 { |
| 664 int ret; | |
| 665 DMResource *handle; | |
| 666 | |
| 667 // Check master directory for resource | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
668 if ((handle = dmres_find(lib, filename)) == NULL) |
| 0 | 669 { |
|
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
670 #ifdef DM_USE_STDIO |
|
613
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
671 if (lib->flags & DRF_USE_STDIO) |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
672 { |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
673 // Hmm.. does not exist? Fall back to a stdio file |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
674 handle = dmres_new(lib, filename, 0, 0); |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
675 if (handle == NULL) |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
676 return NULL; |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
677 |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
678 handle->fops = &dfStdioFileOps; |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
679 } |
|
15cd5b8a29b2
Add DRF_USE_STDIO flag for resources.
Matti Hamalainen <ccr@tnsp.org>
parents:
609
diff
changeset
|
680 else |
| 0 | 681 return NULL; |
| 682 #else | |
| 683 // Stdio not enabled, fail | |
| 684 return NULL; | |
| 685 #endif | |
| 686 } | |
| 687 | |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
688 // Initialize file ops |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
689 dmf_init_fops(handle); |
| 0 | 690 |
| 691 // Check if the data is preloaded | |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
692 if (handle->flags & DMF_LOADED_RAW) |
| 0 | 693 { |
| 694 dmres_ref(handle); | |
| 695 return handle; | |
| 696 } | |
| 697 | |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
698 // Try preloading |
|
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
699 ret = dmf_preload(handle); |
| 0 | 700 |
| 701 if (ret == DMERR_OK) | |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
702 { |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
703 dmres_ref(handle); |
| 0 | 704 return handle; |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
705 } |
| 0 | 706 |
| 707 return NULL; | |
| 708 } | |
| 709 | |
| 710 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
711 DMResource * dmf_create_memio(DMResourceLib *lib, const char *filename, Uint8 *buf, size_t len) |
| 0 | 712 { |
| 713 DMResource *handle; | |
| 714 | |
| 715 // Check master directory for resource | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
716 if ((handle = dmres_find(lib, filename)) == NULL) |
| 0 | 717 { |
| 718 // Hmm.. does not exist? Fall back to a stdio file | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
719 handle = dmres_new(lib, filename, DMF_LOADED_RAW, len); |
| 0 | 720 if (handle == NULL) |
| 721 return NULL; | |
| 722 | |
| 723 handle->fops = &dfMemIOFileOps; | |
| 724 handle->data = buf; | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
725 dmres_insert(lib, handle); |
| 0 | 726 } |
| 727 | |
| 728 // Increase refcount | |
| 729 dmres_ref(handle); | |
| 730 | |
|
603
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
602
diff
changeset
|
731 dmf_reset(handle); |
| 0 | 732 return handle; |
| 733 } | |
| 734 | |
| 735 | |
|
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
736 #ifdef DM_USE_STDIO |
|
74
23ac82365a65
Add file mode to dmf_create_stdio().
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
737 DMResource * dmf_create_stdio(const char *filename, const char *mode) |
| 0 | 738 { |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
739 DMResource *handle = dmres_new(NULL, filename, 0, 0); |
| 0 | 740 if (handle == NULL) |
| 741 return NULL; | |
| 742 | |
| 743 handle->fops = &dfStdioFileOps; | |
| 744 | |
|
74
23ac82365a65
Add file mode to dmf_create_stdio().
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
745 handle->fh = fopen(filename, mode); |
| 0 | 746 handle->error = dmGetErrno(); |
| 747 | |
| 748 if (handle->fh != NULL) | |
| 749 { | |
| 750 dmres_ref(handle); | |
| 751 return handle; | |
| 752 } | |
| 753 else | |
| 754 { | |
| 755 dmres_free(handle); | |
| 756 return NULL; | |
| 757 } | |
| 758 } | |
| 759 | |
| 760 | |
| 761 DMResource * dmf_create_stdio_stream(FILE *fh) | |
| 762 { | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
763 DMResource *handle = dmres_new(NULL, "", 0, 0); |
| 0 | 764 if (handle == NULL) |
| 765 return NULL; | |
| 766 | |
| 767 handle->fops = &dfStdioFHOps; | |
| 768 handle->fh = fh; | |
| 769 dmres_ref(handle); | |
| 770 return handle; | |
| 771 } | |
| 772 #endif | |
| 773 | |
| 774 | |
| 775 void dmf_close(DMResource * f) | |
| 776 { | |
| 777 if (f == NULL) | |
| 778 return; | |
| 779 | |
| 780 if (f->fops->fclose != NULL) | |
| 781 f->fops->fclose(f); | |
| 782 | |
| 783 dmres_unref(f); | |
| 784 } | |
| 785 | |
| 786 | |
| 787 int dmferror(DMResource * f) | |
| 788 { | |
| 789 f->atime = time(NULL); | |
| 790 return f->fops->ferror(f); | |
| 791 } | |
| 792 | |
| 793 int dmfseek(DMResource * f, off_t offset, int whence) | |
| 794 { | |
| 795 f->atime = time(NULL); | |
| 796 return f->fops->fseek(f, offset, whence); | |
| 797 } | |
| 798 | |
| 799 off_t dmfsize(DMResource * f) | |
| 800 { | |
| 801 f->atime = time(NULL); | |
| 802 return f->fops->fsize(f); | |
| 803 } | |
| 804 | |
| 805 off_t dmftell(DMResource * f) | |
| 806 { | |
| 807 f->atime = time(NULL); | |
| 808 return f->fops->ftell(f); | |
| 809 } | |
| 810 | |
| 811 BOOL dmfeof(DMResource * f) | |
| 812 { | |
| 813 f->atime = time(NULL); | |
| 814 return f->fops->feof(f); | |
| 815 } | |
| 816 | |
| 817 int dmfgetc(DMResource * f) | |
| 818 { | |
| 819 f->atime = time(NULL); | |
| 820 return f->fops->fgetc(f); | |
| 821 } | |
| 822 | |
|
74
23ac82365a65
Add file mode to dmf_create_stdio().
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
823 int dmfputc(int v, DMResource * f) |
|
72
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
824 { |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
825 f->atime = time(NULL); |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
826 return f->fops->fputc(v, f); |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
827 } |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
828 |
| 0 | 829 size_t dmfread(void *ptr, size_t size, size_t nmemb, DMResource * f) |
| 830 { | |
| 831 f->atime = time(NULL); | |
| 832 return f->fops->fread(ptr, size, nmemb, f); | |
| 833 } | |
| 834 | |
|
72
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
835 size_t dmfwrite(void *ptr, size_t size, size_t nmemb, DMResource * f) |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
836 { |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
837 f->atime = time(NULL); |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
838 return f->fops->fwrite(ptr, size, nmemb, f); |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
839 } |
|
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
840 |
| 235 | 841 char *dmfgets(char *s, int size, DMResource * f) |
| 842 { | |
| 843 char *p = s, c; | |
| 844 int n = 0; | |
| 845 | |
| 846 while ((c = f->fops->fgetc(f)) != EOF) | |
| 847 { | |
|
237
6d9d43bb68eb
Oops, another silly issue in dmfgets().
Matti Hamalainen <ccr@tnsp.org>
parents:
236
diff
changeset
|
848 n++; |
| 235 | 849 if (c == '\n') |
| 850 break; | |
| 851 else | |
| 852 if (n < size - 1) | |
| 853 *p++ = c; | |
| 854 } | |
| 855 *p = 0; | |
| 856 | |
|
236
8189be40ed7c
Oops, dmfgets() had a nasty think-o and counted the remaining buffer space
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
857 return (n > 0) ? s : NULL; |
| 235 | 858 } |
| 859 | |
| 860 | |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
861 int dmres_ref(DMResource *node) |
| 0 | 862 { |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
863 if (node->lib != NULL) dmMutexLock(node->lib->mutex); |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
864 node->atime = time(NULL); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
865 node->refcount++; |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
866 if (node->lib != NULL) dmMutexUnlock(node->lib->mutex); |
| 0 | 867 |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
868 return node->refcount; |
| 0 | 869 } |
| 870 | |
| 871 | |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
872 int dmres_unref(DMResource *node) |
| 0 | 873 { |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
874 if (node->lib != NULL) dmMutexLock(node->lib->mutex); |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
875 node->refcount--; |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
876 if (node->lib != NULL) dmMutexUnlock(node->lib->mutex); |
| 0 | 877 |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
878 return node->refcount; |
| 0 | 879 } |
| 880 | |
| 881 | |
|
114
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
882 #define NADDFLAG(flg, ch) \ |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
883 do { \ |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
884 if ((flags & (flg)) && offs < size - 1) \ |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
885 str[offs++] = ch; \ |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
886 } while (0) |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
887 |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
888 void dmres_flags_to_symbolic(char *str, size_t size, int flags) |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
889 { |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
890 size_t offs = 0; |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
891 NADDFLAG(DMF_PRELOAD_RAW, 'r'); |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
892 NADDFLAG(DMF_PRELOAD_RES, 'e'); |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
893 NADDFLAG(DMF_PERSIST, 'p'); |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
894 NADDFLAG(DMF_STREAM, 's'); |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
895 if (offs < size) |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
896 str[offs] = 0; |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
897 } |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
898 |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
899 #undef NADDFLAG |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
900 |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
901 |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
902 int dmres_symbolic_to_flags(const char *str) |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
903 { |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
904 int offs, flags; |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
905 |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
906 for (flags = offs = 0; str[offs]; offs++) |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
907 switch (tolower(str[offs])) |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
908 { |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
909 case 'r': flags |= DMF_PRELOAD_RAW; break; |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
910 case 'e': flags |= DMF_PRELOAD_RES; break; |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
911 case 'p': flags |= DMF_PERSIST; break; |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
912 case 's': flags |= DMF_STREAM; break; |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
913 } |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
914 return flags; |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
915 } |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
916 |
|
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
917 |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
918 #ifdef DM_USE_STDIO |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
919 static int dmres_load_directory(DMResourceLib *lib, const char *path) |
| 0 | 920 { |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
921 int res = DMERR_OK; |
| 630 | 922 struct dirent *dh; |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
923 DIR *hdir = opendir(path); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
924 if (hdir == NULL) |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
925 return dmGetErrno(); |
| 0 | 926 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
927 dmMutexLock(lib->mutex); |
| 0 | 928 |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
929 do |
| 0 | 930 { |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
931 DMResource *node = NULL; |
| 630 | 932 dh = readdir(hdir); |
| 933 if (dh != NULL) | |
| 0 | 934 { |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
935 struct stat sbuf; |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
936 char *fname = dm_strdup_printf("%s/%s", path, dh->d_name); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
937 if (stat(fname, &sbuf) == -1) |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
938 { |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
939 res = dmGetErrno(); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
940 dmError("Could not stat() %s, #%d: %s\n", |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
941 fname, res, dmErrorStr(res)); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
942 dmFree(fname); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
943 goto out; |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
944 } |
| 0 | 945 |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
946 if (S_ISREG(sbuf.st_mode)) |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
947 node = dmres_new(lib, dh->d_name, 0, sbuf.st_size); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
948 } |
| 630 | 949 |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
950 if (node != NULL) |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
951 { |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
952 node->fops = &dfStdioFileOps; |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
953 dmres_insert(lib, node); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
954 } |
| 630 | 955 } while (dh != NULL); |
| 0 | 956 |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
957 out: |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
958 dmMutexUnlock(lib->mutex); |
| 0 | 959 |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
960 #ifdef __WIN32 |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
961 #else |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
962 closedir(hdir); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
963 #endif |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
964 |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
965 return res; |
| 0 | 966 } |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
967 #endif |
| 0 | 968 |
| 969 | |
| 970 /* Resources subsystem initialization and shutdown routines | |
| 971 */ | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
972 int dmres_init(DMResourceLib **plib, const char *filename, const char *path, const int flags, int (*classifier)(DMResource *)) |
| 0 | 973 { |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
974 DMResourceLib *lib; |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
975 BOOL initialized = FALSE; |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
976 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
977 // Allocate the resource library structure |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
978 if ((*plib = lib = dmMalloc0(sizeof(DMResourceLib))) == NULL) |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
979 return DMERR_MALLOC; |
| 0 | 980 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
981 // Basic data |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
982 lib->mutex = dmCreateMutex(); |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
983 lib->flags = flags; |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
984 lib->resPath = dm_strdup((path != NULL) ? path : DMRES_DATA_PATH); |
| 0 | 985 |
| 107 | 986 |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
987 #ifdef DM_USE_PACKFS |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
988 if (!initialized && (flags & DRF_USE_PACK)) |
| 0 | 989 { |
| 990 int ret; | |
| 991 DMPackEntry *node; | |
| 992 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
993 lib->packFilename = dm_strdup((filename != NULL) ? filename : DMRES_DATA_PACK); |
| 0 | 994 |
| 995 // Initialize PACK, open as read-only | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
996 ret = dm_pack_open(lib->packFilename, &lib->packFile, TRUE); |
| 0 | 997 if (ret != DMERR_OK) |
| 998 { | |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
999 if ((flags & DRF_USE_STDIO) == 0) |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1000 { |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1001 dmError("Error opening PACK file '%s', #%i: %s\n", |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1002 lib->packFilename, ret, dmErrorStr(ret)); |
| 0 | 1003 |
| 1004 return DMERR_INIT_FAIL; | |
| 1005 } | |
| 1006 } | |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1007 else |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1008 { |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1009 // Initialize resources from a PACK file |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1010 for (node = lib->packFile->entries; node != NULL; node = node->next) |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1011 { |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1012 DMResource *res = dmres_new(lib, node->filename, node->resFlags & DMF_MASK, node->size); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1013 if (res == NULL) |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1014 { |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1015 dmError("Could not allocate memory for resource node '%s' [0x%08x], %d.\n", |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1016 node->filename, node->resFlags, node->size); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1017 return DMERR_INIT_FAIL; |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1018 } |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1019 |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1020 dmres_insert(lib, res); |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1021 } |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1022 |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1023 initialized = TRUE; |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1024 } |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1025 } |
| 0 | 1026 #endif |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1027 |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1028 #ifdef DM_USE_STDIO |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1029 if (!initialized && (flags & DRF_USE_STDIO)) |
| 0 | 1030 { |
| 1031 // Initialize resources from a resource directory | |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1032 int ret = dmres_load_directory(lib, lib->resPath); |
| 0 | 1033 if (ret != DMERR_OK) |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1034 return ret; |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1035 initialized = TRUE; |
| 0 | 1036 } |
|
625
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1037 #endif |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1038 |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1039 if (!initialized) |
|
e8fc083b7499
More work on resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
613
diff
changeset
|
1040 return DMERR_INIT_FAIL; |
| 0 | 1041 |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1042 // Okay, classify resources |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1043 if (lib->resources != NULL && classifier != NULL) |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1044 { |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1045 DMResource *node; |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1046 for (node = lib->resources; node != NULL; node = node->next) |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1047 { |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1048 int ret = classifier(node); |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1049 if (ret != DMERR_OK) |
| 107 | 1050 return ret; |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1051 } |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1052 } |
| 0 | 1053 |
| 1054 // Initialization complete | |
| 1055 return DMERR_OK; | |
| 1056 } | |
| 1057 | |
| 1058 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1059 int dmres_close(DMResourceLib *lib) |
| 0 | 1060 { |
| 1061 DMResource *node; | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1062 |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1063 if (lib == NULL) |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1064 return DMERR_NULLPTR; |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1065 |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1066 dmMutexLock(lib->mutex); |
| 0 | 1067 |
| 1068 // Shutdown possible subsystems | |
|
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
1069 #ifdef DM_USE_PACKFS |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1070 if (lib->flags & DRF_USE_PACK) |
| 0 | 1071 { |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1072 int res = dm_pack_close(lib->packFile); |
| 0 | 1073 if (res != DMERR_OK) |
| 1074 { | |
| 1075 dmError("Error closing PACK, #%i: %s\n", | |
| 1076 res, dmErrorStr(res)); | |
| 1077 } | |
| 1078 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1079 dmFree(lib->packFilename); |
| 0 | 1080 } |
| 1081 #endif | |
| 1082 | |
| 1083 // Free resource entries | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1084 node = lib->resources; |
| 0 | 1085 while (node != NULL) |
| 1086 { | |
| 1087 DMResource *next = node->next; | |
| 1088 dmres_free(node); | |
| 1089 node = next; | |
| 1090 } | |
| 1091 | |
| 1092 // Etc. | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1093 dmFree(lib->resPath); |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1094 dmMutexUnlock(lib->mutex); |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1095 dmDestroyMutex(lib->mutex); |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1096 return DMERR_OK; |
| 0 | 1097 } |
| 1098 | |
| 1099 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1100 int dmres_preload(DMResourceLib *lib, BOOL start, int *loaded, int *total) |
| 0 | 1101 { |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1102 int ret = DMERR_OK; |
| 0 | 1103 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1104 dmMutexLock(lib->mutex); |
| 0 | 1105 |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1106 // Initialize preloading |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1107 if (lib->preload == NULL || start) |
| 0 | 1108 { |
| 1109 DMResource *node; | |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1110 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1111 lib->preload = lib->resources; |
| 0 | 1112 *loaded = 0; |
| 1113 *total = 0; | |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1114 |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1115 // Calculate total number of resources to be preloaded |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1116 for (node = lib->resources; node != NULL; node = node->next) |
| 0 | 1117 { |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1118 if ((lib->flags & (DRF_PRELOAD_ALL | DRF_PRELOAD_RES)) || |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1119 (node->flags & (DMF_PRELOAD_RAW | DMF_PRELOAD_RES))) |
| 0 | 1120 (*total)++; |
| 1121 } | |
| 1122 } | |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1123 else |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1124 if (lib->preload != NULL) |
| 0 | 1125 { |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1126 // Initialize fops and preload |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1127 dmf_init_fops(lib->preload); |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1128 if ((ret = dmf_preload(lib->preload)) != DMERR_OK) |
|
628
0533f94e843b
Add error message to failed preloading.
Matti Hamalainen <ccr@tnsp.org>
parents:
627
diff
changeset
|
1129 { |
|
0533f94e843b
Add error message to failed preloading.
Matti Hamalainen <ccr@tnsp.org>
parents:
627
diff
changeset
|
1130 dmError("Error preloading '%s', %d: %s\n", |
|
0533f94e843b
Add error message to failed preloading.
Matti Hamalainen <ccr@tnsp.org>
parents:
627
diff
changeset
|
1131 lib->preload->filename, ret, dmErrorStr(ret)); |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1132 goto error; |
|
628
0533f94e843b
Add error message to failed preloading.
Matti Hamalainen <ccr@tnsp.org>
parents:
627
diff
changeset
|
1133 } |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1134 |
|
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1135 (*loaded)++; |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1136 lib->preload = lib->preload->next; |
| 0 | 1137 } |
| 1138 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1139 dmMutexUnlock(lib->mutex); |
|
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1140 return (lib->preload == NULL) ? DMERR_OK : DMERR_PROGRESS; |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1141 |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1142 error: |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1143 dmMutexUnlock(lib->mutex); |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1144 return ret; |
| 0 | 1145 } |
| 1146 | |
| 1147 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1148 void dmres_prune(DMResourceLib *lib, int agems, int flags) |
| 0 | 1149 { |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1150 DMResource *node; |
| 0 | 1151 int currtime = time(NULL); |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1152 dmMutexLock(lib->mutex); |
| 0 | 1153 |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1154 for (node = lib->resources; node != NULL; node = node->next) |
| 0 | 1155 { |
| 1156 // Check if node has refcount of 0 and is | |
| 1157 // not marked as persistent resource | |
|
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1158 if (node->refcount == 0 && |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1159 (node->flags & DMF_PERSIST) == 0 && |
|
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1160 (node->flags & (DMF_LOADED_RES | DMF_LOADED_RAW))) |
| 0 | 1161 { |
| 1162 // Check if we match either one of atime or mtime | |
| 1163 if (((flags & DMPRUNE_ATIME) && | |
| 1164 currtime - node->atime >= agems) || | |
| 1165 ((flags & DMPRUNE_MTIME) && | |
| 1166 currtime - node->mtime >= agems)) | |
| 1167 { | |
|
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1168 dmres_free_res_data(node); |
|
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1169 dmres_free_raw_data(node); |
| 0 | 1170 } |
| 1171 } | |
| 1172 } | |
| 1173 | |
|
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1174 dmMutexUnlock(lib->mutex); |
| 0 | 1175 } |
| 1176 | |
| 1177 | |
| 1178 /* Helper resource access routines | |
| 1179 */ | |
|
553
b60220fd1669
s/Uint8/void/ in dmf_{read,write}_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
439
diff
changeset
|
1180 int dmf_read_str(DMResource *f, void *s, size_t l) |
| 0 | 1181 { |
|
553
b60220fd1669
s/Uint8/void/ in dmf_{read,write}_str().
Matti Hamalainen <ccr@tnsp.org>
parents:
439
diff
changeset
|
1182 return dmfread(s, 1, l, f) == l; |
| 0 | 1183 } |
| 1184 | |
|
437
3d9c044ec08d
Add dmf_{write,read}_byte() convenience functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
406
diff
changeset
|
1185 BOOL dmf_read_byte(DMResource *f, Uint8 *val) |
|
3d9c044ec08d
Add dmf_{write,read}_byte() convenience functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
406
diff
changeset
|
1186 { |
|
3d9c044ec08d
Add dmf_{write,read}_byte() convenience functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
406
diff
changeset
|
1187 int tmp = dmfgetc(f); |
|
3d9c044ec08d
Add dmf_{write,read}_byte() convenience functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
406
diff
changeset
|
1188 *val = tmp; |
|
3d9c044ec08d
Add dmf_{write,read}_byte() convenience functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
406
diff
changeset
|
1189 return tmp != EOF; |
|
3d9c044ec08d
Add dmf_{write,read}_byte() convenience functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
406
diff
changeset
|
1190 } |
| 0 | 1191 |
| 1192 #define DM_DEFINE_FUNC(xname, xtype, xmacro) \ | |
| 1193 BOOL dmf_read_ ## xname (DMResource *f, xtype *v) { \ | |
| 1194 xtype result; \ | |
| 1195 if (dmfread(&result, sizeof( xtype ), 1, f) != 1) \ | |
| 1196 return FALSE; \ | |
| 1197 *v = DM_ ## xmacro ## _TO_NATIVE (result); \ | |
| 1198 return TRUE; \ | |
| 1199 } | |
| 1200 | |
| 1201 DM_DEFINE_FUNC(le16, Uint16, LE16) | |
| 1202 DM_DEFINE_FUNC(le32, Uint32, LE32) | |
| 1203 | |
| 1204 DM_DEFINE_FUNC(be16, Uint16, BE16) | |
| 1205 DM_DEFINE_FUNC(be32, Uint32, BE32) | |
| 1206 | |
| 1207 #ifdef DM_HAVE_64BIT | |
| 1208 DM_DEFINE_FUNC(le64, Uint64, LE64) | |
| 1209 DM_DEFINE_FUNC(be64, Uint64, BE64) | |
| 1210 #endif |