CPUProfiler: propagate scriptId to the front-end

src/profile-generator.cc

Index: src/profile-generator.cc
diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index d15c400f737f7fe6ed3932c5bec62798ab4f9d0b..fcd5ffe6d7bca338079f9adb9fb9479d8af8f0a7 100644
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -265,13 +265,14 @@ double ProfileNode::GetTotalMillis() const {
 
 
 void ProfileNode::Print(int indent) {
-  OS::Print("%5u %5u %*c %s%s [%d] #%d",
+  OS::Print("%5u %5u %*c %s%s [%d] #%d %d",
             total_ticks_, self_ticks_,
             indent, ' ',
             entry_->name_prefix(),
             entry_->name(),
             entry_->security_token_id(),
-            id());
+            id(),
+            entry_->script_id());

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

I'd move this before the node id in the output.

   if (entry_->resource_name()[0] != '\0')
     OS::Print(" %s:%d", entry_->resource_name(), entry_->line_number());
   OS::Print("\n");
@@ -299,6 +300,7 @@ ProfileTree::ProfileTree()
     : root_entry_(Logger::FUNCTION_TAG,
                   "",
                   "(root)",
+                  v8::CpuProfileNode::kNoScriptId,
                   "",
                   0,
                   TokenEnumerator::kNoSecurityToken),
@@ -792,11 +794,13 @@ List<CpuProfile*>* CpuProfilesCollection::Profiles(int security_token_id) {
 
 CodeEntry* CpuProfilesCollection::NewCodeEntry(Logger::LogEventsAndTags tag,
                                                Name* name,
+                                               int script_id,
                                                String* resource_name,
                                                int line_number) {
   CodeEntry* entry = new CodeEntry(tag,
                                    CodeEntry::kEmptyNamePrefix,
                                    GetFunctionName(name),
+                                   script_id,
                                    GetName(resource_name),
                                    line_number,
                                    TokenEnumerator::kNoSecurityToken);
@@ -810,6 +814,7 @@ CodeEntry* CpuProfilesCollection::NewCodeEntry(Logger::LogEventsAndTags tag,
   CodeEntry* entry = new CodeEntry(tag,
                                    CodeEntry::kEmptyNamePrefix,
                                    GetFunctionName(name),
+                                   v8::CpuProfileNode::kNoScriptId,
                                    "",
                                    v8::CpuProfileNode::kNoLineNumberInfo,
                                    TokenEnumerator::kNoSecurityToken);
@@ -824,6 +829,7 @@ CodeEntry* CpuProfilesCollection::NewCodeEntry(Logger::LogEventsAndTags tag,
   CodeEntry* entry = new CodeEntry(tag,
                                    name_prefix,
                                    GetName(name),
+                                   v8::CpuProfileNode::kNoScriptId,
                                    "",
                                    v8::CpuProfileNode::kNoLineNumberInfo,
                                    TokenEnumerator::kInheritsSecurityToken);
@@ -837,6 +843,7 @@ CodeEntry* CpuProfilesCollection::NewCodeEntry(Logger::LogEventsAndTags tag,
   CodeEntry* entry = new CodeEntry(tag,
                                    "args_count: ",
                                    GetName(args_count),
+                                   v8::CpuProfileNode::kNoScriptId,
                                    "",
                                    v8::CpuProfileNode::kNoLineNumberInfo,
                                    TokenEnumerator::kInheritsSecurityToken);