Changeset d11d6eb for benchmark/io/http/filecache.cfa

Timestamp:

Aug 28, 2020, 1:26:28 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8e3034d

Parents:

8e2cb4a

Message:

Fixed some compilation errors.
Fixed file descriptor support in progress.

File:

• benchmark/io/http/filecache.cfa (modified) (7 diffs)

benchmark/io/http/filecache.cfa

@@ -73 +73 @@
         cache_line * entries;
         size_t size;
+        int * rawfds;
+        int nfds;
 } file_cache;
 
@@ -98 +100 @@
 }
 
-int put_file( cache_line & entry ) {
+int put_file( cache_line & entry, int fd ) {
         uint32_t idx = murmur3_32( (const uint8_t *)entry.file, strlen(entry.file), options.file_cache.hash_seed ) % file_cache.size;
 
@@ -108 +110 @@
 
         file_cache.entries[idx] = entry;
+        file_cache.entries[idx].fd = fd;
         return i > 0 ? 1 : 0;
 }
@@ -121 +124 @@
         size_t fcount = 0;
         size_t fsize = 16;
-        cache_line * raw = 0p;
-        raw = alloc(raw, fsize, true);
+        cache_line * raw = alloc(fsize);
         // Step 1 get a dense array of all files
         int walk(const char *fpath, const struct stat *sb, int typeflag) {
@@ -131 +133 @@
                 if(fcount > fsize) {
                         fsize *= 2;
-                        raw = alloc(raw, fsize, true);
+                        raw = alloc(fsize, raw`realloc);
                 }
 
@@ -162 +164 @@
         file_cache.entries = anew(file_cache.size);
 
+        if(options.file_cache.fixed_fds) {
+                file_cache.nfds   = fcount;
+                file_cache.rawfds = alloc(fcount);
+        }
+
         // Step 3 fill the cache
         int conflicts = 0;
         for(i; fcount) {
-                conflicts += put_file( raw[i] );
+                int fd;
+                if(options.file_cache.fixed_fds) {
+                        file_cache.rawfds[i] = raw[i].fd;
+                        fd = i;
+                }
+                else {
+                        fd = raw[i].fd;
+                }
+                conflicts += put_file( raw[i], fd );
         }
         printf("Filled cache from path \"%s\" with %zu files\n", path, fcount);
@@ -197 +212 @@
         }
 
-        return [aalloc(extra), 0];
+        size_t s = file_cache.nfds + extra;
+        int * data = alloc(s, file_cache.rawfds`realloc);
+        return [data, file_cache.nfds];
 }