Thread: [Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[133] includes/os/class.Linux.inc.php
Brought to you by:
namiltd
From: <jac...@us...> - 2009-02-05 09:28:29
|
Revision: 133 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=133&view=rev Author: jacky672 Date: 2009-02-05 09:28:25 +0000 (Thu, 05 Feb 2009) Log Message: ----------- "Disk Swap" and "Swap device" percent was different (ceil vs round) Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-02-04 14:51:55 UTC (rev 132) +++ includes/os/class.Linux.inc.php 2009-02-05 09:28:25 UTC (rev 133) @@ -634,7 +634,7 @@ $results['swap']['total'] += $ar_buf[2] * 1024; $results['swap']['used'] += $ar_buf[3] * 1024; $results['swap']['free'] = $results['swap']['total'] - $results['swap']['used']; - $results['swap']['percent'] = ceil(($results['swap']['used'] * 100) / (($results['swap']['total'] <= 0) ? 1 : $results['swap']['total'])); + $results['swap']['percent'] = round(($results['swap']['used'] * 100) / (($results['swap']['total'] <= 0) ? 1 : $results['swap']['total'])); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-04-17 07:02:26
|
Revision: 188 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=188&view=rev Author: bigmichi1 Date: 2009-04-17 07:02:09 +0000 (Fri, 17 Apr 2009) Log Message: ----------- wrong var init and missing add for bogomips Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-04-14 08:38:44 UTC (rev 187) +++ includes/os/class.Linux.inc.php 2009-04-17 07:02:09 UTC (rev 188) @@ -32,14 +32,14 @@ * @var string */ private $_icon = "unknown.png"; - + /** * name for unknown distributions * * @var string */ private $_distro = "unknown"; - + /** * get the distro name and icon when create the sysinfo object * create the parser and set some default values @@ -89,7 +89,7 @@ } } } - + /** * Virtual Host Name * @@ -102,7 +102,7 @@ } return $result; } - + /** * IP of the Virtual Host Name * @@ -112,7 +112,7 @@ { return gethostbyname($this->vhostname()); } - + /** * Canonical Host Name * @@ -134,7 +134,7 @@ } return $result; } - + /** * IP of the Canonical Host Name * @@ -147,7 +147,7 @@ } return $result; } - + /** * Kernel Version * @@ -182,7 +182,7 @@ } return $result; } - + /** * UpTime * time the system is running @@ -197,7 +197,7 @@ $result = trim($ar_buf[0]); return $result; } - + /** * Number of Users * @@ -213,7 +213,7 @@ } return $strResult; } - + /** * Processor Load * optionally create a loadbar @@ -255,7 +255,7 @@ } return $results; } - + /** * CPU information * All of the tags here are highly architecture dependant. @@ -269,51 +269,69 @@ if (CommonFunctions::rfts('/proc/cpuinfo', $bufr)) { $bufe = explode("\n", $bufr); $results = array ('cpus'=>0, 'bogomips'=>0); - $ar_buf = array (); + $arrBuff = array (); foreach ($bufe as $buf) { $arrBuff = preg_split('/\s+:\s+/', trim($buf)); if (count($arrBuff) == 2) { $key = $arrBuff[0]; $value = $arrBuff[1]; switch ($key) { - case 'model name': $results['model'] = $value; + case 'model name': + $results['model'] = $value; break; - case 'cpu MHz': $results['cpuspeed'] = sprintf('%.2f', $value); + case 'cpu MHz': + $results['cpuspeed'] = sprintf('%.2f', $value); break; - case 'cycle frequency [Hz]': $results['cpuspeed'] = sprintf('%.2f', $value / 1000000); // For Alpha arch - 2.2.x + case 'cycle frequency [Hz]': + $results['cpuspeed'] = sprintf('%.2f', $value / 1000000); // For Alpha arch - 2.2.x break; - case 'clock': $results['cpuspeed'] = sprintf('%.2f', $value); // For PPC arch (damn borked POS) + case 'clock': + $results['cpuspeed'] = sprintf('%.2f', $value); // For PPC arch (damn borked POS) break; - case 'cpu': $results['model'] = $value; // For PPC arch (damn borked POS) + case 'cpu': + $results['model'] = $value; // For PPC arch (damn borked POS) break; - case 'L2 cache': $results['cache'] = $value * 1024; // More for PPC + case 'L2 cache': + $results['cache'] = $value * 1024; // More for PPC break; - case 'revision': $results['model'] .= ' ( rev: '.$value.')'; // For PPC arch (damn borked POS) + case 'revision': + $results['model'] .= ' ( rev: '.$value.')'; // For PPC arch (damn borked POS) break; - case 'cpu model': $results['model'] .= ' ('.$value.')'; // For Alpha arch - 2.2.x + case 'cpu model': + $results['model'] .= ' ('.$value.')'; // For Alpha arch - 2.2.x break; - case 'cache size': $value = preg_replace("/[a-zA-Z]/", "", $value); - $results['cache'] = $value * 1024; + case 'cache size': + $results['cache'] = (preg_replace("/[a-zA-Z]/", "", $value)) * 1024; break; - case 'bogomips': $results['bogomips'] = $value; + case 'bogomips': + $results['bogomips'] += $value; break; - case 'BogoMIPS': $results['bogomips'] += $value; // For alpha arch - 2.2.x + case 'BogoMIPS': + $results['bogomips'] += $value; // For alpha arch - 2.2.x break; - case 'BogoMips': $results['bogomips'] += $value; // For sparc arch + case 'BogoMips': + $results['bogomips'] += $value; // For sparc arch break; - case 'cpus detected': $results['cpus'] += $value; // For Alpha arch - 2.2.x + case 'cpus detected': + $results['cpus'] += $value; // For Alpha arch - 2.2.x break; - case 'system type': $results['model'] .= ', '.$value.' '; // Alpha arch - 2.2.x + case 'system type': + $results['model'] .= ', '.$value.' '; // Alpha arch - 2.2.x break; - case 'platform string': $results['model'] .= ' ('.$value.')'; // Alpha arch - 2.2.x + case 'platform string': + $results['model'] .= ' ('.$value.')'; // Alpha arch - 2.2.x break; - case 'processor': $results['cpus'] += 1; + case 'processor': + $results['cpus'] += 1; break; - case 'Cpu0ClkTck': $results['cpuspeed'] = sprintf('%.2f', hexdec($value) / 1000000); // Linux sparc64 + case 'Cpu0ClkTck': + $results['cpuspeed'] = sprintf('%.2f', hexdec($value) / 1000000); // Linux sparc64 break; - case 'Cpu0Bogo': $results['bogomips'] = $value; // Linux sparc64 & sparc32 + case 'Cpu0Bogo': + $results['bogomips'] += $value; // Linux sparc64 & sparc32 break; - case 'ncpus probed': $results['cpus'] = $value; // Linux sparc64 & sparc32 + case 'ncpus probed': + $results['cpus'] = $value; // Linux sparc64 & sparc32 break; } } @@ -336,14 +354,18 @@ if (sizeof($fields) == 2) { list ($key,$value) = $fields; switch ($key) { - case 'Processor': $results['cpus'] += 1; + case 'Processor': + $results['cpus'] += 1; $results['model'] = $value; break; - case 'BogoMIPS': $results['cpuspeed'] = $value; //BogoMIPS are not BogoMIPS on this CPU, it's the speed, no BogoMIPS available + case 'BogoMIPS': + $results['cpuspeed'] = $value; //BogoMIPS are not BogoMIPS on this CPU, it's the speed, no BogoMIPS available break; - case 'I size': $results['cache'] = $value * 1024; + case 'I size': + $results['cache'] = $value * 1024; break; - case 'D size': $results['cache'] += $value * 1024; + case 'D size': + $results['cache'] += $value * 1024; break; } } @@ -362,7 +384,7 @@ } return $results; } - + /** * PCI devices * @@ -394,7 +416,7 @@ } return $arrResults; } - + /** * IDE devices * @@ -439,7 +461,7 @@ asort($results); return $results; } - + /** * SCSI devices * @@ -477,7 +499,7 @@ asort($results); return $results; } - + /** * USB devices * @@ -516,7 +538,7 @@ } return $results; } - + /** * Network devices * includes also rx/tx bytes @@ -544,7 +566,7 @@ } return $results; } - + /** * Physical memory information and Swap Space information * @@ -600,7 +622,7 @@ } return $results; } - + /** * filesystem information * @@ -610,7 +632,7 @@ { return Parser::df("-P"); } - + /** * Distribution * @@ -620,7 +642,7 @@ { return $this->_distro; } - + /** * Distribution Icon * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-06-22 14:23:06
|
Revision: 264 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=264&view=rev Author: bigmichi1 Date: 2009-06-22 13:35:21 +0000 (Mon, 22 Jun 2009) Log Message: ----------- missing check for array element when setting distribution Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-06-22 13:01:52 UTC (rev 263) +++ includes/os/class.Linux.inc.php 2009-06-22 13:35:21 UTC (rev 264) @@ -481,7 +481,9 @@ if (isset($list[$distro['Distributor ID']]['Image'])) { $this->sys->setDistributionIcon($list[$distro['Distributor ID']]['Image']); } - $this->sys->setDistribution($distro['Description']); + if (isset($distro['Description'])) { + $this->sys->setDistribution($distro['Description']); + } } } else { // Fall back in case 'lsb_release' does not exist ;) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-06-23 09:50:59
|
Revision: 266 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=266&view=rev Author: bigmichi1 Date: 2009-06-23 09:50:38 +0000 (Tue, 23 Jun 2009) Log Message: ----------- remove test data Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-06-23 09:49:36 UTC (rev 265) +++ includes/os/class.Linux.inc.php 2009-06-23 09:50:38 UTC (rev 266) @@ -161,7 +161,7 @@ $load2 = 0; $total = 0; $total2 = 0; - if (CommonFunctions::rfts("./data/test.txt", $buf)) {//'/proc/stat' + if (CommonFunctions::rfts('/proc/stat', $buf)) { $lines = explode("\n", $buf); foreach ($lines as $line) { if (preg_match('/^'.$cpuline.' (.*)/', $line, $matches)) { @@ -178,7 +178,7 @@ } // we need a second value, wait 1 second befor getting (< 1 second no good value will occour) sleep(1); - if (CommonFunctions::rfts("./data/test.txt", $buf)) { + if (CommonFunctions::rfts('/proc/stat', $buf)) { $lines = explode("\n", $buf); foreach ($lines as $line) { if (preg_match('/^'.$cpuline.' (.*)/', $line, $matches)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-06-24 05:31:50
|
Revision: 268 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=268&view=rev Author: bigmichi1 Date: 2009-06-24 05:31:03 +0000 (Wed, 24 Jun 2009) Log Message: ----------- convert Array to readable output Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-06-24 05:23:21 UTC (rev 267) +++ includes/os/class.Linux.inc.php 2009-06-24 05:31:03 UTC (rev 268) @@ -141,7 +141,7 @@ $result = preg_split("/\s/", $buf, 4); // don't need the extra values, only first three unset($result[3]); - $this->sys->setLoad($result); + $this->sys->setLoad(implode(' ', $result)); } if (PSI_LOAD_BAR) { $this->sys->setLoadPercent($this->_parseProcStat('cpu')); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-06-25 11:56:10
|
Revision: 279 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=279&view=rev Author: bigmichi1 Date: 2009-06-25 11:56:08 +0000 (Thu, 25 Jun 2009) Log Message: ----------- fixed one variable was used in two different manners Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-06-25 10:29:00 UTC (rev 278) +++ includes/os/class.Linux.inc.php 2009-06-25 11:56:08 UTC (rev 279) @@ -359,14 +359,14 @@ if (CommonFunctions::executeProgram('lsscsi', '-c', $bufr, PSI_DEBUG) || CommonFunctions::rfts('/proc/scsi/scsi', $bufr, 0, 4096, PSI_DEBUG)) { $bufe = explode("\n", $bufr); foreach ($bufe as $buf) { - if (preg_match('/Vendor: (.*) Model: (.*) Rev: (.*)/i', $buf, $dev)) { + if (preg_match('/Vendor: (.*) Model: (.*) Rev: (.*)/i', $buf, $device)) { $get_type = true; continue; } if ($get_type) { preg_match('/Type:\s+(\S+)/i', $buf, $dev_type); $dev = new HWDevice(); - $dev->setName($dev[1].' '.$dev[2].' ('.$dev_type[1].')'); + $dev->setName($device[1].' '.$device[2].' ('.$dev_type[1].')'); $this->sys->setScsiDevices($dev); $get_type = false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <big...@us...> - 2009-06-25 13:11:08
|
Revision: 283 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=283&view=rev Author: bigmichi1 Date: 2009-06-25 13:11:07 +0000 (Thu, 25 Jun 2009) Log Message: ----------- fix swap devices (header and footer was also read) Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-06-25 13:03:13 UTC (rev 282) +++ includes/os/class.Linux.inc.php 2009-06-25 13:11:07 UTC (rev 283) @@ -469,15 +469,18 @@ } if (CommonFunctions::rfts('/proc/swaps', $bufr)) { $swaps = explode("\n", $bufr); + unset($swaps[0]); foreach ($swaps as $swap) { - $ar_buf = preg_split('/\s+/', $swap, 6); - $dev = new DiskDevice(); - $dev->setMountPoint($ar_buf[0]); - $dev->setName("SWAP"); - $dev->setTotal($ar_buf[2] * 1024); - $dev->setUsed($ar_buf[3] * 1024); - $dev->setFree($dev->getTotal() - $dev->getUsed()); - $this->sys->setSwapDevices($dev); + $ar_buf = preg_split('/\s+/', $swap, 5); + if (count($ar_buf) == 5) { + $dev = new DiskDevice(); + $dev->setMountPoint($ar_buf[0]); + $dev->setName("SWAP"); + $dev->setTotal($ar_buf[2] * 1024); + $dev->setUsed($ar_buf[3] * 1024); + $dev->setFree($dev->getTotal() - $dev->getUsed()); + $this->sys->setSwapDevices($dev); + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dia...@us...> - 2009-06-28 15:42:34
|
Revision: 296 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=296&view=rev Author: diaoulael Date: 2009-06-28 15:41:33 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-06-28 08:15:15 UTC (rev 295) +++ includes/os/class.Linux.inc.php 2009-06-28 15:41:33 UTC (rev 296) @@ -534,7 +534,11 @@ $this->sys->setDistributionIcon($distribution["Image"]); } if (isset($distribution["Name"])) { - $this->sys->setDistribution($distribution["Name"]." ".trim($buf)); + if ($distribution["Name"] == 'Synology') { + $this->sys->setDistribution($distribution["Name"]); + } else { + $this->sys->setDistribution($distribution["Name"]." ".trim($buf)); + } } else { $this->sys->setDistribution(trim($buf)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2009-07-13 19:05:43
|
Revision: 298 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=298&view=rev Author: jacky672 Date: 2009-07-13 19:05:37 +0000 (Mon, 13 Jul 2009) Log Message: ----------- $device seems to be lost after the continue statement Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-07-13 19:02:59 UTC (rev 297) +++ includes/os/class.Linux.inc.php 2009-07-13 19:05:37 UTC (rev 298) @@ -356,11 +356,13 @@ private function _scsi() { $get_type = false; + $device = null; if (CommonFunctions::executeProgram('lsscsi', '-c', $bufr, PSI_DEBUG) || CommonFunctions::rfts('/proc/scsi/scsi', $bufr, 0, 4096, PSI_DEBUG)) { $bufe = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY); foreach ($bufe as $buf) { - if (preg_match('/Vendor: (.*) Model: (.*) Rev: (.*)/i', $buf, $device)) { + if (preg_match('/Vendor: (.*) Model: (.*) Rev: (.*)/i', $buf, $devices)) { $get_type = true; + $device = $devices; continue; } if ($get_type) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2009-07-29 19:42:45
|
Revision: 311 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=311&view=rev Author: jacky672 Date: 2009-07-29 19:42:11 +0000 (Wed, 29 Jul 2009) Log Message: ----------- [FIX] Fixed Bug [ 2829037 ] ide devices displayed only hdx Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2009-07-28 06:07:47 UTC (rev 310) +++ includes/os/class.Linux.inc.php 2009-07-29 19:42:11 UTC (rev 311) @@ -331,6 +331,9 @@ } } } + if (CommonFunctions::rfts("/proc/ide/".$file."/model", $buf, 1)) { + $dev->setName($dev->getName() . ": " . trim($buf)); + } $this->sys->setIdeDevices($dev); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jac...@us...> - 2010-11-05 20:58:09
|
Revision: 385 http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=385&view=rev Author: jacky672 Date: 2010-11-05 20:58:03 +0000 (Fri, 05 Nov 2010) Log Message: ----------- fix indentation Modified Paths: -------------- includes/os/class.Linux.inc.php Modified: includes/os/class.Linux.inc.php =================================================================== --- includes/os/class.Linux.inc.php 2010-11-05 20:52:43 UTC (rev 384) +++ includes/os/class.Linux.inc.php 2010-11-05 20:58:03 UTC (rev 385) @@ -276,10 +276,10 @@ $dev->setTemp(substr($buf, 25, 2)); } - if ($dev->getModel() === "") { - $dev->setModel("unknown"); - } - $this->sys->setCpus($dev); + if ($dev->getModel() === "") { + $dev->setModel("unknown"); + } + $this->sys->setCpus($dev); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |