projects / phoronix-test-suite.git / commitdiff
Build Results
 
Summary

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 11/25/14 12:46

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Tue 11/25/14 12:46
Michael Larabel  
phoromatic: Add support... 
Tue 11/25/14 12:34
Michael Larabel  
phoromatic: Log... 
Tue 11/25/14 12:29
Michael Larabel  
 
Tue 11/25/14 12:18
Michael Larabel  
 
Tue 11/25/14 12:08
Michael Larabel  
phoromatic: List context... 
Tue 11/25/14 11:35
Michael Larabel  
phoromatic: Allow logging... 
 
> --git a/CHANGE-LOG b/CHANGE-LOG
index da296fa
..3e9ed25 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -8,+8,@@ Phoronix Test Suite (Git)
 - 
pts_GraphBegin unifying the Phoronix Test Suite and OpenBenchmarking.org theme
 
phodeviRemove support for the deprecated HAL Linux fall-backs
 
phodeviLLVM compiler reporting build configuration enhancements
+- phodeviSupport for reporting multiple mmcblkdisk devices
 
graphics_event_checkerOverride NVIDIA SyncToVBlank so it's always disabled

 Phoronix Test Suite 3.8.0-Bygland
diff --git a/pts-core/objects/phodevi/components/phodevi_disk.php b/pts-core/objects/phodevi/components/phodevi_disk.php
index fee31b5..0c21660 100644
--- a/pts-core/objects/phodevi/components/phodevi_disk.php
+++ b/pts-core/objects/phodevi/components/phodevi_disk.php
@@ -195,8 +195,14 @@ class phodevi_disk extends phodevi_device_interface
             $disks_formatted = array();
             $disks = array();

-            foreach(pts_file_io::glob('
/sys/block/sd*') as $sdx)
+            foreach(array_merge(pts_file_io::glob('
/sys/block/sd*'), pts_file_io::glob('/sys/block/mmcblk*')) as $sdx)
             {
+                if(strpos($sdx, '
boot') !== false)
+                {
+                    // Don'
include devices like /sys/block/mmcblk0boot[0,1] as it's repeat of /sys/block/mmcblk0
+                    continue;
+                }
+
                 if(is_file($sdx . '
/device/model') && is_file($sdx . '/size'))
                 {
                     $disk_size = pts_file_io::file_get_contents($sdx . '
/size');
@@ -245,13 +251,6 @@ class phodevi_disk extends phodevi_device_interface
             }
         }

-        if(is_file('
/sys/class/block/mmcblk0/device/name'))
-        {
-            $disk_name = pts_file_io::file_get_contents('
/sys/class/block/mmcblk0/device/name');
-            $disk_size = pts_file_io::file_get_contents('
/sys/class/block/mmcblk0/size');
-            array_push($disks, round($disk_size * 512 / 1000000000) . '
GB ' . $disk_name);
-        }
-
         if(count($disks) == 0)
         {
             $root_disk_size = ceil(disk_total_space('
/') 
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media