Changeset 3c039b0

Timestamp:

May 4, 2020, 4:20:31 PM (4 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:

61dd73d

Parents:

6502a2b

Message:

Split Complete I/O statistics into fast and slow

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (7 diffs)
• kernel.hfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -204 +204 @@
                         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;
+                        this.io.completion_q.stats.completed_avg.slow_cnt = 0;
+                        this.io.completion_q.stats.completed_avg.fast_cnt = 0;
                 #endif
 
@@ -269 +270 @@
                                         "- total submit calls  : %llu\n"
                                         "- avg submit          : %lf\n"
-                                        "- total wait calls    : %llu\n"
+                                        "- total wait calls    : %llu (%llu slow, %llu fast)\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
+                                        this.io.completion_q.stats.completed_avg.slow_cnt + this.io.completion_q.stats.completed_avg.fast_cnt,
+                                        this.io.completion_q.stats.completed_avg.slow_cnt, this.io.completion_q.stats.completed_avg.fast_cnt,
+                                        ((double)this.io.completion_q.stats.completed_avg.val) / (this.io.completion_q.stats.completed_avg.slow_cnt + this.io.completion_q.stats.completed_avg.fast_cnt)
                                 );
                         }
@@ -326 +328 @@
                 // Nothing was new return 0
                 if (head == tail) {
-                        #if !defined(__CFA_NO_STATISTICS__)
-                                ring.completion_q.stats.completed_avg.cnt += 1;
-                        #endif
                         return 0;
                 }
@@ -354 +353 @@
                 __atomic_fetch_add( ring.completion_q.head, count, __ATOMIC_RELAXED );
 
-                // 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;
         }
@@ -386 +379 @@
                                 // batton pass to the user-thread
                                 int count = __drain_io( ring, &mask, 1, true );
+
+                                // Update statistics
+                                #if !defined(__CFA_NO_STATISTICS__)
+                                        ring.completion_q.stats.completed_avg.val += count;
+                                        ring.completion_q.stats.completed_avg.slow_cnt += 1;
+                                #endif
+
                                 if(count > 0) {
                                         __cfadbg_print_safe(io_core, "Kernel I/O : Moving to ring %p to fast poller\n", &ring);
@@ -395 +395 @@
 
                                 //In the naive approach, just poll the io completion queue directly
-                                __drain_io( ring, &mask, 1, true );
+                                int count = __drain_io( ring, &mask, 1, true );
+
+                                // Update statistics
+                                #if !defined(__CFA_NO_STATISTICS__)
+                                        ring.completion_q.stats.completed_avg.val += count;
+                                        ring.completion_q.stats.completed_avg.slow_cnt += 1;
+                                #endif
 
                         #endif
@@ -416 +422 @@
                                 // Drain the io
                                 this.waiting = false;
-                                int ret = __drain_io( *this.ring, 0p, 0, false );
+                                int count = __drain_io( *this.ring, 0p, 0, false );
+
+                                // Update statistics
+                                #if !defined(__CFA_NO_STATISTICS__)
+                                        this.ring->completion_q.stats.completed_avg.val += count;
+                                        this.ring->completion_q.stats.completed_avg.fast_cnt += 1;
+                                #endif
+
                                 this.waiting = true;
-                                if(0 > ret) {
+                                if(0 > count) {
                                         // If we got something, just yield and check again
                                         yield();

libcfa/src/concurrency/kernel.hfa

@@ -182 +182 @@
                         struct {
                                 unsigned long long int val;
-                                unsigned long long int cnt;
+                                unsigned long long int slow_cnt;
+                                unsigned long long int fast_cnt;
                         } completed_avg;
                 } stats;