Fix Windows warning; fix nopreempt test templatex

DynamoRIO · Nov 22, 2023 · 3358aee · 3358aee
1 parent 71f7490
commit 3358aee
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/clients/drcachesim/scheduler/scheduler.cpp b/clients/drcachesim/scheduler/scheduler.cpp
@@ -632,7 +632,7 @@ scheduler_tmpl_t<RecordType, ReaderType>::init(
         }
     }
     VPRINT(this, 1, "%zu inputs\n", inputs_.size());
-    live_input_count_.store(inputs_.size(), std::memory_order_release);
+    live_input_count_.store(static_cast<int>(inputs_.size()), std::memory_order_release);
     return set_initial_schedule(workload2inputs);
 }
 

diff --git a/clients/drcachesim/tests/schedule_stats_nopreempt.templatex b/clients/drcachesim/tests/schedule_stats_nopreempt.templatex
@@ -4,83 +4,83 @@ Total counts:
            8 threads
       638938 instructions
            5 total context switches
-   0.0078255 CSPKI \(context switches per 1000 instructions\)
+   0\.0078255 CSPKI \(context switches per 1000 instructions\)
       127788 instructions per context switch
            5 voluntary context switches
            0 direct context switches
-      100.00% voluntary switches
-        0.00% direct switches
+      100\.00% voluntary switches
+        0\.00% direct switches
          161 system calls
            2 maybe-blocking system calls
            0 direct switch requests
            0 waits
-           0 idles
-      100.00% cpu busy
+    *[0-9]* idles
+      *[0-9\.]*% cpu busy
 Core #0 counts:
            . threads
       *[0-9]* instructions
            . total context switches
-   0.0[0-9.]* CSPKI \(context switches per 1000 instructions\)
+   0\.0[0-9\.]* CSPKI \(context switches per 1000 instructions\)
       *[0-9]* instructions per context switch
            . voluntary context switches
            0 direct context switches
-      100.00% voluntary switches
-        0.00% direct switches
+      100\.00% voluntary switches
+        0\.00% direct switches
          *[0-9]* system calls
            . maybe-blocking system calls
            0 direct switch requests
            0 waits
-           0 idles
-      100.00% cpu busy
+    *[0-9]* idles
+      *[0-9\.]*% cpu busy
 Core #1 counts:
            . threads
       *[0-9]* instructions
            . total context switches
-   0.0[0-9.]* CSPKI \(context switches per 1000 instructions\)
+   0\.0[0-9\.]* CSPKI \(context switches per 1000 instructions\)
       *[0-9]* instructions per context switch
            . voluntary context switches
            0 direct context switches
-      100.00% voluntary switches
-        0.00% direct switches
+      100\.00% voluntary switches
+        0\.00% direct switches
          *[0-9]* system calls
            . maybe-blocking system calls
            0 direct switch requests
            0 waits
-           0 idles
-      100.00% cpu busy
+    *[0-9]* idles
+      *[0-9\.]*% cpu busy
 Core #2 counts:
            . threads
       *[0-9]* instructions
            . total context switches
-   0.0[0-9.]* CSPKI \(context switches per 1000 instructions\)
+   0\.0[0-9\.]* CSPKI \(context switches per 1000 instructions\)
       *[0-9]* instructions per context switch
            . voluntary context switches
            0 direct context switches
-      100.00% voluntary switches
-        0.00% direct switches
+      100\.00% voluntary switches
+        0\.00% direct switches
          *[0-9]* system calls
            . maybe-blocking system calls
            0 direct switch requests
            0 waits
-           0 idles
-      100.00% cpu busy
+    *[0-9]* idles
+      *[0-9\.]*% cpu busy
 Core #3 counts:
            . threads
       *[0-9]* instructions
            . total context switches
-   0.0[0-9.]* CSPKI \(context switches per 1000 instructions\)
+   0\.0[0-9\.]* CSPKI \(context switches per 1000 instructions\)
       *[0-9]* instructions per context switch
            . voluntary context switches
            0 direct context switches
-      100.00% voluntary switches
-        0.00% direct switches
+      100\.00% voluntary switches
+        0\.00% direct switches
          *[0-9]* system calls
            . maybe-blocking system calls
            0 direct switch requests
            0 waits
-           0 idles
-      100.00% cpu busy
-Core #0 schedule: [A-H,]*
-Core #1 schedule: [A-H,]*
-Core #2 schedule: [A-H,]*
-Core #3 schedule: [A-H,]*
+    *[0-9]* idles
+      *[0-9\.]*% cpu busy
+Core #0 schedule: [A-Ha-h_]*
+Core #1 schedule: [A-Ha-h_]*
+Core #2 schedule: [A-Ha-h_]*
+Core #3 schedule: [A-Ha-h_]*