Reviewers: Christian Plesner Hansen, Description: Added check for logging enabled in two places where processing/allocation was performed only to be used only as parameters for the LOG macro. Looked through all the uses of the LOG macro and found only these two places where additional checking was required.
Fixed a couple of comments looking through all the uses of the LOG macro. Please review this at http://codereview.chromium.org/20018 SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/compiler.cc M src/mark-compact.cc Index: src/compiler.cc =================================================================== --- src/compiler.cc (revision 1216) +++ src/compiler.cc (working copy) @@ -121,13 +121,19 @@ return Handle<JSFunction>::null(); } - if (script->name()->IsString()) { - SmartPointer<char> data = - String::cast(script->name())->ToCString(DISALLOW_NULLS); - LOG(CodeCreateEvent(is_eval ? "Eval" : "Script", *code, *data)); - } else { - LOG(CodeCreateEvent(is_eval ? "Eval" : "Script", *code, "")); +#ifdef ENABLE_LOGGING_AND_PROFILING + // Log the code generation for the script. Check explicit whether logging is + // to avoid allocating when not required. + if (Logger::is_enabled()) { + if (script->name()->IsString()) { + SmartPointer<char> data = + String::cast(script->name())->ToCString(DISALLOW_NULLS); + LOG(CodeCreateEvent(is_eval ? "Eval" : "Script", *code, *data)); + } else { + LOG(CodeCreateEvent(is_eval ? "Eval" : "Script", *code, "")); + } } +#endif // Allocate function. Handle<JSFunction> fun = @@ -292,17 +298,21 @@ return false; } - // Generate the code, update the function info, and return the code. #ifdef ENABLE_LOGGING_AND_PROFILING - if (script->name()->IsString()) { - int lineNum = script->GetLineNumber(start_position); - if (lineNum > 0) { - lineNum += script->line_offset()->value() + 1; + // Log the code generation. If source information is available include script + // name and line number. Check explicit whether logging is enabled as finding + // the line number is not for free. + if (Logger::is_enabled()) { + if (script->name()->IsString()) { + int lineNum = script->GetLineNumber(start_position); + if (lineNum > 0) { + lineNum += script->line_offset()->value() + 1; + } + LOG(CodeCreateEvent("LazyCompile", *code, *lit->name(), + String::cast(script->name()), lineNum)); + } else { + LOG(CodeCreateEvent("LazyCompile", *code, *lit->name())); } - LOG(CodeCreateEvent("LazyCompile", *code, *lit->name(), - String::cast(script->name()), lineNum)); - } else { - LOG(CodeCreateEvent("LazyCompile", *code, *lit->name())); } #endif Index: src/mark-compact.cc =================================================================== --- src/mark-compact.cc (revision 1216) +++ src/mark-compact.cc (working copy) @@ -1111,6 +1111,7 @@ } } else { if (object->IsCode()) { + // Notify the logger that compiled code has been collected. LOG(CodeDeleteEvent(Code::cast(object)->address())); } if (is_previous_alive) { // Transition from live to free. @@ -1678,7 +1679,7 @@ if (copied_to->IsCode()) { // may also update inline cache target. Code::cast(copied_to)->Relocate(new_addr - old_addr); - // Notify the logger that compile code has moved. + // Notify the logger that compiled code has moved. LOG(CodeMoveEvent(old_addr, new_addr)); } --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
