[rhmessaging-commits] rhmessaging commits: r1607 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-01-24 15:22:41 -0500 (Thu, 24 Jan 2008)
New Revision: 1607

Modified:
   mgmt/cumin/python/cumin/client.py
   mgmt/cumin/python/cumin/exchange.py
   mgmt/cumin/python/cumin/queue.py
Log:
An awkward hack to work around divide-by-zero issues in rate
calculations.



Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py	2008-01-24 20:21:38 UTC (rev 1606)
+++ mgmt/cumin/python/cumin/client.py	2008-01-24 20:22:41 UTC (rev 1607)
@@ -24,16 +24,16 @@
         self.add_sql_column("addr", "l.address")
         self.add_sql_column("bs",
                             "(c.bytes_from_client - p.bytes_from_client)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("fs",
                             "(c.frames_from_client - p.frames_from_client)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("br",
                             "(c.bytes_to_client - p.bytes_to_client)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("fr",
                             "(c.frames_to_client - p.frames_to_client)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
 
         self.ids = CheckboxIdColumn(app, "id")
         self.add_column(self.ids)

Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py	2008-01-24 20:21:38 UTC (rev 1606)
+++ mgmt/cumin/python/cumin/exchange.py	2008-01-24 20:22:41 UTC (rev 1607)
@@ -47,16 +47,16 @@
         self.add_sql_column("bindings", "c.bindings")
         self.add_sql_column("mreceived",
                             "(c.msg_receives - p.msg_receives)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("breceived",
                             "(c.byte_receives - p.byte_receives)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("mrouted",
                             "(c.msg_routes - p.msg_routes)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("brouted",
                             "(c.byte_routes - p.byte_routes)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("mdropped", "c.msg_drops");
         self.add_sql_column("bdropped", "c.byte_drops");
 

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2008-01-24 20:21:38 UTC (rev 1606)
+++ mgmt/cumin/python/cumin/queue.py	2008-01-24 20:22:41 UTC (rev 1607)
@@ -31,16 +31,16 @@
         self.add_sql_column("bindings", "c.bindings")
         self.add_sql_column("menqueued",
                             "(c.msg_total_enqueues - p.msg_total_enqueues)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("benqueued",
                             "(c.byte_total_enqueues - p.byte_total_enqueues)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("mdequeued",
                             "(c.msg_total_dequeues - p.msg_total_dequeues)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("bdequeued",
                             "(c.byte_total_dequeues - p.byte_total_dequeues)" +
-                            " / extract(epoch from (c.rec_time - p.rec_time))");
+                            " / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001)");
         self.add_sql_column("mdepth", "c.msg_depth")
         self.add_sql_column("bdepth", "c.byte_depth")
         self.add_sql_column("mdepthaccel", "1")