r5172 - branches
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-12-09 19:44:19 +0000 (Fri, 09 Dec 2011)
New Revision: 5172
Added:
branches/stability/
Log:
Recreate stability as a clone of lucidity as a new starting point
12 years, 5 months
r5171 - branches
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-12-09 19:38:58 +0000 (Fri, 09 Dec 2011)
New Revision: 5171
Removed:
branches/stability/
Log:
No longer needed, tagged as cumin-0.1.4794
12 years, 5 months
r5170 - tags
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-12-09 18:47:14 +0000 (Fri, 09 Dec 2011)
New Revision: 5170
Added:
tags/cumin-0.1.5098/
Log:
Tag cumin-0.1.5098 for reference
12 years, 5 months
r5169 - tags
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-12-09 18:30:04 +0000 (Fri, 09 Dec 2011)
New Revision: 5169
Added:
tags/cumin-0.1.4794/
Log:
Tag cumin-0.1.4794 for reference
12 years, 5 months
r5168 - branches
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-12-09 18:25:48 +0000 (Fri, 09 Dec 2011)
New Revision: 5168
Removed:
branches/clarity/
Log:
Tagged clarity as tags/cumin-0.1.4916, removed branch
12 years, 5 months
r5167 - tags
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-12-09 18:19:38 +0000 (Fri, 09 Dec 2011)
New Revision: 5167
Added:
tags/cumin-0.1.4916/
Log:
Tag cumin-0.1.4916 for reference
12 years, 5 months
r5166 - branches/scale_testing/cumin/bin
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-12-07 16:05:00 +0000 (Wed, 07 Dec 2011)
New Revision: 5166
Modified:
branches/scale_testing/cumin/bin/cumin-data
Log:
Lost scale-stats option in the merge.
Modified: branches/scale_testing/cumin/bin/cumin-data
===================================================================
--- branches/scale_testing/cumin/bin/cumin-data 2011-12-07 15:25:47 UTC (rev 5165)
+++ branches/scale_testing/cumin/bin/cumin-data 2011-12-07 16:05:00 UTC (rev 5166)
@@ -141,6 +141,7 @@
# Add additional parameters for data
parser.add_option("--print-stats", action="store_true", default=False)
+ parser.add_option("--scale-stats", action="store_true", default=False)
parser.add_option("--print-events", type="int", default=0, metavar="LEVEL")
parser.add_option("--section", default="data")
parser.add_option("--daemon", action="store_true", default=False)
12 years, 5 months
r5165 - trunk/mint/python/mint
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-12-07 15:25:47 +0000 (Wed, 07 Dec 2011)
New Revision: 5165
Modified:
trunk/mint/python/mint/update.py
Log:
Optimization for statistics. Only write stats to database if one of the
stats values has changed since the last write. This helps in particular
when creation of a QMF console causes a republish event.
Modified: trunk/mint/python/mint/update.py
===================================================================
--- trunk/mint/python/mint/update.py 2011-12-06 20:24:23 UTC (rev 5164)
+++ trunk/mint/python/mint/update.py 2011-12-07 15:25:47 UTC (rev 5165)
@@ -513,6 +513,8 @@
return col, value
def process_statistics(self, obj, update_columns, insert_columns):
+ build_columns = list()
+ saw_change = False
for stat, value in self.qmf_object.getStatistics():
try:
col = obj._class._statistics_by_name[stat.name].sql_column
@@ -532,14 +534,19 @@
#
# XXX This optimization will be obsolete when QMF does it
# instead
-
if value != getattr(obj, col.name):
+ setattr(obj, col.name, value)
update_columns.append(col)
+ saw_change = True
- insert_columns.append(col)
+ # If we do end up seeing a value change, we will
+ # need to insert an entire row so build it up
+ build_columns.append(col)
- setattr(obj, col.name, value)
+ if saw_change:
+ insert_columns.extend(build_columns)
+
def execute_sql(self, cursor, text, args):
try:
cursor.execute(text, args)
12 years, 5 months
r5164 - branches/noflash/cumin/resources
by croberts@fedoraproject.org
Author: croberts
Date: 2011-12-06 20:24:23 +0000 (Tue, 06 Dec 2011)
New Revision: 5164
Modified:
branches/noflash/cumin/resources/app.js
Log:
Cleaning up the display of the charts by 1) Changing the date formatting on the tooltips (shorter date/time display) and 2) Tweaking some of the options on cursor to remove the cursor tracking "legend" and providing explicit values for some of the visual elements on the moused-over data points.
Modified: branches/noflash/cumin/resources/app.js
===================================================================
--- branches/noflash/cumin/resources/app.js 2011-12-06 18:13:50 UTC (rev 5163)
+++ branches/noflash/cumin/resources/app.js 2011-12-06 20:24:23 UTC (rev 5164)
@@ -639,13 +639,22 @@
},
},
highlighter: {
+ sizeAdjust: 6,
+ lineWidthAdjust: 2.5,
+ showTooltip:true,
+ fadeTooltip:true,
+ tooltipOffset: 2,
+ tooltipSeparator: ",",
tooltipaxes:'xy',
useAxesFormatters:true,
show: true,
formatString:'<table class="jqplot-highlighter"><tr><td>Time:</td><td>%s</td></tr><tr><td>Value:</td><td>%s</td></tr></table>'
},
- cursor:{show:true,
+ cursor:{
+ style:"pointer",
+ show:true,
zoom:true,
+ showTooltip:false, // this is for the tooltip that gives the location of the cursor whether on a point or not
looseZoom:true,
showCursorLegend:false,
constrainZoomTo: 'x'
@@ -687,10 +696,11 @@
// when called to render a popup tooltip, the caller is named "g"...not sure why. Whattup, g?
if(arguments.callee.caller.getName() == 'g') {
var tempTime = allCharts['chartNowTime'].clone();
+ timeFormat = "%b %e, %T";
if(format.search(/min/) > -1) {
- return (tempTime.increment('minute', val));
+ return (tempTime.increment('minute', val).format(timeFormat));
} else {
- return (tempTime.increment('hour', val));
+ return (tempTime.increment('hour', val).format(timeFormat));
}
}
return ($j.jqplot.sprintf(format, val)).replace(/-/,""); // hack to prevent negative axis labels, which we don't have
12 years, 5 months
r5163 - in branches/noflash/cumin: python/cumin resources
by croberts@fedoraproject.org
Author: croberts
Date: 2011-12-06 18:13:50 +0000 (Tue, 06 Dec 2011)
New Revision: 5163
Modified:
branches/noflash/cumin/python/cumin/widgets.strings
branches/noflash/cumin/resources/app.js
Log:
Fixing problem with the charts where, upon pausing or being updated, the date/time displayed for the mouseover tooltip was being based off of the current time rather than the last time the chart was updated (and was therefore based off of).
Modified: branches/noflash/cumin/python/cumin/widgets.strings
===================================================================
--- branches/noflash/cumin/python/cumin/widgets.strings 2011-12-05 20:21:53 UTC (rev 5162)
+++ branches/noflash/cumin/python/cumin/widgets.strings 2011-12-06 18:13:50 UTC (rev 5163)
@@ -149,6 +149,7 @@
wooly.resumeIntervalUpdate();
cumin.expireIntervalUpdate();
cumin.set_updated(true);
+ drawAllCharts();
}
}, 30*60*1000); // The page updates will last for 30 minutes before the "resume updates" button appears
};
Modified: branches/noflash/cumin/resources/app.js
===================================================================
--- branches/noflash/cumin/resources/app.js 2011-12-05 20:21:53 UTC (rev 5162)
+++ branches/noflash/cumin/resources/app.js 2011-12-06 18:13:50 UTC (rev 5163)
@@ -434,6 +434,7 @@
cycles/memory
*/
var allCharts = new Object();
+allCharts['chartNowTime'] = new Date();
chart_href = 0; //used if we rearrange the divs that show the charts
window.addEvent("domready", function() {
drawAllCharts();
@@ -460,6 +461,7 @@
if($('shock').style.display != "undefined" && $('shock').style.display != "block") {
var jsonurl = $(id).getParent().getElements('a')[chart_href].get('href');
var passback = "";
+ allCharts['chartNowTime'] = new Date();
wooly.setIntervalUpdate(jsonurl, stathandler, 0, passback, true);
}
}
@@ -638,6 +640,7 @@
},
highlighter: {
tooltipaxes:'xy',
+ useAxesFormatters:true,
show: true,
formatString:'<table class="jqplot-highlighter"><tr><td>Time:</td><td>%s</td></tr><tr><td>Value:</td><td>%s</td></tr></table>'
},
@@ -652,7 +655,6 @@
var divName = $(holder).get('id');
// If we have no real data to plot, add a fake coordinate to plot an empty chart
- var needToReplot = true;
for (i=0; i < dataContainer['labels'].length; i++) {
if(dataContainer['y_coordinate_values'][i].length == 0) {
dataContainer['y_coordinate_values'][i] = [1,0];
@@ -682,6 +684,15 @@
if (!format) {
format = $j.jqplot.config.defaultTickFormatString;
}
+ // when called to render a popup tooltip, the caller is named "g"...not sure why. Whattup, g?
+ if(arguments.callee.caller.getName() == 'g') {
+ var tempTime = allCharts['chartNowTime'].clone();
+ if(format.search(/min/) > -1) {
+ return (tempTime.increment('minute', val));
+ } else {
+ return (tempTime.increment('hour', val));
+ }
+ }
return ($j.jqplot.sprintf(format, val)).replace(/-/,""); // hack to prevent negative axis labels, which we don't have
}
else {
@@ -768,4 +779,17 @@
}
return result;
-}
\ No newline at end of file
+}
+
+// utility function to get the name of the function that this is called on
+Function.prototype.getName = function()
+{
+ if(this.name)
+ return this.name;
+ var definition = this.toString().split("\n")[0];
+ var exp = /^function ([^\s(]+).+/;
+ if(exp.test(definition))
+ return definition.split("\n")[0].replace(exp, "$1") || "anonymous";
+ return "anonymous";
+}
+
12 years, 5 months