Changeset 7d94bfe3 for benchmark/io/http/filecache.cfa

Timestamp:

Jul 20, 2020, 3:52:38 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

124c1b7, 92850ef

Parents:

ffa48a8 (diff), 3f1d9b5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

benchmark/io/http/filecache.cfa

@@ -82 +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++) {
@@ -99 +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;
@@ -136 +136 @@
                 raw[idx].file = strdup(fpath+2);
                 raw[idx].size = sb->st_size;
-                if( !options.file_cache_list ) {
-                        raw[idx].fd = open( fpath, options.open_flags );
+                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) );
@@ -154 +154 @@
         }
 
-        if(options.file_cache_list) {
+        // Step 2 create the cache
+        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(file_cache.size);
+
+        // Step 3 fill the cache
+        int conflicts = 0;
+        for(i; fcount) {
+                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.file_cache.hash_seed);
+                #if defined(REJECT_CONFLICTS)
+                        abort("Conflicts found in the cache");
+                #endif
+        }
+
+        if(options.file_cache.list) {
                 printf("Listing files and exiting\n");
                 for(i; fcount) {
@@ -163 +184 @@
                 }
                 free(raw);
+                adelete(file_cache.size, file_cache.entries);
                 exit(0);
-        }
-
-        // Step 2 create the cache
-        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);
-
-        // 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);
-                #if defined(REJECT_CONFLICTS)
-                        abort("Conflicts found in the cache");
-                #endif
         }