Changes in benchmark/io/http/filecache.cfa [0aec496:d9c2284]

File:

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

benchmark/io/http/filecache.cfa

@@ -56 +56 @@
 }
 
+static inline [unsigned size, char unit] human_size( size_t size ) {
+        int idx = 0;
+        static char units [] = { ' ', 'K', 'M', 'G', 'T' };
+        while( size >= 1024 ) {
+                idx++;
+                size /= 1024;
+                if(idx >= 5) {
+                        abort("File too large to print\n");
+                }
+        }
+
+        return [size, units[idx]];
+}
 
 struct {
@@ -69 +82 @@
 
 [int fd, size_t size] get_file( * const char file, size_t len ) {
-        uint32_t idx = murmur3_32( (const uint8_t *)file, len, options.hash_seed ) % file_cache.size;
+        uint32_t idx = murmur3_32( (const uint8_t *)file, len, options.file_cache.hash_seed ) % file_cache.size;
 
         for(int i = 0;; i++) {
@@ -86 +99 @@
 
 int put_file( cache_line & entry ) {
-        uint32_t idx = murmur3_32( (const uint8_t *)entry.file, strlen(entry.file), options.hash_seed ) % file_cache.size;
+        uint32_t idx = murmur3_32( (const uint8_t *)entry.file, strlen(entry.file), options.file_cache.hash_seed ) % file_cache.size;
 
         int i = 0;
@@ -101 +114 @@
 void fill_cache( const char * path ) {
         int ret;
+        ret = chdir(path);
+        if(ret < 0) {
+                abort( "chdir error: (%d) %s\n", (int)errno, strerror(errno) );
+        }
+
         size_t fcount = 0;
         size_t fsize = 16;
@@ -118 +136 @@
                 raw[idx].file = strdup(fpath+2);
                 raw[idx].size = sb->st_size;
-                raw[idx].fd = open( fpath, options.open_flags );
-                if(raw[idx].fd < 0) {
-                        abort( "open file error: (%d) %s\n", (int)errno, strerror(errno) );
+                if( !options.file_cache.list ) {
+                        raw[idx].fd = open( fpath, options.file_cache.open_flags );
+                        if(raw[idx].fd < 0) {
+                                abort( "open file error: (%d) %s\n", (int)errno, strerror(errno) );
+                        }
                 }
                 return 0;
         }
 
-        ret = ftw(path, walk, 10);
+        ret = ftw(".", walk, 10);
         if(ret < 0) {
                 abort( "ftw error: (%d) %s\n", (int)errno, strerror(errno) );
@@ -135 +155 @@
 
         // Step 2 create the cache
-        file_cache.size = options.file_cache_size > 0 ? options.file_cache_size : fsize;
+        file_cache.size = options.file_cache.size > 0 ? options.file_cache.size : fsize;
         if( file_cache.size < fcount ) {
                 abort("File Cache too small\n");
         }
 
-        file_cache.entries = anew(fsize);
+        file_cache.entries = anew(file_cache.size);
 
         // Step 3 fill the cache
         int conflicts = 0;
         for(i; fcount) {
-                printf("Added file %s\n", raw[i].file);
                 conflicts += put_file( raw[i] );
         }
         printf("Filled cache from path \"%s\" with %zu files\n", path, fcount);
         if( conflicts > 0 ) {
-                printf("Found %d conflicts (seed: %u)\n", conflicts, options.hash_seed);
+                printf("Found %d conflicts (seed: %u)\n", conflicts, options.file_cache.hash_seed);
                 #if defined(REJECT_CONFLICTS)
                         abort("Conflicts found in the cache");
@@ -156 +175 @@
         }
 
+        if(options.file_cache.list) {
+                printf("Listing files and exiting\n");
+                for(i; fcount) {
+                        int s; char u;
+                        [s, u] = human_size(raw[i].size);
+                        printf("%4d%c - %s\n", s, u, raw[i].file);
+                        free(raw[i].file);
+                }
+                free(raw);
+                adelete(file_cache.size, file_cache.entries);
+                exit(0);
+        }
+
         // Step 4 clean up
         free( raw );
 }
+
+[int *, int] filefds(int extra) {
+        if(!file_cache.entries) {
+                abort("File cache not filled!\n");
+        }
+
+        return [aalloc(extra), 0];
+}
+
 
 void close_cache() {