Overview
| Comment: | Fixed other bug in cpu load. The ssh command was not quoted. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 |
| Files: | files | file ages | folders |
| SHA1: |
6f67e195394c055bd1f81e09f12dcd12 |
| User & Date: | mrwellan on 2019-12-24 14:48:00 |
| Other Links: | branch diff | manifest | tags |
Context
|
2019-12-25
| ||
| 21:16 | wip check-in: e313d518c5 user: matt tags: v1.65 | |
|
2019-12-24
| ||
| 14:48 | Fixed other bug in cpu load. The ssh command was not quoted. check-in: 6f67e19539 user: mrwellan tags: v1.65 | |
| 13:17 | Fixed #f numcpus bug check-in: e945997554 user: mrwellan tags: v1.65 | |
Changes
Modified common.scm from [20d85336e3] to [367bc4934d].
| ︙ | ︙ | |||
1742 1743 1744 1745 1746 1747 1748 |
(else default))))
(define (common:get-normalized-cpu-load-raw remote-host)
(let* ((actual-host (or remote-host (get-host-name)))) ;; #f is localhost
(or (common:get-cached-info actual-host "normalized-load")
(let ((data (if remote-host
(with-input-from-pipe
| | | 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 |
(else default))))
(define (common:get-normalized-cpu-load-raw remote-host)
(let* ((actual-host (or remote-host (get-host-name)))) ;; #f is localhost
(or (common:get-cached-info actual-host "normalized-load")
(let ((data (if remote-host
(with-input-from-pipe
(conc "ssh " remote-host " \"cat /proc/loadavg;cat /proc/cpuinfo;echo end\"")
read-lines)
(append
(with-input-from-file "/proc/loadavg"
read-lines)
(with-input-from-file "/proc/cpuinfo"
read-lines)
(list "end"))))
|
| ︙ | ︙ | |||
1764 1765 1766 1767 1768 1769 1770 | #f (let loop ((hed (car data)) (tal (cdr data)) (loads #f) (proc-num 0) ;; processor includes threads (phys-num 0) ;; physical chip on motherboard (core-num 0)) ;; core | | | 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 | #f (let loop ((hed (car data)) (tal (cdr data)) (loads #f) (proc-num 0) ;; processor includes threads (phys-num 0) ;; physical chip on motherboard (core-num 0)) ;; core ;;; (print hed ", " loads ", " proc-num ", " phys-num ", " core-num) (if (null? tal) ;; have all our data, calculate normalized load and return result (let* ((act-proc (+ proc-num 1)) (act-phys (+ phys-num 1)) (act-core (+ core-num 1)) (adj-proc-load (/ (car loads) act-proc)) (adj-core-load (/ (car loads) act-core)) (result |
| ︙ | ︙ |