From b4f120eaddd5ec920a1d35671d35cbc794ee2f6f Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Fri, 20 Sep 2013 08:49:33 +0000 Subject: [PATCH] Prevent test-log.cc from creating log files. R=dcarney@chromium.org TEST=cctest/test-log/EquivalenceOfLoggingAndTraversal Review URL: https://codereview.chromium.org/23526073 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16852 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/flag-definitions.h | 1 + src/log.cc | 5 ++--- test/cctest/test-log.cc | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/flag-definitions.h b/src/flag-definitions.h index e734c7d..2c01251 100644 --- a/src/flag-definitions.h +++ b/src/flag-definitions.h @@ -771,6 +771,7 @@ DEFINE_bool(prof_browser_mode, true, "Used with --prof, turns on browser-compatible mode for profiling.") DEFINE_bool(log_regexp, false, "Log regular expression execution.") DEFINE_string(logfile, "v8.log", "Specify the name of the log file.") +DEFINE_bool(logfile_per_isolate, true, "Separate log files for each isolate.") DEFINE_bool(ll_prof, false, "Enable low-level linux profiler.") DEFINE_string(gc_fake_mmap, "/tmp/__v8_gc__", "Specify the name of the file for fake gc mmap used in ll_prof") diff --git a/src/log.cc b/src/log.cc index 0f0ad40..5c404bb 100644 --- a/src/log.cc +++ b/src/log.cc @@ -1765,15 +1765,14 @@ void Logger::LogAccessorCallbacks() { static void AddIsolateIdIfNeeded(Isolate* isolate, StringStream* stream) { - if (isolate->IsDefaultIsolate()) return; + if (isolate->IsDefaultIsolate() || !FLAG_logfile_per_isolate) return; stream->Add("isolate-%p-", isolate); } static SmartArrayPointer PrepareLogFileName( Isolate* isolate, const char* file_name) { - if (strchr(file_name, '%') != NULL || - !isolate->IsDefaultIsolate()) { + if (strchr(file_name, '%') != NULL || !isolate->IsDefaultIsolate()) { // If there's a '%' in the log file name we have to expand // placeholders. HeapStringAllocator allocator; diff --git a/test/cctest/test-log.cc b/test/cctest/test-log.cc index 6aa183d..6a1f039 100644 --- a/test/cctest/test-log.cc +++ b/test/cctest/test-log.cc @@ -91,6 +91,7 @@ class ScopedLoggerInitializer { i::FLAG_log = true; i::FLAG_prof = true; i::FLAG_logfile = i::Log::kLogToTemporaryFile; + i::FLAG_logfile_per_isolate = false; return false; } -- 2.7.4