Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 5/21/13 15:49
Recent Commits
>
--git a/pts-core/library/pts-functions_system_cpu.php b/pts-core/library/pts-functions_system_cpu.php
index a39c6d2..3c7e66f 100644
--- a/pts-core/library/pts-functions_system_cpu.php
+++ b/pts-core/library/pts-functions_system_cpu.php
@@ -197,7 +197,21 @@ function hw_cpu_temperature()
// Read the processor temperature
$temp_c = -1;
- if(IS_LINUX)
+ if(IS_BSD)
+ {
+ $acpi = read_sysctl("hw.acpi.thermal.tz0.temperature");
+
+ if(($end = strpos($acpi, 'C')) > 0)
+ {
+ $acpi = substr($acpi, 0, $end);
+
+ if(is_numeric($acpi))
+ {
+ $temp_c = $acpi;
+ }
+ }
+ }
+ else if(IS_LINUX)
{
$sensors = read_sensors(array("CPU Temp", "Core 0", "Core0 Temp", "Core1 Temp"));
@@ -217,20 +231,6 @@ function hw_cpu_temperature()
}
}
}
- else if(IS_BSD)
- {
- $acpi = read_sysctl("hw.acpi.thermal.tz0.temperature");
-
- if(($end = strpos($acpi, 'C')) > 0)
- {
- $acpi = substr($acpi, 0, $end);
-
- if(is_numeric($acpi))
- {
- $temp_c = $acpi;
- }
- }
- }
return $temp_c;
}
diff --git a/pts-core/library/pts-functions_system_hardware.php b/pts-core/library/pts-functions_system_hardware.php
index ea6490f..13293f1 100644
--- a/pts-core/library/pts-functions_system_hardware.php
+++ b/pts-core/library/pts-functions_system_hardware.php
@@ -199,7 +199,7 @@ function hw_sys_hdd_string()
do
{
- $disk = read_sysctl("hw.ad." . $i . ".%desc");
+ $disk = read_sysctl("dev.ad." . $i . ".%desc");
if($disk != false)
{
@@ -265,7 +265,21 @@ function hw_sys_temperature()
// Reads the system's temperature
$temp_c = -1;
- if(IS_LINUX)
+ if(IS_BSD)
+ {
+ $acpi = read_sysctl("hw.acpi.thermal.tz1.temperature");
+
+ if(($end = strpos($acpi, 'C')) > 0)
+ {
+ $acpi = substr($acpi, 0, $end);
+
+ if(is_numeric($acpi))
+ {
+ $temp_c = $acpi;
+ }
+ }
+ }
+ else if(IS_LINUX)
{
$sensors = read_sensors(array("Sys Temp", "Board Temp"));
@@ -285,20 +299,6 @@ function hw_sys_temperature()
}
}
}
- else if(IS_BSD)
- {
- $acpi = read_sysctl("hw.acpi.thermal.tz1.temperature");
-
- if(($end = strpos($acpi, 'C')) > 0)
- {
- $acpi = substr($acpi, 0, $end);
-
- if(is_numeric($acpi))
- {
- $temp_c = $acpi;
- }
- }
- }
return $temp_c;
}
diff --git a/pts-core/modules/toggle_screensaver.php b/pts-core/modules/toggle_screensaver.php
index c1b118d..235edc8 100644
--- a/pts-core/modules/toggle_screensaver.php
+++ b/pts-core/modules/toggle_screensaver.php
@@ -3,8 +3,8 @@
/*
Phoronix Test Suite
URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
- Copyright (C) 2008, Phoronix Media
- Copyright (C) 2004-2008, Michael Larabel
+ Copyright (C) 2008 - 2009, Phoronix Media
+ Copyright (C) 2008 - 2009, Michael Larabel
toggle_screensaver.php: A module to toggle the screensaver while tests are running on GNOME
This program is free software; you can redistribute it&nbs
Copyright © 2013 by Phoronix Media