Index: loadwatch/loadwatch.scm
==================================================================
--- loadwatch/loadwatch.scm
+++ loadwatch/loadwatch.scm
@@ -5,10 +5,38 @@
   virt
   res
   %mem
   count
   )
+
+(define (pp-processdat dat)
+  (print "(processdat"
+	 " %cpu="  (processdat-%cpu dat)
+	 " virt="  (processdat-virt dat)
+	 " res="   (processdat-res  dat)
+	 " %mem="  (processdat-%mem dat)
+	 " count=" (processdat-count dat)))
+
+
+(define nrex (regexp "^(\\d+[\\d\\.]*)([mkgMKG])$"))
+
+(define (get-number numstr)
+  (let ((n (string->number numstr)))
+    (if n 
+	n
+	(let ((nmatch (string-match nrex numstr)))
+	  (if nmatch
+	      (* (string->number (cadr nmatch))
+		 (case (string->symbol (caddr nmatch))
+		   ((k) 1024)
+		   ((m) 1048576)
+		   ((g) 1073741824)
+		   (else 
+		    (print "ERROR: Unrecognised unit: " (caddr nmatch) ", extracted for " numstr)
+		    1)))
+	      #f)))))
+
 
 (define (snagload)
   (let ((dat (make-hash-table)) ;; user => hash-of-processdat
 	(hdr (regexp "^\\s+PID"))
 	(rx  (regexp "\\s+"))
@@ -24,33 +52,35 @@
 	     (if (not inbod)
 		 (if (string-search hdr inl)
 		     (loop (read-line) #t)
 		     (loop (read-line) #f))
 		 (let* ((lparts (map (lambda (x)
-				       (let ((num (string->number x)))
+				       (let ((num (get-number x)))
 					 (if num num x)))
-				     (string-split-fields rx (string-substitute wht "" inl) #:infix)))
-			(user   (list-ref lparts 1))
-			(virt   (list-ref lparts 4))
-			(res    (list-ref lparts 5))
-			(%cpu   (list-ref lparts 8))
-			(%mem   (list-ref lparts 9))
-			(time   (list-ref lparts 10))
-			(pname  (list-ref lparts 11))
-			(udat   (or (hash-table-ref/default dat user #f)
-				    (let ((u (make-hash-table)))
-				      (hash-table-set! dat user u)
-				      u)))
-			(pdat   (or (hash-table-ref/default udat pname #f)
-				    (let ((p (make-processdat 0 0 0 0 0)))
-				      (hash-table-set! udat pname p)
-				      p))))
-		   (print "User: " user ", pname: " pname ", virt: " virt ", res: " res ", %cpu: " %cpu ", %mem: " %mem)
-		   (processdat-%cpu-set!  pdat (+ (processdat-%cpu pdat) %cpu))
-		   (processdat-%mem-set!  pdat (+ (processdat-%mem pdat) %mem))
-		   (processdat-virt-set!  pdat (+ (processdat-virt pdat) virt))
-		   (processdat-res-set!   pdat (+ (processdat-res pdat)  res))
-		   (processdat-count-set! pdat (+ (processdat-count pdat) 1))
-		   (loop (read-line) inbod)))))))))
-	   
+				     (string-split-fields rx (string-substitute wht "" inl) #:infix))))
+		   (if (> (length lparts) 10)
+		       (let* ((user   (list-ref lparts 1))
+			      (virt   (list-ref lparts 4))
+			      (res    (list-ref lparts 5))
+			      (%cpu   (list-ref lparts 8))
+			      (%mem   (list-ref lparts 9))
+			      (time   (list-ref lparts 10))
+			      (pname  (list-ref lparts 11))
+			      (udat   (or (hash-table-ref/default dat user #f)
+					  (let ((u (make-hash-table)))
+					    (hash-table-set! dat user u)
+					    u)))
+			      (pdat   (or (hash-table-ref/default udat pname #f)
+					  (let ((p (make-processdat 0 0 0 0 0)))
+					    (hash-table-set! udat pname p)
+					    p))))
+			 (print "User: " user ", pname: " pname ", virt: " virt ", res: " res ", %cpu: " %cpu ", %mem: " %mem)
+			 (processdat-%cpu-set!  pdat (+ (processdat-%cpu pdat) %cpu))
+			 (processdat-%mem-set!  pdat (+ (processdat-%mem pdat) %mem))
+			 (processdat-virt-set!  pdat (+ (processdat-virt pdat) virt))
+			 (processdat-res-set!   pdat (+ (processdat-res pdat)  res))
+			 (processdat-count-set! pdat (+ (processdat-count pdat) 1))
+			 (loop (read-line) inbod))
+		       dat)))))))))
+    
 (define x (snagload))
-(processdat-%cpu (hash-table-ref (hash-table-ref x "matt") "evolution-calen"))
+;; (processdat-%cpu (hash-table-ref (hash-table-ref x "matt") "evolution-calen"))