fix bad comparison of possible frequency scaling governor values
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 8 Feb 2011 19:52:50 +0000 (19:52 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 8 Feb 2011 19:52:50 +0000 (19:52 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@8776 d708f5d6-7413-0410-9779-e7cbd77b26cf

tools/sanity_check/systemtest.cpp

index 0a8cae2d5f1db13a7f8f71ba327241470ff95af3..c82167fa16ce2e348ffe361a7cbcbb3f3dc527d2 100644 (file)
@@ -108,27 +108,27 @@ int system_uses_frequencyscaling() {
   char filename[256], buf[256];
 
   while (!done) {
-    (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor", cpu);
-    if (0<read_string(filename, buf, 256)) {
-      if ((0!=strcmp("performance", buf)) && 
-                                       (0!=strcmp("powersafe", buf))) {
-                               // So it's neither the "performance" nor the "powersafe" governor
-                               (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_min_freq", cpu);
-                               if (read_int(filename, &min)) {
-                                       (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq", cpu);
-                                       if (read_int(filename, &max)) {
-                                               if (min!=max) {
-                                                       // wrong governor AND different frequency limits -> scaling
-                                                       return 1;
-                                               }
-                                       
-                               }
-      }
-    } else {
-      // couldn't open file -> no more cores
-      done = 1;
-    }
-    cpu++;
+          (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor", cpu);
+          if (0<read_string(filename, buf, 256)) {
+                  if ((0!=strncmp("performance", buf, 11)) && 
+                      (0!=strncmp("powersafe", buf, 9))) {
+                          // So it's neither the "performance" nor the "powersafe" governor
+                          (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_min_freq", cpu);
+                          if (read_int(filename, &min)) {
+                                  (void) snprintf(filename, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq", cpu);
+                                  if (read_int(filename, &max)) {
+                                          if (min!=max) {
+                                                  // wrong governor AND different frequency limits -> scaling
+                                                  return 1;
+                                          }
+                                  } 
+                          }
+                  }
+          } else {
+                  // couldn't open file -> no more cores
+                  done = 1;
+          }
+          cpu++;
   }
   
   // couldn't find anything that points to scaling