Misc

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 331 matching lines @@
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (logfile_ == NULL || !FLAG_prof) return;
   ScopedLock sl(mutex_);
   fprintf(logfile_, "shared-library,\"%ls\",0x%08x,0x%08x\n", library_path,
           start, end);
 #endif
 }
 
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
+void Logger::LogString(Handle<String> str) {
+  int len = str->length();
+  if (len > 256)
+    len = 256;
+  for (int i = 0; i < len; i++) {
+    uc32 c = str->Get(i);
+    if (c < 32 || (c > 126 && c <= 255)) {
+      fprintf(logfile_, "\\x%02x", c);
+    } else if (c > 255) {
+      fprintf(logfile_, "\\u%04x", c);
+    } else if (c == ',') {
+      fprintf(logfile_, "\\,");
+    } else {
+      fprintf(logfile_, "%lc", c);

[Erik Corry, 2008/10/22 11:44:15]

If you want to be able to reconstruct the original strings you should also
escape \ and /.  If this is too annoying considering the high frequency of \ in
regexp source then consider escaping with a different character instead, for
example %.

[Christian Plesner Hansen, 2008/10/22 11:59:02]

For now I'm not too worried about automatically reconstructing the original
regexp.

+    }
+  }
+}
+
 void Logger::LogRegExpSource(Handle<JSRegExp> regexp) {
   // Prints "/" + re.source + "/" +
   //      (re.global?"g":"") + (re.ignorecase?"i":"") + (re.multiline?"m":"")
 
   Handle<Object> source = GetProperty(regexp, "source");
   if (!source->IsString()) {
     fprintf(logfile_, "no source");
     return;
   }
-  Handle<String> source_string = Handle<String>::cast(source);
 
-  SmartPointer<uc16> cstring = source_string->ToWideCString();
   if (regexp->type()->IsSmi()) {
     switch (regexp->type_tag()) {
     case JSRegExp::ATOM:
       fprintf(logfile_, "a");
       break;
     default:
       break;
     }
   }
   fprintf(logfile_, "/");
-  for (int i = 0, n = source_string->length(); i < n; i++) {
-    uc16 c = cstring[i];
-    if (c < 32 || (c > 126 && c <= 255)) {
-      fprintf(logfile_, "\\x%02x", c);
-    } else if (c > 255) {
-      fprintf(logfile_, "\\u%04x", c);
-    } else {
-      fprintf(logfile_, "%lc", c);
-    }
-  }
+  LogString(Handle<String>::cast(source));
   fprintf(logfile_, "/");
 
   // global flag
   Handle<Object> global = GetProperty(regexp, "global");
   if (global->IsTrue()) {
     fprintf(logfile_, "g");
   }
   // ignorecase flag
   Handle<Object> ignorecase = GetProperty(regexp, "ignoreCase");
   if (ignorecase->IsTrue()) {
@@ skipping 22 matching lines @@
 
 void Logger::RegExpExecEvent(Handle<JSRegExp> regexp,
                              int start_index,
                              Handle<String> input_string) {
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (logfile_ == NULL || !FLAG_log_regexp) return;
   ScopedLock sl(mutex_);
 
   fprintf(logfile_, "regexp-run,");
   LogRegExpSource(regexp);
-  fprintf(logfile_, ",0x%08x,%d..%d\n",
-      input_string->Hash(), start_index, input_string->length());
+  fprintf(logfile_, ",");
+  LogString(input_string);
+  fprintf(logfile_, ",%d..%d\n", start_index, input_string->length());
 #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 396 matching lines @@
   if (FLAG_log_state_changes) {
     LOG(StringEvent("Leaving", StateToString(state_)));
     if (previous_) {
       LOG(StringEvent("To", StateToString(previous_->state_)));
     }
   }
 }
 #endif
 
 } }  // namespace v8::internal