Compress sources of JS libraries in addition to the snapshot.

src/mksnapshot.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 118 matching lines @@
   char at(int i) { return data_[i]; }
   bool Compress(Compressor* compressor) {
     ASSERT_EQ(-1, raw_size_);
     raw_size_ = data_.length();
     if (!compressor->Compress(data_.ToVector())) return false;
     data_.Clear();
     data_.AddAll(*compressor->output());
     return true;
   }
   int raw_size() { return raw_size_; }
+
  private:
   i::List<char> data_;
   int raw_size_;
 };
 
 
 class CppByteSink : public PartialSnapshotSink {
  public:
   explicit CppByteSink(const char* snapshot_file) {
     fp_ = i::OS::FOpen(snapshot_file, "wb");
@@ skipping 109 matching lines @@
     } else {
       fprintf(stderr, "bzlib error code: %d\n", result);
       return false;
     }
   }
   virtual i::Vector<char>* output() { return output_; }
 
  private:
   i::ScopedVector<char>* output_;
 };
+
+class BZip2Decompressor {
+ public:
+  BZip2Decompressor()
+      : libraries(i::NewArray<char*>(i::Natives::GetBuiltinsCount())) {
+  }
+  ~BZip2Decompressor() {
+    for (int i = 0; i < i::Natives::GetBuiltinsCount(); ++i) {
+      i::DeleteArray(libraries[i]);
+    }
+    i::DeleteArray(libraries);
+  }
+  void DecompressNatives() {
+    for (int i = 0; i < i::Natives::GetBuiltinsCount(); ++i) {

[Vitaly Repeshko, 2011/06/06 10:08:23]

Hmm, it seems annoying to repeat this code with the internal details of Natives
exposed. Can we somehow rework it to take the decompressor as a function?

[mnaganov (inactive), 2011/06/06 13:40:18]

Converted to API usage (as Soeren suggested), and factored out. Now the same
code is reused here and in sample.cc

+      unsigned int decompressed_size = i::Natives::GetRawScriptSize(i);
+      libraries[i] = i::NewArray<char>(decompressed_size);
+      i::Vector<const i::byte> compressed = i::Natives::GetScriptSource(i);
+      int result =
+          BZ2_bzBuffToBuffDecompress(libraries[i],
+                                     &decompressed_size,
+                                     reinterpret_cast<char*>(
+                                         const_cast<i::byte*>(
+                                             compressed.start())),
+                                     compressed.length(),
+                                     0, 1);
+      if (result != BZ_OK) {
+        fprintf(stderr, "libraries: bzip error code: %d\n", result);
+        exit(1);
+      }
+      i::Natives::SetRawScriptSource(
+          i, i::Vector<const char>(libraries[i], decompressed_size));
+    }
+  }
+
+ private:
+  char** libraries;
+};
 #endif
 
 
 int main(int argc, char** argv) {
 #ifdef ENABLE_LOGGING_AND_PROFILING
   // By default, log code create information in the snapshot.
   i::FLAG_log_code = true;
 #endif
   // Print the usage if an error occurs when parsing the command line
   // flags or if the help flag is set.
   int result = i::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
   if (result > 0 || argc != 2 || i::FLAG_help) {
     ::printf("Usage: %s [flag] ... outfile\n", argv[0]);
     i::FlagList::PrintHelp();
     return !i::FLAG_help;
   }
+#ifdef COMPRESS_STARTUP_DATA_BZ2

[Søren Thygesen Gjesse, 2011/06/06 09:22:01]

Can't we use the normal V8 API here?

[mnaganov (inactive), 2011/06/06 13:40:18]

Done.

+  BZip2Decompressor natives_decompressor;
+  natives_decompressor.DecompressNatives();
+#endif
   i::Serializer::Enable();
   Persistent<Context> context = v8::Context::New();
   ASSERT(!context.IsEmpty());
   // Make sure all builtin scripts are cached.
   { HandleScope scope;
     for (int i = 0; i < i::Natives::GetBuiltinsCount(); i++) {
       i::Isolate::Current()->bootstrapper()->NativesSourceLookup(i);
     }
   }
   // If we don't do this then we end up with a stray root pointing at the
@@ skipping 25 matching lines @@
   sink.WriteSpaceUsed(
       partial_ser.CurrentAllocationAddress(i::NEW_SPACE),
       partial_ser.CurrentAllocationAddress(i::OLD_POINTER_SPACE),
       partial_ser.CurrentAllocationAddress(i::OLD_DATA_SPACE),
       partial_ser.CurrentAllocationAddress(i::CODE_SPACE),
       partial_ser.CurrentAllocationAddress(i::MAP_SPACE),
       partial_ser.CurrentAllocationAddress(i::CELL_SPACE),
       partial_ser.CurrentAllocationAddress(i::LO_SPACE));
   return 0;
 }