| 90,25 → 90,6 |
|---|
| } |
| |
| /** |
| * UpTime |
| * time the system is running |
| * |
| * @return void |
| */ |
| private function _uptime() |
| { |
| if (CommonFunctions::executeProgram('sysctl', '-n kern.boottime', $a, PSI_DEBUG)) { |
| $tmp = explode(" ", $a); |
| if ($tmp[0]=="{") { /* kern.boottime= { sec = 1096732600, usec = 885425 } Sat Oct 2 10:56:40 2004 */ |
| $data = trim($tmp[3], ","); |
| $this->sys->setUptime(time() - $data); |
| } else { /* kern.boottime= 1096732600 */ |
| $this->sys->setUptime(time() - $a); |
| } |
| } |
| } |
| |
| /** |
| * get CPU information |
| * |
| * @return void |
| 119,9 → 100,9 |
|---|
| if (CommonFunctions::executeProgram('hostinfo', '| grep "Processor type"', $buf, PSI_DEBUG)) { |
| $dev->setModel(preg_replace('/Processor type: /', '', $buf)); |
| $buf=$this->grabkey('hw.model'); |
| if (!is_null($buf) && (trim($buf) != "")) { |
| if (($buf !== null) && (trim($buf) != "")) { |
| $this->sys->setMachine(trim($buf)); |
| if (CommonFunctions::rfts(PSI_APP_ROOT.'/data/ModelTranslation.txt', $buffer)) { |
| if (CommonFunctions::rftsdata('ModelTranslation.txt', $buffer)) { |
| $buffer = preg_split("/\n/", $buffer, -1, PREG_SPLIT_NO_EMPTY); |
| foreach ($buffer as $line) { |
| $ar_buf = preg_split("/:/", $line, 3); |
| 134,12 → 115,12 |
|---|
| } |
| } |
| $buf=$this->grabkey('machdep.cpu.brand_string'); |
| if (!is_null($buf) && (trim($buf) != "") && |
| if (($buf !== null) && (trim($buf) != "") && |
| ((trim($buf) != "i486 (Intel 80486)") || ($dev->getModel() == ""))) { |
| $dev->setModel(trim($buf)); |
| } |
| $buf=$this->grabkey('machdep.cpu.features'); |
| if (!is_null($buf) && (trim($buf) != "")) { |
| if (($buf !== null) && (trim($buf) != "")) { |
| if (preg_match("/ VMX/", $buf)) { |
| $dev->setVirt("vmx"); |
| } elseif (preg_match("/ SVM/", $buf)) { |
| 151,17 → 132,21 |
|---|
| $dev->setBusSpeed(round($this->grabkey('hw.busfrequency') / 1000000)); |
| $bufn=$this->grabkey('hw.cpufrequency_min'); |
| $bufx=$this->grabkey('hw.cpufrequency_max'); |
| if (!is_null($bufn) && (trim($bufn) != "") && !is_null($bufx) && (trim($bufx) != "") && ($bufn != $bufx)) { |
| if (($bufn !== null) && (trim($bufn) != "") && ($bufx !== null) && (trim($bufx) != "") && ($bufn != $bufx)) { |
| $dev->setCpuSpeedMin(round($bufn / 1000000)); |
| $dev->setCpuSpeedMax(round($bufx / 1000000)); |
| } |
| $buf=$this->grabkey('hw.l2cachesize'); |
| if (!is_null($buf) && (trim($buf) != "")) { |
| if ($buf !== "") { |
| $dev->setCache(round($buf)); |
| } |
| $ncpu = $this->grabkey('hw.ncpu'); |
| if (is_null($ncpu) || (trim($ncpu) == "") || (!($ncpu >= 1))) |
| if (($ncpu === "") || !($ncpu >= 1)) { |
| $ncpu = 1; |
| } |
| if (($ncpu == 1) && PSI_LOAD_BAR) { |
| $dev->setLoad($this->cpuusage()); |
| } |
| for ($ncpu ; $ncpu > 0 ; $ncpu--) { |
| $this->sys->setCpus($dev); |
| } |
| 422,8 → 407,8 |
|---|
| $distro_tmp = preg_split("/\n/", $buffer, -1, PREG_SPLIT_NO_EMPTY); |
| foreach ($distro_tmp as $info) { |
| $info_tmp = preg_split('/:/', $info, 2); |
| if (isset($distro_tmp[0]) && !is_null($distro_tmp[0]) && (trim($distro_tmp[0]) != "") && |
| isset($distro_tmp[1]) && !is_null($distro_tmp[1]) && (trim($distro_tmp[1]) != "")) { |
| if (isset($distro_tmp[0]) && ($distro_tmp[0] !== null) && (trim($distro_tmp[0]) != "") && |
| isset($distro_tmp[1]) && ($distro_tmp[1] !== null) && (trim($distro_tmp[1]) != "")) { |
| $distro_arr[trim($info_tmp[0])] = trim($info_tmp[1]); |
| } |
| } |
| 485,13 → 470,12 |
|---|
| * |
| * @see PSI_Interface_OS::build() |
| * |
| * @return Void |
| * @return void |
| */ |
| public function build() |
| { |
| parent::build(); |
| if (!$this->blockname || $this->blockname==='vitals') { |
| $this->_uptime(); |
| $this->_processes(); |
| } |
| if (!$this->blockname || $this->blockname==='hardware') { |