Author: [email protected]
Date: Mon May 25 01:39:22 2009
New Revision: 2037
Modified:
branches/bleeding_edge/src/codegen.cc
branches/bleeding_edge/src/compiler.cc
branches/bleeding_edge/src/func-name-inferrer.h
branches/bleeding_edge/src/log.cc
branches/bleeding_edge/src/log.h
branches/bleeding_edge/test/cctest/test-func-name-inference.cc
Log:
Merge in changes from readability review.
All changes from http://codereview.chromium.org/115024, except splitting
namespace declarations in two lines (will be done separately for all source
files).
Review URL: http://codereview.chromium.org/113763
Modified: branches/bleeding_edge/src/codegen.cc
==============================================================================
--- branches/bleeding_edge/src/codegen.cc (original)
+++ branches/bleeding_edge/src/codegen.cc Mon May 25 01:39:22 2009
@@ -211,7 +211,7 @@
bool CodeGenerator::ShouldGenerateLog(Expression* type) {
ASSERT(type != NULL);
- if (!Logger::is_enabled()) return false;
+ if (!Logger::IsEnabled()) return false;
Handle<String> name = Handle<String>::cast(type->AsLiteral()->handle());
if (FLAG_log_regexp) {
static Vector<const char> kRegexp = CStrVector("regexp");
Modified: branches/bleeding_edge/src/compiler.cc
==============================================================================
--- branches/bleeding_edge/src/compiler.cc (original)
+++ branches/bleeding_edge/src/compiler.cc Mon May 25 01:39:22 2009
@@ -159,7 +159,7 @@
#if defined ENABLE_LOGGING_AND_PROFILING || defined ENABLE_OPROFILE_AGENT
// Log the code generation for the script. Check explicit whether
logging is
// to avoid allocating when not required.
- if (Logger::is_enabled() || OProfileAgent::is_enabled()) {
+ if (Logger::IsEnabled() || OProfileAgent::is_enabled()) {
if (script->name()->IsString()) {
SmartPointer<char> data =
String::cast(script->name())->ToCString(DISALLOW_NULLS);
@@ -356,7 +356,7 @@
// 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() || OProfileAgent::is_enabled()) {
+ if (Logger::IsEnabled() || OProfileAgent::is_enabled()) {
Handle<String> func_name(name->length() > 0 ?
*name : shared->inferred_name());
if (script->name()->IsString()) {
Modified: branches/bleeding_edge/src/func-name-inferrer.h
==============================================================================
--- branches/bleeding_edge/src/func-name-inferrer.h (original)
+++ branches/bleeding_edge/src/func-name-inferrer.h Mon May 25 01:39:22 2009
@@ -34,41 +34,46 @@
// inference for anonymous functions during static analysis of source code.
// Inference is performed in cases when an anonymous function is assigned
// to a variable or a property (see test-func-name-inference.cc for
examples.)
-
+//
// The basic idea is that during AST traversal LHSs of expressions are
// always visited before RHSs. Thus, during visiting the LHS, a name can be
// collected, and during visiting the RHS, a function literal can be
collected.
// Inference is performed while leaving the assignment node.
-
class FuncNameInferrer BASE_EMBEDDED {
public:
- FuncNameInferrer() :
- entries_stack_(10),
- names_stack_(5),
- funcs_to_infer_(4),
- dot_(Factory::NewStringFromAscii(CStrVector("."))) {
+ FuncNameInferrer()
+ : entries_stack_(10),
+ names_stack_(5),
+ funcs_to_infer_(4),
+ dot_(Factory::NewStringFromAscii(CStrVector("."))) {
}
+ // Returns whether we have entered name collection state.
bool IsOpen() const { return !entries_stack_.is_empty(); }
+ // Pushes an enclosing the name of enclosing function onto names stack.
void PushEnclosingName(Handle<String> name);
+ // Enters name collection state.
void Enter() {
entries_stack_.Add(names_stack_.length());
}
+ // Pushes an encountered name onto names stack when in collection state.
void PushName(Handle<String> name) {
if (IsOpen()) {
names_stack_.Add(name);
}
}
+ // Adds a function to infer name for.
void AddFunction(FunctionLiteral* func_to_infer) {
if (IsOpen()) {
funcs_to_infer_.Add(func_to_infer);
}
}
+ // Infers a function name and leaves names collection state.
void InferAndLeave() {
ASSERT(IsOpen());
if (!funcs_to_infer_.is_empty()) {
@@ -78,8 +83,13 @@
}
private:
+ // Constructs a full name in dotted notation from gathered names.
Handle<String> MakeNameFromStack();
+
+ // A helper function for MakeNameFromStack.
Handle<String> MakeNameFromStackHelper(int pos, Handle<String> prev);
+
+ // Performs name inferring for added functions.
void InferFunctionsNames();
ZoneList<int> entries_stack_;
@@ -95,15 +105,17 @@
// leaving scope.
class ScopedFuncNameInferrer BASE_EMBEDDED {
public:
- explicit ScopedFuncNameInferrer(FuncNameInferrer* inferrer) :
- inferrer_(inferrer),
- is_entered_(false) {}
+ explicit ScopedFuncNameInferrer(FuncNameInferrer* inferrer)
+ : inferrer_(inferrer),
+ is_entered_(false) {}
+
~ScopedFuncNameInferrer() {
if (is_entered_) {
inferrer_->InferAndLeave();
}
}
+ // Triggers the wrapped inferrer into name collection state.
void Enter() {
inferrer_->Enter();
is_entered_ = true;
Modified: branches/bleeding_edge/src/log.cc
==============================================================================
--- branches/bleeding_edge/src/log.cc (original)
+++ branches/bleeding_edge/src/log.cc Mon May 25 01:39:22 2009
@@ -303,30 +303,37 @@
// Frees all resources acquired in Open... functions.
static void Close();
- // See description in v8.h.
+ // See description in include/v8.h.
static int GetLogLines(int from_pos, char* dest_buf, int max_size);
- static bool is_enabled() { return output_.handle != NULL; }
+ // Returns whether logging is enabled.
+ static bool IsEnabled() {
+ return output_handle_ != NULL || output_buffer_ != NULL;
+ }
- typedef int (*WritePtr)(const char* msg, int length);
private:
+ typedef int (*WritePtr)(const char* msg, int length);
+
+ // Initialization function called from Open... functions.
static void Init();
// Write functions assume that mutex_ is acquired by the caller.
static WritePtr Write;
+ // Implementation of writing to a log file.
static int WriteToFile(const char* msg, int length) {
- ASSERT(output_.handle != NULL);
- int rv = fwrite(msg, 1, length, output_.handle);
+ ASSERT(output_handle_ != NULL);
+ int rv = fwrite(msg, 1, length, output_handle_);
ASSERT(length == rv);
return rv;
}
+ // Implementation of writing to a memory buffer.
static int WriteToMemory(const char* msg, int length) {
- ASSERT(output_.buffer != NULL);
- ASSERT(output_buffer_write_pos_ >= output_.buffer);
+ ASSERT(output_buffer_ != NULL);
+ ASSERT(output_buffer_write_pos_ >= output_buffer_);
if (output_buffer_write_pos_ + length
- <= output_.buffer + kOutputBufferSize) {
+ <= output_buffer_ + kOutputBufferSize) {
memcpy(output_buffer_write_pos_, msg, length);
output_buffer_write_pos_ += length;
return length;
@@ -336,14 +343,14 @@
}
}
- // When logging is active, output_ refers the file or memory buffer
- // events are written to.
- // mutex_ should be acquired before using output_.
- union Output {
- FILE* handle;
- char* buffer;
- };
- static Output output_;
+ // When logging is active, either output_handle_ or output_buffer_ is
used
+ // to store a pointer to log destination. If logging was opened via
OpenStdout
+ // or OpenFile, then output_handle_ is used. If logging was opened
+ // via OpenMemoryBuffer, then output_buffer_ is used.
+ // mutex_ should be acquired before using output_handle_ or
output_buffer_.
+ static FILE* output_handle_;
+
+ static char* output_buffer_;
// mutex_ is a Mutex used for enforcing exclusive
// access to the formatting buffer and the log file or log memory buffer.
@@ -367,7 +374,8 @@
Log::WritePtr Log::Write = NULL;
-Log::Output Log::output_ = {NULL};
+FILE* Log::output_handle_ = NULL;
+char* Log::output_buffer_ = NULL;
Mutex* Log::mutex_ = NULL;
char* Log::output_buffer_write_pos_ = NULL;
char* Log::message_buffer_ = NULL;
@@ -380,25 +388,25 @@
void Log::OpenStdout() {
- ASSERT(output_.handle == NULL);
- output_.handle = stdout;
+ ASSERT(!IsEnabled());
+ output_handle_ = stdout;
Write = WriteToFile;
Init();
}
void Log::OpenFile(const char* name) {
- ASSERT(output_.handle == NULL);
- output_.handle = OS::FOpen(name, OS::LogFileOpenMode);
+ ASSERT(!IsEnabled());
+ output_handle_ = OS::FOpen(name, OS::LogFileOpenMode);
Write = WriteToFile;
Init();
}
void Log::OpenMemoryBuffer() {
- ASSERT(output_.buffer == NULL);
- output_.buffer = NewArray<char>(kOutputBufferSize);
- output_buffer_write_pos_ = output_.buffer;
+ ASSERT(!IsEnabled());
+ output_buffer_ = NewArray<char>(kOutputBufferSize);
+ output_buffer_write_pos_ = output_buffer_;
Write = WriteToMemory;
Init();
}
@@ -406,11 +414,11 @@
void Log::Close() {
if (Write == WriteToFile) {
- fclose(output_.handle);
- output_.handle = NULL;
+ fclose(output_handle_);
+ output_handle_ = NULL;
} else if (Write == WriteToMemory) {
- DeleteArray(output_.buffer);
- output_.buffer = NULL;
+ DeleteArray(output_buffer_);
+ output_buffer_ = NULL;
} else {
ASSERT(Write == NULL);
}
@@ -426,15 +434,15 @@
int Log::GetLogLines(int from_pos, char* dest_buf, int max_size) {
if (Write != WriteToMemory) return 0;
- ASSERT(output_.buffer != NULL);
- ASSERT(output_buffer_write_pos_ >= output_.buffer);
+ ASSERT(output_buffer_ != NULL);
+ ASSERT(output_buffer_write_pos_ >= output_buffer_);
ASSERT(from_pos >= 0);
ASSERT(max_size >= 0);
int actual_size = max_size;
- char* buffer_read_pos = output_.buffer + from_pos;
+ char* buffer_read_pos = output_buffer_ + from_pos;
ScopedLock sl(mutex_);
if (actual_size == 0
- || output_buffer_write_pos_ == output_.buffer
+ || output_buffer_write_pos_ == output_buffer_
|| buffer_read_pos >= output_buffer_write_pos_) {
// No data requested or can be returned.
return 0;
@@ -586,8 +594,8 @@
SlidingStateWindow* Logger::sliding_state_window_ = NULL;
-bool Logger::is_enabled() {
- return Log::is_enabled();
+bool Logger::IsEnabled() {
+ return Log::IsEnabled();
}
#endif // ENABLE_LOGGING_AND_PROFILING
@@ -595,7 +603,7 @@
void Logger::Preamble(const char* content) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
msg.WriteCStringToLogFile(content);
#endif
@@ -611,7 +619,7 @@
#ifdef ENABLE_LOGGING_AND_PROFILING
void Logger::UncheckedStringEvent(const char* name, const char* value) {
- if (!Log::is_enabled()) return;
+ if (!Log::IsEnabled()) return;
LogMessageBuilder msg;
msg.Append("%s,\"%s\"\n", name, value);
msg.WriteToLogFile();
@@ -621,7 +629,7 @@
void Logger::IntEvent(const char* name, int value) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log) return;
+ if (!Log::IsEnabled() || !FLAG_log) return;
LogMessageBuilder msg;
msg.Append("%s,%d\n", name, value);
msg.WriteToLogFile();
@@ -631,7 +639,7 @@
void Logger::HandleEvent(const char* name, Object** location) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_handles) return;
+ if (!Log::IsEnabled() || !FLAG_log_handles) return;
LogMessageBuilder msg;
msg.Append("%s,0x%" V8PRIxPTR "\n", name, location);
msg.WriteToLogFile();
@@ -644,7 +652,7 @@
// caller's responsibility to ensure that log is enabled and that
// FLAG_log_api is true.
void Logger::ApiEvent(const char* format, ...) {
- ASSERT(Log::is_enabled() && FLAG_log_api);
+ ASSERT(Log::IsEnabled() && FLAG_log_api);
LogMessageBuilder msg;
va_list ap;
va_start(ap, format);
@@ -657,7 +665,7 @@
void Logger::ApiNamedSecurityCheck(Object* key) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_api) return;
+ if (!Log::IsEnabled() || !FLAG_log_api) return;
if (key->IsString()) {
SmartPointer<char> str =
String::cast(key)->ToCString(DISALLOW_NULLS,
ROBUST_STRING_TRAVERSAL);
@@ -675,7 +683,7 @@
unsigned start,
unsigned end) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_prof) return;
+ if (!Log::IsEnabled() || !FLAG_prof) return;
LogMessageBuilder msg;
msg.Append("shared-library,\"%s\",0x%08x,0x%08x\n", library_path,
start, end);
@@ -688,7 +696,7 @@
unsigned start,
unsigned end) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_prof) return;
+ if (!Log::IsEnabled() || !FLAG_prof) return;
LogMessageBuilder msg;
msg.Append("shared-library,\"%ls\",0x%08x,0x%08x\n", library_path,
start, end);
@@ -743,7 +751,7 @@
void Logger::RegExpCompileEvent(Handle<JSRegExp> regexp, bool in_cache) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_regexp) return;
+ if (!Log::IsEnabled() || !FLAG_log_regexp) return;
LogMessageBuilder msg;
msg.Append("regexp-compile,");
LogRegExpSource(regexp);
@@ -755,7 +763,7 @@
void Logger::LogRuntime(Vector<const char> format, JSArray* args) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_runtime) return;
+ if (!Log::IsEnabled() || !FLAG_log_runtime) return;
HandleScope scope;
LogMessageBuilder msg;
for (int i = 0; i < format.length(); i++) {
@@ -796,7 +804,7 @@
void Logger::ApiIndexedSecurityCheck(uint32_t index) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_api) return;
+ if (!Log::IsEnabled() || !FLAG_log_api) return;
ApiEvent("api,check-security,%u\n", index);
#endif
}
@@ -807,7 +815,7 @@
Object* name) {
#ifdef ENABLE_LOGGING_AND_PROFILING
ASSERT(name->IsString());
- if (!Log::is_enabled() || !FLAG_log_api) return;
+ if (!Log::IsEnabled() || !FLAG_log_api) return;
String* class_name_obj = holder->class_name();
SmartPointer<char> class_name =
class_name_obj->ToCString(DISALLOW_NULLS, ROBUST_STRING_TRAVERSAL);
@@ -821,7 +829,7 @@
JSObject* holder,
uint32_t index) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_api) return;
+ if (!Log::IsEnabled() || !FLAG_log_api) return;
String* class_name_obj = holder->class_name();
SmartPointer<char> class_name =
class_name_obj->ToCString(DISALLOW_NULLS, ROBUST_STRING_TRAVERSAL);
@@ -831,7 +839,7 @@
void Logger::ApiObjectAccess(const char* tag, JSObject* object) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_api) return;
+ if (!Log::IsEnabled() || !FLAG_log_api) return;
String* class_name_obj = object->class_name();
SmartPointer<char> class_name =
class_name_obj->ToCString(DISALLOW_NULLS, ROBUST_STRING_TRAVERSAL);
@@ -842,7 +850,7 @@
void Logger::ApiEntryCall(const char* name) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_api) return;
+ if (!Log::IsEnabled() || !FLAG_log_api) return;
Logger::ApiEvent("api,%s\n", name);
#endif
}
@@ -850,7 +858,7 @@
void Logger::NewEvent(const char* name, void* object, size_t size) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log) return;
+ if (!Log::IsEnabled() || !FLAG_log) return;
LogMessageBuilder msg;
msg.Append("new,%s,0x%" V8PRIxPTR ",%u\n", name, object,
static_cast<unsigned int>(size));
@@ -861,7 +869,7 @@
void Logger::DeleteEvent(const char* name, void* object) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log) return;
+ if (!Log::IsEnabled() || !FLAG_log) return;
LogMessageBuilder msg;
msg.Append("delete,%s,0x%" V8PRIxPTR "\n", name, object);
msg.WriteToLogFile();
@@ -871,7 +879,7 @@
void Logger::CodeCreateEvent(const char* tag, Code* code, const char*
comment) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
msg.Append("code-creation,%s,0x%" V8PRIxPTR ",%d,\"", tag,
code->address(),
code->ExecutableSize());
@@ -890,7 +898,7 @@
void Logger::CodeCreateEvent(const char* tag, Code* code, String* name) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
SmartPointer<char> str =
name->ToCString(DISALLOW_NULLS, ROBUST_STRING_TRAVERSAL);
@@ -904,7 +912,7 @@
void Logger::CodeCreateEvent(const char* tag, Code* code, String* name,
String* source, int line) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
SmartPointer<char> str =
name->ToCString(DISALLOW_NULLS, ROBUST_STRING_TRAVERSAL);
@@ -921,7 +929,7 @@
void Logger::CodeCreateEvent(const char* tag, Code* code, int args_count) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
msg.Append("code-creation,%s,0x%" V8PRIxPTR ",%d,\"args_count: %d\"\n",
tag,
code->address(),
@@ -934,7 +942,7 @@
void Logger::RegExpCodeCreateEvent(Code* code, String* source) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
msg.Append("code-creation,%s,0x%" V8PRIxPTR ",%d,\"", "RegExp",
code->address(),
@@ -948,7 +956,7 @@
void Logger::CodeAllocateEvent(Code* code, Assembler* assem) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
msg.Append("code-allocate,0x%" V8PRIxPTR ",0x%" V8PRIxPTR "\n",
code->address(),
@@ -960,7 +968,7 @@
void Logger::CodeMoveEvent(Address from, Address to) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
msg.Append("code-move,0x%" V8PRIxPTR ",0x%" V8PRIxPTR "\n", from, to);
msg.WriteToLogFile();
@@ -970,7 +978,7 @@
void Logger::CodeDeleteEvent(Address from) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_code) return;
+ if (!Log::IsEnabled() || !FLAG_log_code) return;
LogMessageBuilder msg;
msg.Append("code-delete,0x%" V8PRIxPTR "\n", from);
msg.WriteToLogFile();
@@ -980,7 +988,7 @@
void Logger::ResourceEvent(const char* name, const char* tag) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log) return;
+ if (!Log::IsEnabled() || !FLAG_log) return;
LogMessageBuilder msg;
msg.Append("%s,%s,", name, tag);
@@ -998,7 +1006,7 @@
void Logger::SuspectReadEvent(String* name, Object* obj) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_suspect) return;
+ if (!Log::IsEnabled() || !FLAG_log_suspect) return;
LogMessageBuilder msg;
String* class_name = obj->IsJSObject()
? JSObject::cast(obj)->class_name()
@@ -1017,7 +1025,7 @@
void Logger::HeapSampleBeginEvent(const char* space, const char* kind) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_gc) return;
+ if (!Log::IsEnabled() || !FLAG_log_gc) return;
LogMessageBuilder msg;
msg.Append("heap-sample-begin,\"%s\",\"%s\"\n", space, kind);
msg.WriteToLogFile();
@@ -1027,7 +1035,7 @@
void Logger::HeapSampleEndEvent(const char* space, const char* kind) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_gc) return;
+ if (!Log::IsEnabled() || !FLAG_log_gc) return;
LogMessageBuilder msg;
msg.Append("heap-sample-end,\"%s\",\"%s\"\n", space, kind);
msg.WriteToLogFile();
@@ -1037,7 +1045,7 @@
void Logger::HeapSampleItemEvent(const char* type, int number, int bytes) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log_gc) return;
+ if (!Log::IsEnabled() || !FLAG_log_gc) return;
LogMessageBuilder msg;
msg.Append("heap-sample-item,%s,%d,%d\n", type, number, bytes);
msg.WriteToLogFile();
@@ -1047,7 +1055,7 @@
void Logger::DebugTag(const char* call_site_tag) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log) return;
+ if (!Log::IsEnabled() || !FLAG_log) return;
LogMessageBuilder msg;
msg.Append("debug-tag,%s\n", call_site_tag);
msg.WriteToLogFile();
@@ -1057,7 +1065,7 @@
void Logger::DebugEvent(const char* event_type, Vector<uint16_t>
parameter) {
#ifdef ENABLE_LOGGING_AND_PROFILING
- if (!Log::is_enabled() || !FLAG_log) return;
+ if (!Log::IsEnabled() || !FLAG_log) return;
StringBuilder s(parameter.length() + 1);
for (int i = 0; i < parameter.length(); ++i) {
s.AddCharacter(static_cast<char>(parameter[i]));
@@ -1076,7 +1084,7 @@
#ifdef ENABLE_LOGGING_AND_PROFILING
void Logger::TickEvent(TickSample* sample, bool overflow) {
- if (!Log::is_enabled() || !FLAG_prof) return;
+ if (!Log::IsEnabled() || !FLAG_prof) return;
LogMessageBuilder msg;
msg.Append("tick,0x%" V8PRIxPTR ",0x%" V8PRIxPTR ",%d",
sample->pc, sample->sp, static_cast<int>(sample->state));
Modified: branches/bleeding_edge/src/log.h
==============================================================================
--- branches/bleeding_edge/src/log.h (original)
+++ branches/bleeding_edge/src/log.h Mon May 25 01:39:22 2009
@@ -75,7 +75,7 @@
#ifdef ENABLE_LOGGING_AND_PROFILING
#define LOG(Call) \
do { \
- if (v8::internal::Logger::is_enabled()) \
+ if (v8::internal::Logger::IsEnabled()) \
v8::internal::Logger::Call; \
} while (false)
#else
@@ -201,7 +201,7 @@
return current_state_ ? current_state_->state() : OTHER;
}
- static bool is_enabled();
+ static bool IsEnabled();
// Pause/Resume collection of profiling data.
// When data collection is paused, Tick events are discarded until
Modified: branches/bleeding_edge/test/cctest/test-func-name-inference.cc
==============================================================================
--- branches/bleeding_edge/test/cctest/test-func-name-inference.cc
(original)
+++ branches/bleeding_edge/test/cctest/test-func-name-inference.cc Mon May
25 01:39:22 2009
@@ -32,15 +32,18 @@
#include "cctest.h"
+using ::v8::internal::CStrVector;
+using ::v8::internal::Factory;
using ::v8::internal::Handle;
+using ::v8::internal::Heap;
using ::v8::internal::JSFunction;
using ::v8::internal::Object;
+using ::v8::internal::Runtime;
using ::v8::internal::Script;
+using ::v8::internal::SmartPointer;
using ::v8::internal::SharedFunctionInfo;
using ::v8::internal::String;
-namespace i = ::v8::internal;
-
static v8::Persistent<v8::Context> env;
@@ -66,19 +69,19 @@
// Find the position of a given func source substring in the source.
Handle<String> func_pos_str =
- i::Factory::NewStringFromAscii(i::CStrVector(func_pos_src));
- int func_pos = i::Runtime::StringMatch(script_src, func_pos_str, 0);
+ Factory::NewStringFromAscii(CStrVector(func_pos_src));
+ int func_pos = Runtime::StringMatch(script_src, func_pos_str, 0);
CHECK_NE(0, func_pos);
// Obtain SharedFunctionInfo for the function.
Object* shared_func_info_ptr =
- i::Runtime::FindSharedFunctionInfoInScript(i_script, func_pos);
- CHECK(shared_func_info_ptr != i::Heap::undefined_value());
+ Runtime::FindSharedFunctionInfoInScript(i_script, func_pos);
+ CHECK(shared_func_info_ptr != Heap::undefined_value());
Handle<SharedFunctionInfo> shared_func_info(
SharedFunctionInfo::cast(shared_func_info_ptr));
// Verify inferred function name.
- i::SmartPointer<char> inferred_name =
+ SmartPointer<char> inferred_name =
shared_func_info->inferred_name()->ToCString();
CHECK_EQ(ref_inferred_name, *inferred_name);
}
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
