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

File:

• benchmark/io/http/filecache.cfa (modified) (4 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 {
@@ -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.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) );
@@ -132 +152 @@
         if(fcount == 0) {
                 abort("No file found in path %s\n", path);
+        }
+
+        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);
+                exit(0);
         }