Skip to content

V
V8
Commit 048b86d6 authored by yangguo@chromium.org's avatar yangguo@chromium.org
Browse files
Options

Log event start and event end separately when using --log-timer-events. 

R=haraken@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/12040075

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13529 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 6953861e
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 246 deletions
src/counters.cc
View file @ 048b86d6
...@@ -77,10 +77,13 @@ void* Histogram::CreateHistogram() const { ...@@ -77,10 +77,13 @@ void* Histogram::CreateHistogram() const {
// Start the timer. // Start the timer.
void HistogramTimer::Start() { void HistogramTimer::Start() {
if (histogram_.Enabled() || FLAG_log_internal_timer_events) { if (histogram_.Enabled()) {
stop_time_ = 0; stop_time_ = 0;
start_time_ = OS::Ticks(); start_time_ = OS::Ticks();
} }
if (FLAG_log_internal_timer_events) {
LOG(Isolate::Current(), TimerEvent(Logger::START, histogram_.name_));
}
} }
// Stop the timer and record the results. // Stop the timer and record the results.
...@@ -92,8 +95,7 @@ void HistogramTimer::Stop() { ...@@ -92,8 +95,7 @@ void HistogramTimer::Stop() {
histogram_.AddSample(milliseconds); histogram_.AddSample(milliseconds);
} }
if (FLAG_log_internal_timer_events) { if (FLAG_log_internal_timer_events) {
LOG(Isolate::Current(), LOG(Isolate::Current(), TimerEvent(Logger::END, histogram_.name_));
TimerEvent(histogram_.name_, start_time_, OS::Ticks()));
} }
} }
......
src/log.cc
View file @ 048b86d6
...@@ -633,46 +633,30 @@ void Logger::SharedLibraryEvent(const wchar_t* library_path, ...@@ -633,46 +633,30 @@ void Logger::SharedLibraryEvent(const wchar_t* library_path,
} }
void Logger::TimerEvent(const char* name, int64_t start, int64_t end) { void Logger::TimerEvent(StartEnd se, const char* name) {
if (!log_->IsEnabled()) return; if (!log_->IsEnabled()) return;
ASSERT(FLAG_log_internal_timer_events); ASSERT(FLAG_log_internal_timer_events);
LogMessageBuilder msg(this); LogMessageBuilder msg(this);
int since_epoch = static_cast<int>(start - epoch_); int since_epoch = static_cast<int>(OS::Ticks() - epoch_);
int pause_time = static_cast<int>(end - start); const char* format = (se == START) ? "timer-event-start,\"%s\",%ld\n"
msg.Append("timer-event,\"%s\",%ld,%ld\n", name, since_epoch, pause_time); : "timer-event-end,\"%s\",%ld\n";
msg.Append(format, name, since_epoch);
msg.WriteToLogFile(); msg.WriteToLogFile();
} }
void Logger::ExternalSwitch(StateTag old_tag, StateTag new_tag) {
if (old_tag != EXTERNAL && new_tag == EXTERNAL) {
enter_external_ = OS::Ticks();
}
if (old_tag == EXTERNAL && new_tag != EXTERNAL && enter_external_ != 0) {
TimerEvent("V8.External", enter_external_, OS::Ticks());
enter_external_ = 0;
}
}
void Logger::EnterExternal() { void Logger::EnterExternal() {
LOGGER->enter_external_ = OS::Ticks(); LOG(ISOLATE, TimerEvent(START, TimerEventScope::v8_external));
} }
void Logger::LeaveExternal() { void Logger::LeaveExternal() {
if (enter_external_ == 0) return; LOG(ISOLATE, TimerEvent(END, TimerEventScope::v8_external));
Logger* logger = LOGGER;
logger->TimerEvent("V8.External", enter_external_, OS::Ticks());
logger->enter_external_ = 0;
} }
int64_t Logger::enter_external_ = 0; void Logger::TimerEventScope::LogTimerEvent(StartEnd se) {
LOG(isolate_, TimerEvent(se, name_));
void Logger::TimerEventScope::LogTimerEvent() {
LOG(isolate_, TimerEvent(name_, start_, OS::Ticks()));
} }
...@@ -683,6 +667,7 @@ const char* Logger::TimerEventScope::v8_recompile_parallel = ...@@ -683,6 +667,7 @@ const char* Logger::TimerEventScope::v8_recompile_parallel =
const char* Logger::TimerEventScope::v8_compile_full_code = const char* Logger::TimerEventScope::v8_compile_full_code =
"V8.CompileFullCode"; "V8.CompileFullCode";
const char* Logger::TimerEventScope::v8_execute = "V8.Execute"; const char* Logger::TimerEventScope::v8_execute = "V8.Execute";
const char* Logger::TimerEventScope::v8_external = "V8.External";
void Logger::LogRegExpSource(Handle<JSRegExp> regexp) { void Logger::LogRegExpSource(Handle<JSRegExp> regexp) {
......
src/log.h
View file @ 048b86d6
...@@ -273,8 +273,9 @@ class Logger { ...@@ -273,8 +273,9 @@ class Logger {
uintptr_t end); uintptr_t end);
// ==== Events logged by --log-timer-events. ==== // ==== Events logged by --log-timer-events. ====
void TimerEvent(const char* name, int64_t start, int64_t end); enum StartEnd { START, END };
void ExternalSwitch(StateTag old_tag, StateTag new_tag);
void TimerEvent(StartEnd se, const char* name);
static void EnterExternal(); static void EnterExternal();
static void LeaveExternal(); static void LeaveExternal();
...@@ -282,25 +283,25 @@ class Logger { ...@@ -282,25 +283,25 @@ class Logger {
class TimerEventScope { class TimerEventScope {
public: public:
TimerEventScope(Isolate* isolate, const char* name) TimerEventScope(Isolate* isolate, const char* name)
: isolate_(isolate), name_(name), start_(0) { : isolate_(isolate), name_(name) {
if (FLAG_log_internal_timer_events) start_ = OS::Ticks(); if (FLAG_log_internal_timer_events) LogTimerEvent(START);
} }
~TimerEventScope() { ~TimerEventScope() {
if (FLAG_log_internal_timer_events) LogTimerEvent(); if (FLAG_log_internal_timer_events) LogTimerEvent(END);
} }
void LogTimerEvent(); void LogTimerEvent(StartEnd se);
static const char* v8_recompile_synchronous; static const char* v8_recompile_synchronous;
static const char* v8_recompile_parallel; static const char* v8_recompile_parallel;
static const char* v8_compile_full_code; static const char* v8_compile_full_code;
static const char* v8_execute; static const char* v8_execute;
static const char* v8_external;
private: private:
Isolate* isolate_; Isolate* isolate_;
const char* name_; const char* name_;
int64_t start_;
}; };
// ==== Events logged by --log-regexp ==== // ==== Events logged by --log-regexp ====
...@@ -473,7 +474,6 @@ class Logger { ...@@ -473,7 +474,6 @@ class Logger {
Address prev_code_; Address prev_code_;
int64_t epoch_; int64_t epoch_;
static int64_t enter_external_;
friend class CpuProfiler; friend class CpuProfiler;
}; };
......
src/vm-state-inl.h
View file @ 048b86d6
...@@ -67,8 +67,8 @@ VMState::VMState(Isolate* isolate, StateTag tag) ...@@ -67,8 +67,8 @@ VMState::VMState(Isolate* isolate, StateTag tag)
LOG(isolate, UncheckedStringEvent("From", StateToString(previous_tag_))); LOG(isolate, UncheckedStringEvent("From", StateToString(previous_tag_)));
} }
if (FLAG_log_timer_events) { if (FLAG_log_timer_events && previous_tag_ != EXTERNAL && tag == EXTERNAL) {
LOG(isolate, ExternalSwitch(previous_tag_, tag)); LOG(isolate_, EnterExternal());
} }
isolate_->SetCurrentVMState(tag); isolate_->SetCurrentVMState(tag);
...@@ -84,8 +84,9 @@ VMState::~VMState() { ...@@ -84,8 +84,9 @@ VMState::~VMState() {
UncheckedStringEvent("To", StateToString(previous_tag_))); UncheckedStringEvent("To", StateToString(previous_tag_)));
} }
if (FLAG_log_timer_events) { if (FLAG_log_timer_events &&
LOG(isolate_, ExternalSwitch(isolate_->current_vm_state(), previous_tag_)); previous_tag_ != EXTERNAL && isolate_->current_vm_state() == EXTERNAL) {
LOG(isolate_, LeaveExternal());
} }
isolate_->SetCurrentVMState(previous_tag_); isolate_->SetCurrentVMState(previous_tag_);
......
tools/plot-timer-events
View file @ 048b86d6
...@@ -41,18 +41,25 @@ else ...@@ -41,18 +41,25 @@ else
$d8_exec --nocrankshaft --prof --logfile $calibration_log \ $d8_exec --nocrankshaft --prof --logfile $calibration_log \
--log-timer-events -e "$calibration_script" > /dev/null --log-timer-events -e "$calibration_script" > /dev/null
t_1=`grep "V8.Execute" $calibration_log | tail -n1 | awk -F, '{print $4}'` t_1_start=`grep "timer-event-start,\"V8.Execute\"" $calibration_log \
n_1=`grep "timer-event" $calibration_log | wc -l` | tail -n1 | awk -F, '{print $3}'`
t_1_end=`grep "timer-event-end,\"V8.Execute\"" $calibration_log \
| tail -n1 | awk -F, '{print $3}'`
n_1=`grep "timer-event\|tick" $calibration_log | wc -l`
$d8_exec --nocrankshaft --prof --logfile $calibration_log \ $d8_exec --nocrankshaft --prof --logfile $calibration_log \
--log-internal-timer-events -e "$calibration_script" > /dev/null --log-internal-timer-events -e "$calibration_script" > /dev/null
t_2=`grep "V8.Execute" $calibration_log | tail -n1 | awk -F, '{print $4}'` t_2_start=`grep "timer-event-start,\"V8.Execute\"" $calibration_log \
n_2=`grep "timer-event" $calibration_log | wc -l` | tail -n1 | awk -F, '{print $3}'`
t_2_end=`grep "timer-event-end,\"V8.Execute\"" $calibration_log \
| tail -n1 | awk -F, '{print $3}'`
n_2=`grep "timer-event\|tick" $calibration_log | wc -l`
rm $calibration_log rm $calibration_log
# Overhead in picoseconds. # Overhead in picoseconds.
distortion=`echo "1000*($t_1 - $t_2)/($n_1 - $n_2)" | bc` distortion=`echo "1000*(($t_1_end - $t_1_start) - ($t_2_end - $t_2_start)) \
/ ($n_1 - $n_2)" | bc`
fi fi
if [ -n "$PLOT_RANGE" ]; then if [ -n "$PLOT_RANGE" ]; then
......
tools/plot-timer-events.js
View file @ 048b86d6
...@@ -33,7 +33,6 @@ var kExecutionFrameWidth = 0.2; ...@@ -33,7 +33,6 @@ var kExecutionFrameWidth = 0.2;
var kStackFrameWidth = 0.1; var kStackFrameWidth = 0.1;
var kGapWidth = 0.05; var kGapWidth = 0.05;
var kPauseTolerance = 0.1; // Milliseconds.
var kY1Offset = 10; var kY1Offset = 10;
var kResX = 1600; var kResX = 1600;
...@@ -42,35 +41,57 @@ var kPauseLabelPadding = 5; ...@@ -42,35 +41,57 @@ var kPauseLabelPadding = 5;
var kNumPauseLabels = 7; var kNumPauseLabels = 7;
var kTickHalfDuration = 0.5; // Milliseconds var kTickHalfDuration = 0.5; // Milliseconds
var kCodeKindLabelPadding = 100; var kCodeKindLabelPadding = 100;
var kMinRangeLength = 0.0005; // Milliseconds
var num_timer_event = kY1Offset + 0.5; var num_timer_event = kY1Offset + 0.5;
var kNumThreads = 2;
var kExecutionThreadId = 0;
function TimerEvent(color, pause, no_execution) { function assert(something, message) {
if (!something) {
print(new Error(message).stack);
}
}
function TimerEvent(color, pause, thread_id) {
assert(thread_id >= 0 && thread_id < kNumThreads, "invalid thread id");
this.color = color; this.color = color;
this.pause = pause; this.pause = pause;
this.ranges = []; this.ranges = [];
this.no_execution = no_execution; this.thread_id = thread_id;
this.index = ++num_timer_event; this.index = ++num_timer_event;
} }
var TimerEvents = { var TimerEvents = {
'V8.Execute': new TimerEvent("#000000", false, false), 'V8.Execute': new TimerEvent("#000000", false, 0),
'V8.External': new TimerEvent("#3399FF", false, true), 'V8.External': new TimerEvent("#3399FF", false, 0),
'V8.CompileFullCode': new TimerEvent("#CC0000", true, true), 'V8.CompileFullCode': new TimerEvent("#CC0000", true, 0),
'V8.RecompileSynchronous': new TimerEvent("#CC0044", true, true), 'V8.RecompileSynchronous': new TimerEvent("#CC0044", true, 0),
'V8.RecompileParallel': new TimerEvent("#CC4499", false, false), 'V8.RecompileParallel': new TimerEvent("#CC4499", false, 1),
'V8.CompileEval': new TimerEvent("#CC4400", true, true), 'V8.CompileEval': new TimerEvent("#CC4400", true, 0),
'V8.Parse': new TimerEvent("#00CC00", true, true), 'V8.Parse': new TimerEvent("#00CC00", true, 0),
'V8.PreParse': new TimerEvent("#44CC00", true, true), 'V8.PreParse': new TimerEvent("#44CC00", true, 0),
'V8.ParseLazy': new TimerEvent("#00CC44", true, true), 'V8.ParseLazy': new TimerEvent("#00CC44", true, 0),
'V8.GCScavenger': new TimerEvent("#0044CC", true, true), 'V8.GCScavenger': new TimerEvent("#0044CC", true, 0),
'V8.GCCompactor': new TimerEvent("#4444CC", true, true), 'V8.GCCompactor': new TimerEvent("#4444CC", true, 0),
'V8.GCContext': new TimerEvent("#4400CC", true, true), 'V8.GCContext': new TimerEvent("#4400CC", true, 0),
} }
var kExecutionEvent = TimerEvents['V8.Execute'];
Array.prototype.top = function() {
if (this.length == 0) return undefined;
return this[this.length - 1];
}
var event_stack = [];
var last_time_stamp = [];
for (var i = 0; i < kNumThreads; i++) {
event_stack[i] = [];
last_time_stamp[i] = -1;
}
function CodeKind(color, kinds) { function CodeKind(color, kinds) {
...@@ -103,10 +124,9 @@ var code_map = new CodeMap(); ...@@ -103,10 +124,9 @@ var code_map = new CodeMap();
var xrange_start_override = undefined; var xrange_start_override = undefined;
var xrange_end_override = undefined; var xrange_end_override = undefined;
var distortion_per_entry = 0.005; // Milliseconds var distortion_per_entry = 0.005; // Milliseconds
var pause_tolerance = 0.005; // Milliseconds.
var sort_by_start = []; var distortion = 0;
var sort_by_end = [];
var sorted_ticks = [];
function Range(start, end) { function Range(start, end) {
...@@ -124,16 +144,37 @@ function Tick(tick) { ...@@ -124,16 +144,37 @@ function Tick(tick) {
Range.prototype.duration = function() { return this.end - this.start; } Range.prototype.duration = function() { return this.end - this.start; }
function ProcessTimerEvent(name, start, length) { function ProcessTimerEventStart(name, start) {
var event = TimerEvents[name]; // Find out the thread id.
if (event === undefined) return; var new_event = TimerEvents[name];
start /= 1000; // Convert to milliseconds. if (new_event === undefined) return;
length /= 1000; var thread_id = new_event.thread_id;
var end = start + length;
var range = new Range(start, end); start = Math.max(last_time_stamp[thread_id] + kMinRangeLength, start);
event.ranges.push(range);
sort_by_start.push(range); // Last event on this thread is done with the start of this event.
sort_by_end.push(range); var last_event = event_stack[thread_id].top();
if (last_event !== undefined) {
var new_range = new Range(last_time_stamp[thread_id], start);
last_event.ranges.push(new_range);
}
event_stack[thread_id].push(new_event);
last_time_stamp[thread_id] = start;
}
function ProcessTimerEventEnd(name, end) {
// Find out about the thread_id.
var finished_event = TimerEvents[name];
var thread_id = finished_event.thread_id;
assert(finished_event === event_stack[thread_id].pop(),
"inconsistent event stack");
end = Math.max(last_time_stamp[thread_id] + kMinRangeLength, end);
var new_range = new Range(last_time_stamp[thread_id], end);
finished_event.ranges.push(new_range);
last_time_stamp[thread_id] = end;
} }
...@@ -178,26 +219,16 @@ function FindCodeKind(kind) { ...@@ -178,26 +219,16 @@ function FindCodeKind(kind) {
function ProcessTickEvent(pc, sp, timer, unused_x, unused_y, vmstate, stack) { function ProcessTickEvent(pc, sp, timer, unused_x, unused_y, vmstate, stack) {
timer /= 1000;
var tick = new Tick(timer); var tick = new Tick(timer);
var entered = false;
var entry = code_map.findEntry(pc); var entry = code_map.findEntry(pc);
if (entry) { if (entry) FindCodeKind(entry.kind).in_execution.push(tick);
FindCodeKind(entry.kind).in_execution.push(tick);
entered = true;
}
for (var i = 0; i < kStackFrames; i++) { for (var i = 0; i < kStackFrames; i++) {
if (!stack[i]) break; if (!stack[i]) break;
var entry = code_map.findEntry(stack[i]); var entry = code_map.findEntry(stack[i]);
if (entry) { if (entry) FindCodeKind(entry.kind).stack_frames[i].push(tick);
FindCodeKind(entry.kind).stack_frames[i].push(tick);
entered = true;
}
} }
if (entered) sorted_ticks.push(tick);
} }
...@@ -212,62 +243,6 @@ function ProcessPlotRange(start, end) { ...@@ -212,62 +243,6 @@ function ProcessPlotRange(start, end) {
} }
function Undistort() {
// Undistort timers wrt instrumentation overhead.
sort_by_start.sort(function(a, b) { return b.start - a.start; });
sort_by_end.sort(function(a, b) { return b.end - a.end; });
sorted_ticks.sort(function(a, b) { return b.tick - a.tick; });
var distortion = 0;
var next_start = sort_by_start.pop();
var next_end = sort_by_end.pop();
var next_tick = sorted_ticks.pop();
function UndistortTicksUntil(tick) {
while (next_tick) {
if (next_tick.tick > tick) return;
next_tick.tick -= distortion;
next_tick = sorted_ticks.pop();
}
}
while (true) {
var next_start_start = next_start ? next_start.start : Infinity;
var next_end_end = next_end ? next_end.end : Infinity;
if (!next_start && !next_end) {
UndistortTicksUntil(Infinity);
break;
}
if (next_start_start <= next_end_end) {
UndistortTicksUntil(next_start_start);
// Undistort the start time stamp.
next_start.start -= distortion;
next_start = sort_by_start.pop();
} else {
// Undistort the end time stamp. We completely attribute the overhead
// to the point when we stop and log the timer, so we increase the
// distortion only here.
UndistortTicksUntil(next_end_end);
next_end.end -= distortion;
distortion += distortion_per_entry;
next_end = sort_by_end.pop();
}
}
sort_by_start = undefined;
sort_by_end = undefined;
sorted_ticks = undefined;
// Make sure that start <= end applies for every range.
for (name in TimerEvents) {
var ranges = TimerEvents[name].ranges;
for (var j = 0; j < ranges.length; j++) {
if (ranges[j].end < ranges[j].start) ranges[j].end = ranges[j].start;
}
}
}
function FindPlotRange() { function FindPlotRange() {
var start_found = (xrange_start_override || xrange_start_override == 0); var start_found = (xrange_start_override || xrange_start_override == 0);
var end_found = (xrange_end_override || xrange_end_override == 0); var end_found = (xrange_end_override || xrange_end_override == 0);
...@@ -299,14 +274,26 @@ function FindPlotRange() { ...@@ -299,14 +274,26 @@ function FindPlotRange() {
} }
} }
} }
// Set pause tolerance to something appropriate for the plot resolution
// to make it easier for gnuplot.
pause_tolerance = (xrange_end - xrange_start) / kResX / 10;
}
function parseTimeStamp(timestamp) {
distortion += distortion_per_entry;
return parseInt(timestamp) / 1000 - distortion;
} }
function CollectData() { function CollectData() {
// Collect data from log. // Collect data from log.
var logreader = new LogReader( var logreader = new LogReader(
{ 'timer-event' : { parsers: [null, parseInt, parseInt], { 'timer-event-start': { parsers: [null, parseTimeStamp],
processor: ProcessTimerEvent }, processor: ProcessTimerEventStart },
'timer-event-end': { parsers: [null, parseTimeStamp],
processor: ProcessTimerEventEnd },
'shared-library': { parsers: [null, parseInt, parseInt], 'shared-library': { parsers: [null, parseInt, parseInt],
processor: ProcessSharedLibrary }, processor: ProcessSharedLibrary },
'code-creation': { parsers: [null, parseInt, parseInt, parseInt, null], 'code-creation': { parsers: [null, parseInt, parseInt, parseInt, null],
...@@ -315,7 +302,7 @@ function CollectData() { ...@@ -315,7 +302,7 @@ function CollectData() {
processor: ProcessCodeMoveEvent }, processor: ProcessCodeMoveEvent },
'code-delete': { parsers: [parseInt], 'code-delete': { parsers: [parseInt],
processor: ProcessCodeDeleteEvent }, processor: ProcessCodeDeleteEvent },
'tick': { parsers: [parseInt, parseInt, parseInt, 'tick': { parsers: [parseInt, parseInt, parseTimeStamp,
null, null, parseInt, 'var-args'], null, null, parseInt, 'var-args'],
processor: ProcessTickEvent }, processor: ProcessTickEvent },
'distortion': { parsers: [parseInt], 'distortion': { parsers: [parseInt],
...@@ -329,8 +316,6 @@ function CollectData() { ...@@ -329,8 +316,6 @@ function CollectData() {
logreader.processLogLine(line); logreader.processLogLine(line);
} }
Undistort();
// Collect execution pauses. // Collect execution pauses.
for (name in TimerEvents) { for (name in TimerEvents) {
var event = TimerEvents[name]; var event = TimerEvents[name];
...@@ -339,25 +324,6 @@ function CollectData() { ...@@ -339,25 +324,6 @@ function CollectData() {
for (var j = 0; j < ranges.length; j++) execution_pauses.push(ranges[j]); for (var j = 0; j < ranges.length; j++) execution_pauses.push(ranges[j]);
} }
execution_pauses = MergeRanges(execution_pauses); execution_pauses = MergeRanges(execution_pauses);
// Knock out time not spent in javascript execution. Note that this also
// includes time spent external code, which do not contribute to execution
// pauses.
var exclude_ranges = [];
for (name in TimerEvents) {
var event = TimerEvents[name];
if (!event.no_execution) continue;
var ranges = event.ranges;
// Add ranges of this event to the pause list.
for (var j = 0; j < ranges.length; j++) {
exclude_ranges.push(ranges[j]);
}
}
kExecutionEvent.ranges = MergeRanges(kExecutionEvent.ranges);
exclude_ranges = MergeRanges(exclude_ranges);
kExecutionEvent.ranges = ExcludeRanges(kExecutionEvent.ranges,
exclude_ranges);
} }
...@@ -392,7 +358,7 @@ function MergeRanges(ranges) { ...@@ -392,7 +358,7 @@ function MergeRanges(ranges) {
for (j = i + 1; j < ranges.length; j++) { for (j = i + 1; j < ranges.length; j++) {
var next_range = ranges[j]; var next_range = ranges[j];
// Don't merge ranges if there is no overlap (including merge tolerance). // Don't merge ranges if there is no overlap (including merge tolerance).
if (next_range.start > merge_end + kPauseTolerance) break; if (next_range.start > merge_end + pause_tolerance) break;
// Merge ranges. // Merge ranges.
if (next_range.end > merge_end) { // Extend range end. if (next_range.end > merge_end) { // Extend range end.
merge_end = next_range.end; merge_end = next_range.end;
...@@ -406,84 +372,14 @@ function MergeRanges(ranges) { ...@@ -406,84 +372,14 @@ function MergeRanges(ranges) {
} }
function ExcludeRanges(include, exclude) { function RestrictRangesTo(ranges, start, end) {
// We assume that both input lists are sorted and merged with MergeRanges.
var result = []; var result = [];
var exclude_index = 0; for (var i = 0; i < ranges.length; i++) {
var include_index = 0; if (ranges[i].start <= end && ranges[i].end >= start) {
var include_start, include_end, exclude_start, exclude_end; result.push(new Range(Math.max(ranges[i].start, start),
Math.min(ranges[i].end, end)));
function NextInclude() {
if (include_index >= include.length) return false;
include_start = include[include_index].start;
include_end = include[include_index].end;
include_index++;
return true;
}
function NextExclude() {
if (exclude_index >= exclude.length) {
// No more exclude, finish by repeating case (2).
exclude_start = Infinity;
exclude_end = Infinity;
return false;
} }
exclude_start = exclude[exclude_index].start;
exclude_end = exclude[exclude_index].end;
exclude_index++;
return true;
} }
if (!NextInclude() || !NextExclude()) return include;
while (true) {
if (exclude_end <= include_start) {
// (1) Exclude and include do not overlap.
// Include #####
// Exclude ##
NextExclude();
} else if (include_end <= exclude_start) {
// (2) Exclude and include do not overlap.
// Include #####
// Exclude ###
result.push(new Range(include_start, include_end));
if (!NextInclude()) break;
} else if (exclude_start <= include_start &&
exclude_end < include_end &&
include_start < exclude_end) {
// (3) Exclude overlaps with begin of include.
// Include #######
// Exclude #####
// Result ####
include_start = exclude_end;
NextExclude();
} else if (include_start < exclude_start &&
include_end <= exclude_end &&
exclude_start < include_end) {
// (4) Exclude overlaps with end of include.
// Include #######
// Exclude #####
// Result ####
result.push(new Range(include_start, exclude_start));
if (!NextInclude()) break;
} else if (exclude_start > include_start && exclude_end < include_end) {
// (5) Exclude splits include into two parts.
// Include #######
// Exclude ##
// Result ## ###
result.push(new Range(include_start, exclude_start));
include_start = exclude_end;
NextExclude();
} else if (exclude_start <= include_start && exclude_end >= include_end) {
// (6) Exclude entirely covers include.
// Include ######
// Exclude #########
if (!NextInclude()) break;
} else {
throw new Error("this should not happen!");
}
}
return result; return result;
} }
...@@ -506,10 +402,8 @@ function GnuplotOutput() { ...@@ -506,10 +402,8 @@ function GnuplotOutput() {
var total = 0; var total = 0;
for (var name in TimerEvents) { for (var name in TimerEvents) {
var event = TimerEvents[name]; var event = TimerEvents[name];
var ranges = MergeRanges(event.ranges); var ranges = RestrictRangesTo(event.ranges, xrange_start, xrange_end);
var exclude_ranges = [new Range(-Infinity, xrange_start), ranges = MergeRanges(ranges);
new Range(xrange_end, Infinity)];
ranges = ExcludeRanges(ranges, exclude_ranges);
var sum = var sum =
ranges.map(function(range) { return range.duration(); }) ranges.map(function(range) { return range.duration(); })
.reduce(function(a, b) { return a + b; }, 0); .reduce(function(a, b) { return a + b; }, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment