Serializer enable/disable flags need thread safety.

src/serialize.cc

 // Copyright 2012 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 631 matching lines @@
 }
 
 
 ExternalReferenceDecoder::~ExternalReferenceDecoder() {
   for (int type = kFirstTypeCode; type < kTypeCodeCount; ++type) {
     DeleteArray(encodings_[type]);
   }
   DeleteArray(encodings_);
 }
 
-
-bool Serializer::serialization_enabled_ = false;
-bool Serializer::too_late_to_enable_now_ = false;
-
+SerializationState Serializer::serialization_state_ = SERIALIZER_STATE_DISABLED;
+Mutex Serializer::serialization_mutex_;
 
 class CodeAddressMap: public CodeEventLogger {
  public:
   explicit CodeAddressMap(Isolate* isolate)
       : isolate_(isolate) {
     isolate->logger()->addCodeEventListener(this);
   }
 
   virtual ~CodeAddressMap() {
     isolate_->logger()->removeCodeEventListener(this);
@@ skipping 93 matching lines @@
 
   NameMap address_to_name_map_;
   Isolate* isolate_;
 };
 
 
 CodeAddressMap* Serializer::code_address_map_ = NULL;
 
 
 void Serializer::Enable(Isolate* isolate) {
-  if (!serialization_enabled_) {
-    ASSERT(!too_late_to_enable_now_);
-  }
-  if (serialization_enabled_) return;
-  serialization_enabled_ = true;
+  LockGuard<Mutex> lock_guard(&serialization_mutex_);
+  // Check again under the lock.
+  if (enabled()) return;
+
+  ASSERT(!IsPermanentlyDisabled());
+
+  serialization_state_ = SERIALIZER_STATE_ENABLED;
+
   isolate->InitializeLoggingAndCounters();
   code_address_map_ = new CodeAddressMap(isolate);
 }
 
 
 void Serializer::Disable() {
-  if (!serialization_enabled_) return;
-  serialization_enabled_ = false;
+  LockGuard<Mutex> lock_guard(&serialization_mutex_);
+  if (!enabled()) {
+    ASSERT(code_address_map_ == NULL);
+    return;
+  }
+  if (serialization_state_ != SERIALIZER_STATE_PERMANENTLY_DISABLED) {
+    serialization_state_ = SERIALIZER_STATE_DISABLED;
+  }
   delete code_address_map_;
   code_address_map_ = NULL;
 }
 
 
 Deserializer::Deserializer(SnapshotByteSource* source)
     : isolate_(NULL),
       source_(source),
       external_reference_decoder_(NULL) {
   for (int i = 0; i < LAST_SPACE + 1; i++) {
@@ skipping 1091 matching lines @@
 
 bool SnapshotByteSource::AtEOF() {
   if (0u + length_ - position_ > 2 * sizeof(uint32_t)) return false;
   for (int x = position_; x < length_; x++) {
     if (data_[x] != SerializerDeserializer::nop()) return false;
   }
   return true;
 }
 
 } }  // namespace v8::internal