Experimental: merge from bleeding_edge. Merge up to and including...

src/log.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 414 matching lines @@
   ScopedLock sl(mutex_);
 
   fprintf(logfile_, "regexp-compile,");
   LogRegExpSource(regexp);
   fprintf(logfile_, in_cache ? ",hit\n" : ",miss\n");
 #endif
 }
 
 
 void Logger::LogRuntime(Vector<const char> format, JSArray* args) {
+#ifdef ENABLE_LOGGING_AND_PROFILING
   ScopedLock sl(mutex_);
   HandleScope scope;
   for (int i = 0; i < format.length(); i++) {
     char c = format[i];
     if (c == '%' && i <= format.length() - 2) {
       i++;
       ASSERT('0' <= format[i] && format[i] <= '9');
       Object* obj = args->GetElement(format[i] - '0');
       i++;
       switch (format[i]) {
@@ skipping 13 matching lines @@
           fprintf(logfile_, "%i", Smi::cast(obj)->value());
           break;
         default:
           UNREACHABLE();
       }
     } else {
       fputc(c, logfile_);
     }
   }
   fputc('\n', logfile_);
+#endif
 }
 
 
 void Logger::ApiIndexedSecurityCheck(uint32_t index) {
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (logfile_ == NULL || !FLAG_log_api) return;
   ApiEvent("api,check-security,%u\n", index);
 #endif
 }
 
@@ skipping 437 matching lines @@
   if (FLAG_log_state_changes) {
     LOG(StringEvent("Leaving", StateToString(state_)));
     if (previous_) {
       LOG(StringEvent("To", StateToString(previous_->state_)));
     }
   }
 }
 #endif
 
 } }  // namespace v8::internal