Revision: 16050
Author: [email protected]
Date: Mon Aug 5 05:27:12 2013
Log: Revert "Return start/end profiling time in microseconds instead
of milliseconds"
This reverts r16049 for breaking build on windows.
[email protected],[email protected]
Review URL: https://codereview.chromium.org/22189002
http://code.google.com/p/v8/source/detail?r=16050
Modified:
/branches/bleeding_edge/include/v8-profiler.h
/branches/bleeding_edge/src/api.cc
/branches/bleeding_edge/src/profile-generator.cc
/branches/bleeding_edge/src/profile-generator.h
/branches/bleeding_edge/test/cctest/test-cpu-profiler.cc
=======================================
--- /branches/bleeding_edge/include/v8-profiler.h Mon Aug 5 04:48:24 2013
+++ /branches/bleeding_edge/include/v8-profiler.h Mon Aug 5 05:27:12 2013
@@ -149,16 +149,16 @@
const CpuProfileNode* GetSample(int index) const;
/**
- * Returns time when the profile recording started (in microseconds
+ * Returns time when the profile recording started (in milliseconds
* since the Epoch).
*/
- int64_t GetStartTime() const;
+ double GetStartTime() const;
/**
- * Returns time when the profile recording was stopped (in microseconds
+ * Returns time when the profile recording was stopped (in milliseconds
* since the Epoch).
*/
- int64_t GetEndTime() const;
+ double GetEndTime() const;
/**
* Deletes the profile and removes it from CpuProfiler's list.
=======================================
--- /branches/bleeding_edge/src/api.cc Mon Aug 5 04:48:24 2013
+++ /branches/bleeding_edge/src/api.cc Mon Aug 5 05:27:12 2013
@@ -7591,15 +7591,15 @@
}
-int64_t CpuProfile::GetStartTime() const {
+double CpuProfile::GetStartTime() const {
const i::CpuProfile* profile = reinterpret_cast<const
i::CpuProfile*>(this);
- return profile->start_time_us();
+ return profile->start_time_ms();
}
-int64_t CpuProfile::GetEndTime() const {
+double CpuProfile::GetEndTime() const {
const i::CpuProfile* profile = reinterpret_cast<const
i::CpuProfile*>(this);
- return profile->end_time_us();
+ return profile->end_time_ms();
}
=======================================
--- /branches/bleeding_edge/src/profile-generator.cc Mon Aug 5 04:48:24
2013
+++ /branches/bleeding_edge/src/profile-generator.cc Mon Aug 5 05:27:12
2013
@@ -376,8 +376,8 @@
: title_(title),
uid_(uid),
record_samples_(record_samples),
- start_time_us_(OS::Ticks()),
- end_time_us_(0) {
+ start_time_ms_(OS::TimeCurrentMillis()),
+ end_time_ms_(0) {
}
@@ -388,13 +388,13 @@
void CpuProfile::CalculateTotalTicksAndSamplingRate() {
- end_time_us_ = OS::Ticks();
+ end_time_ms_ = OS::TimeCurrentMillis();
top_down_.CalculateTotalTicks();
- double duration_ms = (end_time_us_ - start_time_us_) / 1000.;
- if (duration_ms < 1) duration_ms = 1;
+ double duration = end_time_ms_ - start_time_ms_;
+ if (duration < 1) duration = 1;
unsigned ticks = top_down_.root()->total_ticks();
- double rate = ticks / duration_ms;
+ double rate = ticks / duration;
top_down_.SetTickRatePerMs(rate);
}
=======================================
--- /branches/bleeding_edge/src/profile-generator.h Mon Aug 5 04:48:24 2013
+++ /branches/bleeding_edge/src/profile-generator.h Mon Aug 5 05:27:12 2013
@@ -216,8 +216,8 @@
int samples_count() const { return samples_.length(); }
ProfileNode* sample(int index) const { return samples_.at(index); }
- int64_t start_time_us() const { return start_time_us_; }
- int64_t end_time_us() const { return end_time_us_; }
+ double start_time_ms() const { return start_time_ms_; }
+ double end_time_ms() const { return end_time_ms_; }
void UpdateTicksScale();
@@ -228,8 +228,8 @@
const char* title_;
unsigned uid_;
bool record_samples_;
- int64_t start_time_us_;
- int64_t end_time_us_;
+ double start_time_ms_;
+ double end_time_ms_;
List<ProfileNode*> samples_;
ProfileTree top_down_;
=======================================
--- /branches/bleeding_edge/test/cctest/test-cpu-profiler.cc Mon Aug 5
04:48:24 2013
+++ /branches/bleeding_edge/test/cctest/test-cpu-profiler.cc Mon Aug 5
05:27:12 2013
@@ -415,13 +415,13 @@
v8::HandleScope scope(env->GetIsolate());
v8::CpuProfiler* cpu_profiler = env->GetIsolate()->GetCpuProfiler();
- double time_before_profiling = i::OS::Ticks();
+ double time_before_profiling = i::OS::TimeCurrentMillis();
v8::Local<v8::String> profile_name = v8::String::New("test");
cpu_profiler->StartCpuProfiling(profile_name);
const v8::CpuProfile* profile =
cpu_profiler->StopCpuProfiling(profile_name);
CHECK(time_before_profiling <= profile->GetStartTime());
CHECK(profile->GetStartTime() <= profile->GetEndTime());
- CHECK(profile->GetEndTime() <= i::OS::Ticks());
+ CHECK(profile->GetEndTime() <= i::OS::TimeCurrentMillis());
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
