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

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Sun 8/31/14 0:37

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Sun 8/31/14 0:37
Michael Larabel  
phodevi: Improvement to... 
Sun 8/31/14 0:02
Michael Larabel  
pts-core: Drop... 
Sat 8/30/14 23:40
Michael Larabel  
Should have bumped the... 
Sat 8/30/14 23:38
Michael Larabel  
phodevi: Support for... 
Fri 8/29/14 9:57
Michael Larabel  
pts-core: Don't set... 
Fri 8/29/14 7:54
Michael Larabel  
 
 
> --git a/CHANGE-LOG b/CHANGE-LOG
index abee354
..6b82432 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -1,+1,@@
 
PHORONIX TEST SUITE CHANGE-LOG

+Phoronix Test Suite (Git)
+
+- 
phodeviSplit some into new phodevi_base class
+
 
Phoronix Test Suite 4.2 Milestone 1
 8 October 2012

diff 
--git a/pts-core/objects/phodevi/phodevi.php b/pts-core/objects/phodevi/phodevi.php
index 34e751c
..57b06a3 100644
--- a/pts-core/objects/phodevi/phodevi.php
+++ b/pts-core/objects/phodevi/phodevi.php
@@ -21,15 +21,@@
     
along with this program. If notsee <http://www.gnu.org/licenses/>.
 
*/

-
phodevi::create_vfs();
-
-if(
PTS_IS_CLIENT)
-{
-    
phodevi::initial_setup();
-}
-
-
-class 
phodevi
+class phodevi extends phodevi_base
 
{
     public static 
$vfs false;
     private static 
$device_cache null;
@@ -
63,35 +55,@@ class phodevi
     
{
         return 
phodevi::read_property($device'identifier');
     }
-    public static function 
available_hardware_devices()
-    {
-        return array(
-        
'Processor' => 'cpu',
-        
'Motherboard' => 'motherboard',
-        
'Chipset' => 'chipset',
-        
'Memory' => 'memory',
-        
'Disk' => 'disk',
-        
'Graphics' => 'gpu',
-        
'Audio' => 'audio',
-        
'Monitor' => 'monitor',
-        
'Network' => 'network'
-        );
-    }
-    public static function 
available_software_components()
-    {
-        return array(
-        
'OS' => array('system''operating-system'),
-        
'Kernel' => array('system''kernel-string'),
-        
'Desktop' => array('system''desktop-environment'),
-        
'Display Server' => array('system''display-server'),
-        
'Display Driver' => array('system''display-driver-string'),
-        
'OpenGL' => array('system''opengl-driver'),
-        
'Compiler' => array('system''compiler'),
-        
'File-System' => array('system''filesystem'),
-        
'Screen Resolution' => array('gpu''screen-resolution-string'),
-        
'System Layer' => array('system''system-layer')
-        );
-    }
     public static function 
load_sensors()
     {
         foreach(
glob(dirname(__FILE__) . '/sensors/*') as $sensor_obj_file)
@@ -
597,+560,11 @@ class phodevi
     
}
 }

+
phodevi::create_vfs();
+
+if(
PTS_IS_CLIENT)
+{
+    
phodevi::initial_setup();
+}
+
 
?>
diff --git a/pts-core/objects/phodevi/phodevi_base.php b/pts-core/objects/phodevi/phodevi_base.php
new file mode 100644
index 0000000..ccb33db
--- /dev/null
+++ b/pts-core/objects/phodevi/phodevi_base.php
@@ -0,0 +1,57 @@
+<?php
+
+
/*
+    Phoronix Test Suite
+    URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
+    Copyright (C) 2009 - 2012, Phoronix Media
+    Copyright (C) 2009 - 2012, Michael Larabel
+    phodevi.php: The object for interacting with the PTS device framework
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class 
phodevi_base
+{
+    public static function 
available_hardware_devices()
+    {
+        return array(
+        
'Processor' => 'cpu',
+        
'Motherboard' => 'motherboard',
+        
'Chipset' => 'chipset',
+        
'Memory' => 'memory',
+        
'Disk' => 'disk',
+        
'Graphics' => 'gpu',
+        
'Audio' => 'audio',
+        
'Monitor' => 'monitor',
+        
'Network' => 'network'
+        );
+    }
+    public static function 
available_software_components()
+    {
+        return array(
+        
'OS' => array('system''operating-system'),
+        
'Kernel' => array('system''kernel-string'),
+        
'Desktop' => array('system''desktop-environment'),
+        
'Display Server' => array('system''display-server'),
+        
'Display Driver' => array('system''display-driver-string'),
+        
'OpenGL' => array('system''opengl-driver'),
+        
'Compiler' => array('system''compiler'),
+        
'File-System' => array('system''filesystem'),
+        
'Screen Resolution' => array('gpu''screen-resolution-string'),
+        
'System Layer' => array('system''system-layer')
+        );
+    }
+}
+
+
?>
diff --git a/pts-core/pts-core.php b/pts-core/pts-core.php
index 91b034a..f4ed993 100644
--- a/pts-core/pts-core.php
+++ b/pts-core/pts-core.php
@@ -22,7 +22,7 @@
 */

 define('PTS_VERSION', '4.2.0m1');
-define('PTS_CORE_VERSION', 4110);
+define('PTS_CORE_VERSION', 4111);
 define('PTS_CODENAME', 'RANDABERG');
 define('PTS_IS_CLIENT', (defined('PTS_MODE') && PTS_MODE == 'CLIENT'));
 define('PTS_IS_DEV_BUILD', (substr(PTS_VERSION, -2,
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media