Changes in / [f6afd84:7c4416a]

Files:

• doc/theses/colby_parsons_MMAth/benchmarks/actors/run (modified) (4 diffs)
• libcfa/src/concurrency/actor.hfa (modified) (4 diffs)

doc/theses/colby_parsons_MMAth/benchmarks/actors/run

@@ -85 +85 @@
 }
 
+#used for output formatting
 column_headers="proc\ttime (s)"
 
@@ -112 +113 @@
 numtimes=5
 
-# bench_cores='4 8'
+# bench_cores='1 2 4 8 16 24 32'
 bench_cores='1 2 4 8 16 24 32 48'
 # bench_cores='48'
 
-# toggle mem collection instead of time (executor only)
-# mem=${true}
+# toggle missed gulp tracking config (overrides specified config)
+missed_gulps=${true}
+# missed_gulps=${false}
+
+# toggle mem collection config (overrides specified config)
+# outputs mem instead of time
+mem=${true}
 mem=${false}
 
@@ -170 +176 @@
     runPROTO=${false}
     runAKKA=${false}
+    executor=${true}
+    matrix=${true}
+    repeat=${true}
+fi
+
+if [ ${mem} -eq ${true} ] ; then
+    bench_cores='48'
+    column_headers="proc\tmem (kB)"
+    names=('CFA')
+    var_flags=('-D__STEAL=1 -DSEARCH=1')
+    runCAF=${true}
+    runUCPP=${true}
+    runPROTO=${true}
+    runAKKA=${true}
+    executor=${true}
+    matrix=${false}
+    repeat=${false}
+    balance=${false}
+    static=${false}
+    dynamic=${false}
 fi
 
@@ -230 +256 @@
 
 for i in ${!names[@]}; do
-        echo -n ${names[$i]}" "
+    echo -n ${names[$i]}" "
 done
 if [ ${runCAF} -eq ${true} ] ; then

libcfa/src/concurrency/actor.hfa

@@ -38 +38 @@
 // show stats
 // #define ACTOR_STATS
+
+// used to run and only track missed queue gulps
+#ifdef ACTOR_STATS
+#define ACTOR_STATS_QUEUE_MISSED
+#endif
 
 // forward decls
@@ -129 +134 @@
         #ifdef ACTOR_STATS
         unsigned int id;
+    #endif
+    #ifdef ACTOR_STATS_QUEUE_MISSED
         size_t missed;                                                                          // transfers skipped due to being_processed flag being up
         #endif
@@ -338 +345 @@
         } // for
 
-        #ifdef ACTOR_STATS
+        #ifdef ACTOR_STATS_QUEUE_MISSED
         size_t misses = 0;
         for ( i; nrqueues ) {
@@ -365 +372 @@
         printf("\tMessages stolen:\t\t\t%lu\n\tAverage steal size:\t\t\t%lu\n", __all_msgs_stolen, avg_steal);
         #endif
+
+    #ifndef ACTOR_STATS
+    #ifdef ACTOR_STATS_QUEUE_MISSED
+    printf("\t%lu", misses);
+    #endif
+    #endif
                 
 }