Commit 630999d1 authored by yurys@chromium.org's avatar yurys@chromium.org

Remove --prof-auto flag

There is already --prof-lazy flag which should be enough.

BUG=None
R=yangguo@chromium.org

Review URL: https://codereview.chromium.org/20482003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15909 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 53c95353
...@@ -744,11 +744,9 @@ DEFINE_bool(log_snapshot_positions, false, ...@@ -744,11 +744,9 @@ DEFINE_bool(log_snapshot_positions, false,
DEFINE_bool(log_suspect, false, "Log suspect operations.") DEFINE_bool(log_suspect, false, "Log suspect operations.")
DEFINE_bool(prof, false, DEFINE_bool(prof, false,
"Log statistical profiling information (implies --log-code).") "Log statistical profiling information (implies --log-code).")
DEFINE_bool(prof_auto, true,
"Used with --prof, starts profiling automatically")
DEFINE_bool(prof_lazy, false, DEFINE_bool(prof_lazy, false,
"Used with --prof, only does sampling and logging" "Used with --prof, only does sampling and logging"
" when profiler is active (implies --noprof_auto).") " when profiler is active.")
DEFINE_bool(prof_browser_mode, true, DEFINE_bool(prof_browser_mode, true,
"Used with --prof, turns on browser-compatible mode for profiling.") "Used with --prof, turns on browser-compatible mode for profiling.")
DEFINE_bool(log_regexp, false, "Log regular expression execution.") DEFINE_bool(log_regexp, false, "Log regular expression execution.")
......
...@@ -66,10 +66,9 @@ void Log::Initialize(const char* log_file_name) { ...@@ -66,10 +66,9 @@ void Log::Initialize(const char* log_file_name) {
// --prof implies --log-code. // --prof implies --log-code.
if (FLAG_prof) FLAG_log_code = true; if (FLAG_prof) FLAG_log_code = true;
// --prof_lazy controls --log-code, implies --noprof_auto. // --prof_lazy controls --log-code.
if (FLAG_prof_lazy) { if (FLAG_prof_lazy) {
FLAG_log_code = false; FLAG_log_code = false;
FLAG_prof_auto = false;
} }
// If we're logging anything, we need to open the log file. // If we're logging anything, we need to open the log file.
......
...@@ -1998,10 +1998,9 @@ bool Logger::SetUp(Isolate* isolate) { ...@@ -1998,10 +1998,9 @@ bool Logger::SetUp(Isolate* isolate) {
FLAG_log_snapshot_positions = true; FLAG_log_snapshot_positions = true;
} }
// --prof_lazy controls --log-code, implies --noprof_auto. // --prof_lazy controls --log-code.
if (FLAG_prof_lazy) { if (FLAG_prof_lazy) {
FLAG_log_code = false; FLAG_log_code = false;
FLAG_prof_auto = false;
} }
SmartArrayPointer<const char> log_file_name = SmartArrayPointer<const char> log_file_name =
...@@ -2020,12 +2019,10 @@ bool Logger::SetUp(Isolate* isolate) { ...@@ -2020,12 +2019,10 @@ bool Logger::SetUp(Isolate* isolate) {
if (FLAG_prof) { if (FLAG_prof) {
profiler_ = new Profiler(isolate); profiler_ = new Profiler(isolate);
if (!FLAG_prof_auto) { if (FLAG_prof_lazy) {
profiler_->pause(); profiler_->pause();
} else { } else {
logging_nesting_ = 1; logging_nesting_ = 1;
}
if (!FLAG_prof_lazy) {
profiler_->Engage(); profiler_->Engage();
} }
} }
......
...@@ -60,7 +60,6 @@ class ScopedLoggerInitializer { ...@@ -60,7 +60,6 @@ class ScopedLoggerInitializer {
: saved_log_(i::FLAG_log), : saved_log_(i::FLAG_log),
saved_prof_lazy_(i::FLAG_prof_lazy), saved_prof_lazy_(i::FLAG_prof_lazy),
saved_prof_(i::FLAG_prof), saved_prof_(i::FLAG_prof),
saved_prof_auto_(i::FLAG_prof_auto),
temp_file_(NULL), temp_file_(NULL),
// Need to run this prior to creating the scope. // Need to run this prior to creating the scope.
trick_to_run_init_flags_(init_flags_(prof_lazy)), trick_to_run_init_flags_(init_flags_(prof_lazy)),
...@@ -76,7 +75,6 @@ class ScopedLoggerInitializer { ...@@ -76,7 +75,6 @@ class ScopedLoggerInitializer {
if (temp_file_ != NULL) fclose(temp_file_); if (temp_file_ != NULL) fclose(temp_file_);
i::FLAG_prof_lazy = saved_prof_lazy_; i::FLAG_prof_lazy = saved_prof_lazy_;
i::FLAG_prof = saved_prof_; i::FLAG_prof = saved_prof_;
i::FLAG_prof_auto = saved_prof_auto_;
i::FLAG_log = saved_log_; i::FLAG_log = saved_log_;
} }
...@@ -97,7 +95,6 @@ class ScopedLoggerInitializer { ...@@ -97,7 +95,6 @@ class ScopedLoggerInitializer {
i::FLAG_log = true; i::FLAG_log = true;
i::FLAG_prof = true; i::FLAG_prof = true;
i::FLAG_prof_lazy = prof_lazy; i::FLAG_prof_lazy = prof_lazy;
i::FLAG_prof_auto = false;
i::FLAG_logfile = i::Log::kLogToTemporaryFile; i::FLAG_logfile = i::Log::kLogToTemporaryFile;
return prof_lazy; return prof_lazy;
} }
...@@ -105,7 +102,6 @@ class ScopedLoggerInitializer { ...@@ -105,7 +102,6 @@ class ScopedLoggerInitializer {
const bool saved_log_; const bool saved_log_;
const bool saved_prof_lazy_; const bool saved_prof_lazy_;
const bool saved_prof_; const bool saved_prof_;
const bool saved_prof_auto_;
FILE* temp_file_; FILE* temp_file_;
const bool trick_to_run_init_flags_; const bool trick_to_run_init_flags_;
v8::HandleScope scope_; v8::HandleScope scope_;
......
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