Changeset 038be32

Timestamp:

Apr 24, 2020, 4:17:33 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

44aad8f

Parents:

0ea6c5a

Message:

added defines and bool for whether or not to print statistics

Files:

• benchmark/io/readv.cfa (modified) (2 diffs)
• libcfa/src/concurrency/io.cfa (modified) (5 diffs)
• libcfa/src/concurrency/kernel.cfa (modified) (1 diff)
• libcfa/src/concurrency/kernel.hfa (modified) (4 diffs)

benchmark/io/readv.cfa

@@ -40 +40 @@
 
 int main(int argc, char * argv[]) {
+        #if !defined(__CFA_NO_STATISTICS__)
+                print_stats_at_exit( *active_cluster() );
+        #endif
+
         double duration   = 5.0;
         unsigned long int nthreads = 2;
@@ -46 +50 @@
         printf("Setting local\n");
         setlocale(LC_NUMERIC, "");
-
 
         arg_loop:

libcfa/src/concurrency/io.cfa

@@ -177 +177 @@
 
                 // Initialize statistics
-                this.io.submit_q.stats.submit_avg.val = 0;
-                this.io.submit_q.stats.submit_avg.cnt = 0;
-                this.io.completion_q.stats.completed_avg.val = 0;
-                this.io.completion_q.stats.completed_avg.cnt = 0;
+                #if !defined(__CFA_NO_STATISTICS__)
+                        this.io.submit_q.stats.submit_avg.val = 0;
+                        this.io.submit_q.stats.submit_avg.cnt = 0;
+                        this.io.completion_q.stats.completed_avg.val = 0;
+                        this.io.completion_q.stats.completed_avg.cnt = 0;
+                #endif
 
                 // Create the poller thread
@@ -198 +200 @@
 
                 // print statistics
-                __cfaabi_bits_print_safe( STDERR_FILENO,
-                        "----- I/O uRing Stats -----\n"
-                        "- total submit calls  : %llu\n"
-                        "- avg submit          : %lf\n"
-                        "- total wait calls    : %llu\n"
-                        "- avg completion/wait : %lf\n",
-                        this.io.submit_q.stats.submit_avg.cnt,
-                        ((double)this.io.submit_q.stats.submit_avg.val) / this.io.submit_q.stats.submit_avg.cnt,
-                        this.io.completion_q.stats.completed_avg.cnt,
-                        ((double)this.io.completion_q.stats.completed_avg.val) / this.io.completion_q.stats.completed_avg.cnt
-                );
+                #if !defined(__CFA_NO_STATISTICS__)
+                        if(this.print_stats) {
+                                __cfaabi_bits_print_safe( STDERR_FILENO,
+                                        "----- I/O uRing Stats -----\n"
+                                        "- total submit calls  : %llu\n"
+                                        "- avg submit          : %lf\n"
+                                        "- total wait calls    : %llu\n"
+                                        "- avg completion/wait : %lf\n",
+                                        this.io.submit_q.stats.submit_avg.cnt,
+                                        ((double)this.io.submit_q.stats.submit_avg.val) / this.io.submit_q.stats.submit_avg.cnt,
+                                        this.io.completion_q.stats.completed_avg.cnt,
+                                        ((double)this.io.completion_q.stats.completed_avg.val) / this.io.completion_q.stats.completed_avg.cnt
+                                );
+                        }
+                #endif
 
                 // Shutdown the io rings
@@ -257 +263 @@
                 // Nothing was new return 0
                 if (head == tail) {
-                        ring.completion_q.stats.completed_avg.cnt += 1;
+                        #if !defined(__CFA_NO_STATISTICS__)
+                                ring.completion_q.stats.completed_avg.cnt += 1;
+                        #endif
                         return 0;
                 }
@@ -282 +290 @@
                 __atomic_fetch_add( ring.completion_q.head, count, __ATOMIC_RELAXED );
 
-                ring.completion_q.stats.completed_avg.val += count;
-                ring.completion_q.stats.completed_avg.cnt += 1;
+                // Update statistics
+                #if !defined(__CFA_NO_STATISTICS__)
+                        ring.completion_q.stats.completed_avg.val += count;
+                        ring.completion_q.stats.completed_avg.cnt += 1;
+                #endif
 
                 return count;
@@ -377 +388 @@
                 }
 
-                ring.submit_q.stats.submit_avg.val += 1;
-                ring.submit_q.stats.submit_avg.cnt += 1;
+                // update statistics
+                #if !defined(__CFA_NO_STATISTICS__)
+                        ring.submit_q.stats.submit_avg.val += 1;
+                        ring.submit_q.stats.submit_avg.cnt += 1;
+                #endif
 
                 unlock(ring.submit_q.lock);

libcfa/src/concurrency/kernel.cfa

@@ -257 +257 @@
         ready_queue{};
         ready_queue_lock{};
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                print_stats = false;
+        #endif
 
         procs{ __get };

libcfa/src/concurrency/kernel.hfa

@@ -147 +147 @@
 
         // Statistics
-        struct {
+        #if !defined(__CFA_NO_STATISTICS__)
                 struct {
-                        unsigned long long int val;
-                        unsigned long long int cnt;
-                } submit_avg;
-        } stats;
+                        struct {
+                                unsigned long long int val;
+                                unsigned long long int cnt;
+                        } submit_avg;
+                } stats;
+        #endif
 };
 
@@ -175 +177 @@
 
         // Statistics
-        struct {
+        #if !defined(__CFA_NO_STATISTICS__)
                 struct {
-                        unsigned long long int val;
-                        unsigned long long int cnt;
-                } completed_avg;
-        } stats;
+                        struct {
+                                unsigned long long int val;
+                                unsigned long long int cnt;
+                        } completed_avg;
+                } stats;
+        #endif
 };
 
@@ -230 +234 @@
                 struct io_ring io;
         #endif
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                bool print_stats;
+        #endif
 };
 extern Duration default_preemption();
@@ -244 +252 @@
 static inline struct processor * active_processor() { return TL_GET( this_processor ); } // UNSAFE
 static inline struct cluster   * active_cluster  () { return TL_GET( this_processor )->cltr; }
+
+#if !defined(__CFA_NO_STATISTICS__)
+        static inline void print_stats_at_exit( cluster & this ) {
+                this.print_stats = true;
+        }
+#endif
 
 // Local Variables: //