CPUProfiler: propagate scriptId to the front-end

test/cctest/test-cpu-profiler.cc

 // Copyright 2010 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 450 matching lines @@
                               const char* names[], int length) {
   for (int i = 0; i < length; i++) {
     const char* name = names[i];
     node = GetChild(node, name);
     int expectedChildrenCount = (i == length - 1) ? 0 : 1;
     CHECK_EQ(expectedChildrenCount, node->GetChildrenCount());
   }
 }
 
 
+static void CheckScriptIds(int scriptId, const v8::CpuProfileNode* node) {
+  v8::String::Utf8Value function_name(node->GetFunctionName());
+  if (function_name.length() && (*function_name)[0] != '(')

[yurys, 2013/06/25 09:16:55]

Missing {}

+    CHECK_EQ(scriptId, node->GetScriptId());
+  int length = node->GetChildrenCount();
+  for (int i = 0; i < length; i++) {
+    CheckScriptIds(scriptId, node->GetChild(i));
+  }
+}
+
+
 static const char* cpu_profiler_test_source = "function loop(timeout) {\n"
 "  this.mmm = 0;\n"
 "  var start = Date.now();\n"
 "  while (Date.now() - start < timeout) {\n"
 "    var n = 100*1000;\n"
 "    while(n > 1) {\n"
 "      n--;\n"
 "      this.mmm += n * n * n;\n"
 "    }\n"
 "  }\n"
@@ skipping 33 matching lines @@
 //   522   522          loop [-1]
 //   263     0        bar [-1]
 //   263     1          delay [-1]
 //   262   262            loop [-1]
 //     2     2    (program) [-1]
 //     6     6    (garbage collector) [-1]
 TEST(CollectCpuProfile) {
   LocalContext env;
   v8::HandleScope scope(env->GetIsolate());
 
-  v8::Script::Compile(v8::String::New(cpu_profiler_test_source))->Run();
+  v8::Handle<v8::Script> script =
+      v8::Script::Compile(v8::String::New(cpu_profiler_test_source));
+  script->Run();
   v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(
       env->Global()->Get(v8::String::New("start")));
 
   v8::CpuProfiler* cpu_profiler = env->GetIsolate()->GetCpuProfiler();
   v8::Local<v8::String> profile_name = v8::String::New("my_profile");
 
   cpu_profiler->StartCpuProfiling(profile_name);
   int32_t profiling_interval_ms = 200;
 #if defined(_WIN32) || defined(_WIN64)
   // 200ms is not enough on Windows. See
@@ skipping 22 matching lines @@
 
   const v8::CpuProfileNode* fooNode = GetChild(startNode, "foo");
   CHECK_EQ(3, fooNode->GetChildrenCount());
 
   const char* barBranch[] = { "bar", "delay", "loop" };
   CheckSimpleBranch(fooNode, barBranch, ARRAY_SIZE(barBranch));
   const char* bazBranch[] = { "baz", "delay", "loop" };
   CheckSimpleBranch(fooNode, bazBranch, ARRAY_SIZE(bazBranch));
   const char* delayBranch[] = { "delay", "loop" };
   CheckSimpleBranch(fooNode, delayBranch, ARRAY_SIZE(delayBranch));
+  CheckScriptIds(script->Id()->ToInt32()->Value(), root);

[yurys, 2013/06/25 09:16:55]

Would be nice to have additional test for a profile where nodes have different
script ids.

 
   cpu_profiler->DeleteAllCpuProfiles();
 }
 
 
 
 static const char* cpu_profiler_test_source2 = "function loop() {}\n"
 "function delay() { loop(); }\n"
 "function start(count) {\n"
 "  var k = 0;\n"
@@ skipping 330 matching lines @@
   reinterpret_cast<i::CpuProfile*>(
       const_cast<v8::CpuProfile*>(profile))->Print();
 
   const v8::CpuProfileNode* root = profile->GetTopDownRoot();
   GetChild(root, "start");
   const v8::CpuProfileNode* startNode = GetChild(root, "start");
   GetChild(startNode, "fooMethod");
 
   cpu_profiler->DeleteAllCpuProfiles();
 }