You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ss...@apache.org on 2013/12/13 23:01:05 UTC
git commit: Moved millisecond multiplication to do only once.
Updated Branches:
refs/heads/master 6e16cf939 -> ba9685680
Moved millisecond multiplication to do only once.
The view multiples Task timestamps by 1000 to get milliseconds all over
the place. Do that multiplication only once to save multiplication in
the most frequent loops.
Review: http://reviews.apache.org/r/16250
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ba968568
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ba968568
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ba968568
Branch: refs/heads/master
Commit: ba96856805466d0c1534953e0a9a6ad5587b83e4
Parents: 6e16cf9
Author: Ross Allen <ro...@gmail.com>
Authored: Fri Dec 6 12:18:34 2013 -0800
Committer: Ross Allen <ro...@gmail.com>
Committed: Fri Dec 13 12:01:51 2013 -0800
----------------------------------------------------------------------
src/webui/master/static/framework.html | 18 +++++++++---------
src/webui/master/static/js/controllers.js | 10 ++++++----
2 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ba968568/src/webui/master/static/framework.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/framework.html b/src/webui/master/static/framework.html
index bf7e020..be76763 100644
--- a/src/webui/master/static/framework.html
+++ b/src/webui/master/static/framework.html
@@ -95,11 +95,11 @@
<td>{{task.name}}</td>
<td>{{task.state | truncateMesosState}}</td>
<td>
- <abbr title="{{task.start_time * 1000 | isoDate}}">
- {{task.start_time * 1000 | relativeDate:pollTime}}</abbr>
+ <abbr title="{{task.start_time | isoDate}}">
+ {{task.start_time | relativeDate:pollTime}}</abbr>
<button class="btn btn-mini btn-toggle"
clipboard
- data-clipboard-text="{{task.start_time * 1000 | isoDate}}"
+ data-clipboard-text="{{task.start_time | isoDate}}"
tooltip="Copy start time"
tooltip-placement="right"
tooltip-trigger="clipboardhover">
@@ -163,22 +163,22 @@
<td>{{task.name}}</td>
<td>{{task.state | truncateMesosState}}</td>
<td>
- <abbr title="{{task.start_time * 1000 | isoDate}}">
- {{task.start_time * 1000 | relativeDate:pollTime}}</abbr>
+ <abbr title="{{task.start_time | isoDate}}">
+ {{task.start_time | relativeDate:pollTime}}</abbr>
<button class="btn btn-mini btn-toggle"
clipboard
- data-clipboard-text="{{task.start_time * 1000 | isoDate}}"
+ data-clipboard-text="{{task.start_time | isoDate}}"
tooltip="Copy start time"
tooltip-placement="right"
tooltip-trigger="clipboardhover">
</button>
</td>
<td>
- <abbr title="{{task.finish_time * 1000 | isoDate}}">
- {{task.finish_time * 1000 | relativeDate:pollTime}}</abbr>
+ <abbr title="{{task.finish_time | isoDate}}">
+ {{task.finish_time | relativeDate:pollTime}}</abbr>
<button class="btn btn-mini btn-toggle"
clipboard
- data-clipboard-text="{{task.finish_time * 1000 | isoDate}}"
+ data-clipboard-text="{{task.finish_time | isoDate}}"
tooltip="Copy finish time"
tooltip-placement="right"
tooltip-trigger="clipboardhover">
http://git-wip-us.apache.org/repos/asf/mesos/blob/ba968568/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index 16ba3e2..fb8ba88 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -230,8 +230,9 @@
task.executor_id = task.id;
}
if (task.statuses.length > 0) {
- task.start_time = task.statuses[0].timestamp;
- task.finish_time = task.statuses[task.statuses.length - 1].timestamp;
+ task.start_time = task.statuses[0].timestamp * 1000;
+ task.finish_time =
+ task.statuses[task.statuses.length - 1].timestamp * 1000;
}
});
_.each(framework.completed_tasks, function(task) {
@@ -239,8 +240,9 @@
task.executor_id = task.id;
}
if (task.statuses.length > 0) {
- task.start_time = task.statuses[0].timestamp;
- task.finish_time = task.statuses[task.statuses.length - 1].timestamp;
+ task.start_time = task.statuses[0].timestamp * 1000;
+ task.finish_time =
+ task.statuses[task.statuses.length - 1].timestamp * 1000;
}
});
});