Regexp caching

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 359 matching lines @@
 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;
   }
 
-  if (regexp->type()->IsSmi()) {
-    switch (regexp->type_tag()) {
-    case JSRegExp::ATOM:
-      fprintf(logfile_, "a");
-      break;
-    default:
-      break;
-    }
+  switch (regexp->TypeTag()) {
+  case JSRegExp::ATOM:

[Kasper Lund, 2008/10/24 06:42:50]

Fix switch indentation. The cases should be indented with two spaces.

+    fprintf(logfile_, "a");
+    break;
+  default:
+    break;
   }
   fprintf(logfile_, "/");
   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()) {
     fprintf(logfile_, "i");
   }
   // multiline flag
   Handle<Object> multiline = GetProperty(regexp, "multiline");
   if (multiline->IsTrue()) {
     fprintf(logfile_, "m");
   }
 }
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 
-void Logger::RegExpCompileEvent(Handle<JSRegExp> regexp) {
+void Logger::RegExpCompileEvent(Handle<JSRegExp> regexp, bool in_cache) {
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (logfile_ == NULL || !FLAG_log_regexp) return;
   ScopedLock sl(mutex_);
 
   fprintf(logfile_, "regexp-compile,");
   LogRegExpSource(regexp);
-  fprintf(logfile_, "\n");
+  fprintf(logfile_, in_cache ? ",hit\n" : ",miss\n");
 #endif
 }
 
 
 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_);
@@ skipping 412 matching lines @@
   if (FLAG_log_state_changes) {
     LOG(StringEvent("Leaving", StateToString(state_)));
     if (previous_) {
       LOG(StringEvent("To", StateToString(previous_->state_)));
     }
   }
 }
 #endif
 
 } }  // namespace v8::internal