[noctool-cvs] CVS source
imattsson
imattsson at common-lisp.net
Sat May 17 12:43:28 UTC 2008
Update of /project/noctool/cvsroot/source
In directory clnet:/tmp/cvs-serv6403
Modified Files:
classes.lisp config.lisp graph-monitors.lisp graphing.lisp
packages.lisp
Log Message:
IM
More problems from splitting the Image library out.
At least now things compile without "unknown function" warnings.
--- /project/noctool/cvsroot/source/classes.lisp 2008/03/17 08:27:58 1.1.1.1
+++ /project/noctool/cvsroot/source/classes.lisp 2008/05/17 12:43:27 1.2
@@ -136,6 +136,7 @@
(defmethod store ((graph disk-container) &optional filename)
+ (declare (ignore filename))
(let* ((basename (format nil "~a%disk" (name (equipment graph))))
(filename (merge-pathnames (make-pathname :name basename)
*storage-path*)))
--- /project/noctool/cvsroot/source/config.lisp 2008/05/16 19:23:06 1.2
+++ /project/noctool/cvsroot/source/config.lisp 2008/05/17 12:43:27 1.3
@@ -118,6 +118,6 @@
((typep val (find-class 'noctool::view))
(push val *views*))
((typep val (find-class 'noctool::remote-node))
- (setf (get-hash (destination val) *peers*) val))
+ (setf (gethash (destination val) *peers*) val))
(t (format t "DEBUG: Object ~a matched no known case (this should not happen).~%" val))))
)))
--- /project/noctool/cvsroot/source/graph-monitors.lisp 2008/05/17 12:32:25 1.2
+++ /project/noctool/cvsroot/source/graph-monitors.lisp 2008/05/17 12:43:27 1.3
@@ -81,7 +81,7 @@
(defmethod show ((graph noctool::disk-container) sink format &key (selector :short) scale &allow-other-keys)
(let ((lines (length (noctool::disk-list graph)))
(disks (sort (copy-list (noctool::disk-list graph)) #'> :key #'noctool::disk-max)))
- (let ((image (make-image 350 (+ 130 (* 10 lines)))))
+ (let ((image (image:make-image 350 (+ 130 (* 10 lines)))))
(image:rect image 0 0 349 (1- (image:height image)) t 192 192 192)
(multiple-value-bind (percentile max scale) (show (noctool::disk-graph (car disks)) image nil :color '(0 0 0 0.0) :base-x 25 :base-y 110 :height 100 :selector selector)
(draw-grid image max (interval graph) selector scale "b" 3 (noctool:last-updated graph))
@@ -90,7 +90,7 @@
for text-offset = 125 then (+ text-offset 10)
for style = :line then :plot
do (let ((graph (noctool::disk-graph disk))
- (image:text (format nil "~a [ ~a ]" (noctool::mountpoint disk) (noctool::device disk))))
+ (text (format nil "~a [ ~a ]" (noctool::mountpoint disk) (noctool::device disk))))
(show graph image nil :color color :scale scale :height 100 :base-y 110 :base-x 25 :selector selector :style style)
(image:text image text 25 text-offset 0 0 0)
(image:rect image 15 text-offset 20 (+ 5 text-offset)
--- /project/noctool/cvsroot/source/graphing.lisp 2008/03/17 08:27:58 1.1.1.1
+++ /project/noctool/cvsroot/source/graphing.lisp 2008/05/17 12:43:27 1.2
@@ -244,7 +244,7 @@
(defmethod show ((graph fixed-graph-display) sink format
&key (selector :short) (color '(0 255 0)) (base-x 0)
- (base-y (1- (height sink))) (height (height sink))
+ (base-y (1- (image:height sink))) (height (image:height sink))
(style :plot))
(let ((data (extract-display-data graph selector)))
(loop for ix from 0 below 300
@@ -262,7 +262,7 @@
(defmethod show ((graph percentile-graph-display) sink format
&key (selector :short) (color '(0 255 0)) (base-x 0) scale
- (base-y (1- (height sink))) (height (height sink))
+ (base-y (1- (image:height sink))) (height (image:height sink))
(style :plot))
(let ((data (extract-display-data graph selector)))
(let ((tmpdata (sort (copy-seq data) #'<)))
--- /project/noctool/cvsroot/source/packages.lisp 2008/03/17 08:27:58 1.1.1.1
+++ /project/noctool/cvsroot/source/packages.lisp 2008/05/17 12:43:27 1.2
@@ -17,7 +17,7 @@
(:use #:cl #:usocket #:net.hexapodia.noctool-scheduler #:net.hexapodia.noctool-graphs
#+sbcl :sb-mop)
(:export
- #:*proxies* #:*peers* #:*equipment* #:*views* #:last-updated #:unix-host #:linux-host #:cpu-monitor #:load-monitor #:ping-monitor #:remote-node #:decode-base64 #:encode-base64 #:octetify
+ #:*proxies* #:*peers* #:*equipment* #:*views* #:last-updated #:unix-host #:linux-host #:cpu-monitor #:load-monitor #:ping-monitor #:remote-node #:decode-base64 #:encode-base64 #:octetify #:destination
))
(defpackage #:net.hexapodia.noctool-config
More information about the noctool-cvs
mailing list