Revert "Support external startup data in V8."

src/mksnapshot.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <errno.h>
 #include <stdio.h>
 #ifdef COMPRESS_STARTUP_DATA_BZ2
 #include <bzlib.h>
 #endif
 #include <signal.h>
@@ skipping 30 matching lines @@
   i::List<char>* data_;
 };
 
 
 class SnapshotWriter {
  public:
   explicit SnapshotWriter(const char* snapshot_file)
       : fp_(GetFileDescriptorOrDie(snapshot_file))
       , raw_file_(NULL)
       , raw_context_file_(NULL)
-      , startup_blob_file_(NULL)
-      , compressor_(NULL) {
+      , compressor_(NULL)
+      , omit_(false) {
   }
 
   ~SnapshotWriter() {
     fclose(fp_);
     if (raw_file_) fclose(raw_file_);
     if (raw_context_file_) fclose(raw_context_file_);
-    if (startup_blob_file_) fclose(startup_blob_file_);
   }
 
   void SetCompressor(Compressor* compressor) {
     compressor_ = compressor;
   }
 
+  void SetOmit(bool omit) {
+    omit_ = omit;
+  }
+
   void SetRawFiles(const char* raw_file, const char* raw_context_file) {
     raw_file_ = GetFileDescriptorOrDie(raw_file);
     raw_context_file_ = GetFileDescriptorOrDie(raw_context_file);
   }
 
-  void SetStartupBlobFile(const char* startup_blob_file) {
-    if (startup_blob_file != NULL)
-      startup_blob_file_ = GetFileDescriptorOrDie(startup_blob_file);
-  }
-
   void WriteSnapshot(const i::List<char>& snapshot_data,
                      const i::Serializer& serializer,
                      const i::List<char>& context_snapshot_data,
                      const i::Serializer& context_serializer) const {
-    WriteSnapshotFile(snapshot_data, serializer,
-                      context_snapshot_data, context_serializer);
-    MaybeWriteStartupBlob(snapshot_data, serializer,
-                          context_snapshot_data, context_serializer);
-  }
-
- private:
-  void MaybeWriteStartupBlob(const i::List<char>& snapshot_data,
-                             const i::Serializer& serializer,
-                             const i::List<char>& context_snapshot_data,
-                             const i::Serializer& context_serializer) const {
-    if (!startup_blob_file_)
-      return;
-
-    i::List<char> startup_blob;
-    ListSnapshotSink sink(&startup_blob);
-
-    int spaces[] = {
-        i::NEW_SPACE, i::OLD_POINTER_SPACE, i::OLD_DATA_SPACE, i::CODE_SPACE,
-        i::MAP_SPACE, i::CELL_SPACE,  i::PROPERTY_CELL_SPACE
-    };
-
-    i::byte* snapshot_bytes = reinterpret_cast<i::byte*>(snapshot_data.begin());
-    sink.PutBlob(snapshot_bytes, snapshot_data.length(), "snapshot");
-    for (size_t i = 0; i < ARRAY_SIZE(spaces); ++i)
-      sink.PutInt(serializer.CurrentAllocationAddress(spaces[i]), "spaces");
-
-    i::byte* context_bytes =
-        reinterpret_cast<i::byte*>(context_snapshot_data.begin());
-    sink.PutBlob(context_bytes, context_snapshot_data.length(), "context");
-    for (size_t i = 0; i < ARRAY_SIZE(spaces); ++i)
-      sink.PutInt(context_serializer.CurrentAllocationAddress(spaces[i]),
-                  "spaces");
-
-    size_t written = fwrite(startup_blob.begin(), 1, startup_blob.length(),
-                            startup_blob_file_);
-    if (written != (size_t)startup_blob.length()) {
-      i::PrintF("Writing snapshot file failed.. Aborting.\n");
-      exit(1);
-    }
-  }
-
-  void WriteSnapshotFile(const i::List<char>& snapshot_data,
-                         const i::Serializer& serializer,
-                         const i::List<char>& context_snapshot_data,
-                         const i::Serializer& context_serializer) const {
     WriteFilePrefix();
     WriteData("", snapshot_data, raw_file_);
     WriteData("context_", context_snapshot_data, raw_context_file_);
     WriteMeta("context_", context_serializer);
     WriteMeta("", serializer);
     WriteFileSuffix();
   }
 
+ private:
   void WriteFilePrefix() const {
     fprintf(fp_, "// Autogenerated snapshot file. Do not edit.\n\n");
     fprintf(fp_, "#include \"src/v8.h\"\n");
     fprintf(fp_, "#include \"src/platform.h\"\n\n");
     fprintf(fp_, "#include \"src/snapshot.h\"\n\n");
     fprintf(fp_, "namespace v8 {\n");
     fprintf(fp_, "namespace internal {\n\n");
   }
 
   void WriteFileSuffix() const {
@@ skipping 33 matching lines @@
     if (written != (size_t)data->length()) {
       i::PrintF("Writing raw file failed.. Aborting.\n");
       exit(1);
     }
   }
 
   void WriteData(const char* prefix,
                  const i::List<char>& source_data,
                  const i::List<char>* data_to_be_written) const {
     fprintf(fp_, "const byte Snapshot::%sdata_[] = {\n", prefix);
-    WriteSnapshotData(data_to_be_written);
+    if (!omit_)
+      WriteSnapshotData(data_to_be_written);
     fprintf(fp_, "};\n");
     fprintf(fp_, "const int Snapshot::%ssize_ = %d;\n", prefix,
             data_to_be_written->length());
 
-    if (data_to_be_written == &source_data) {
+    if (data_to_be_written == &source_data && !omit_) {
       fprintf(fp_, "const byte* Snapshot::%sraw_data_ = Snapshot::%sdata_;\n",
               prefix, prefix);
       fprintf(fp_, "const int Snapshot::%sraw_size_ = Snapshot::%ssize_;\n",
               prefix, prefix);
     } else {
       fprintf(fp_, "const byte* Snapshot::%sraw_data_ = NULL;\n", prefix);
       fprintf(fp_, "const int Snapshot::%sraw_size_ = %d;\n",
               prefix, source_data.length());
     }
     fprintf(fp_, "\n");
@@ skipping 32 matching lines @@
     if (fp == NULL) {
       i::PrintF("Unable to open file \"%s\" for writing.\n", filename);
       exit(1);
     }
     return fp;
   }
 
   FILE* fp_;
   FILE* raw_file_;
   FILE* raw_context_file_;
-  FILE* startup_blob_file_;
   Compressor* compressor_;
+  bool omit_;
 };
 
 
 #ifdef COMPRESS_STARTUP_DATA_BZ2
 class BZip2Compressor : public Compressor {
  public:
   BZip2Compressor() : output_(NULL) {}
   virtual ~BZip2Compressor() {
     delete output_;
   }
@@ skipping 163 matching lines @@
     ser.SerializeStrongReferences();
 
     i::List<char> context_data;
     ListSnapshotSink contex_sink(&context_data);
     i::PartialSerializer context_ser(internal_isolate, &ser, &contex_sink);
     context_ser.Serialize(&raw_context);
     ser.SerializeWeakReferences();
 
     {
       SnapshotWriter writer(argv[1]);
+      writer.SetOmit(i::FLAG_omit);
       if (i::FLAG_raw_file && i::FLAG_raw_context_file)
         writer.SetRawFiles(i::FLAG_raw_file, i::FLAG_raw_context_file);
-      if (i::FLAG_startup_blob)
-        writer.SetStartupBlobFile(i::FLAG_startup_blob);
   #ifdef COMPRESS_STARTUP_DATA_BZ2
       BZip2Compressor bzip2;
       writer.SetCompressor(&bzip2);
   #endif
       writer.WriteSnapshot(snapshot_data, ser, context_data, context_ser);
     }
   }
 
   isolate->Dispose();
   V8::Dispose();
   return 0;
 }