Changeset 8e4aa05 for benchmark/io/http/filecache.cfa

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 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:

77d601f

Parents:

342af53 (diff), a5040fe (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) (4 diffs)

benchmark/io/http/filecache.cfa

@@ -4 +4 @@
 #include <string.h>
 
+#include <fstream.hfa>
 #include <stdlib.hfa>
 
@@ -182 +183 @@
                 conflicts += put_file( raw[i], fd );
         }
-        printf("Filled cache from path \"%s\" with %zu files\n", path, fcount);
+        sout | "Filled cache from path \"" | path | "\" with" | fcount | "files";
         if( conflicts > 0 ) {
-                printf("Found %d conflicts (seed: %u)\n", conflicts, options.file_cache.hash_seed);
+                sout | "Found" | conflicts | "conflicts (seed: " | options.file_cache.hash_seed | ")";
                 #if defined(REJECT_CONFLICTS)
                         abort("Conflicts found in the cache");
@@ -191 +192 @@
 
         if(options.file_cache.list) {
-                printf("Listing files and exiting\n");
+                sout | "Listing files and exiting";
                 for(i; fcount) {
                         int s; char u;
                         [s, u] = human_size(raw[i].size);
-                        printf("%4d%c - %s\n", s, u, raw[i].file);
+                        sout | s | u | "-" | raw[i].file;
                         free(raw[i].file);
                 }
@@ -208 +209 @@
 
 [int *, int] filefds(int extra) {
+        if(!options.file_cache.path) {
+                int * data = alloc(extra);
+                return [data, 0];
+        }
+
         if(!file_cache.entries) {
                 abort("File cache not filled!\n");