Cleanup native, collected, and stub code handling in profiler

runtime/bin/vmservice/client/lib/src/observatory/model.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of observatory;
 
 class CodeInstruction extends Observable {
   @observable final int address;
   @observable final String machine;
   @observable final String human;
@@ skipping 70 matching lines @@
   @observable String name;
   @observable String userName;
 
   Code(this.kind, this.name, this.startAddress, this.endAddress);
 
   Code.fromMap(Map map) :
     kind = CodeKind.Dart,
     startAddress = int.parse(map['start'], radix: 16),
     endAddress = int.parse(map['end'], radix: 16) {
     functionRef = toObservable(map['function']);
-    codeRef = toObservable({
-      'type': '@Code',
-      'id': map['id'],
-      'name': map['name'],
-      'user_name': map['user_name']
-    });
+    codeRef = toObservable(map);
     name = map['name'];
     userName = map['user_name'];
     if (map['disassembly'] != null) {
       _loadInstructions(map['disassembly']);
     }
   }
 
   factory Code.fromProfileMap(Map map) {
     var kind = CodeKind.fromString(map['kind']);
     var startAddress;
     var endAddress;
     var name;
     var userName;
-    var codeRef;
-    var functionRef;
-    // Initial extraction of startAddress, endAddress, and name depends on what
-    // kind of code this is and whether or not the code has been collected.
-    if (kind == CodeKind.Dart) {
-      var code = map['code'];
-      if (code != null) {
-        // Extract from Dart code.
-        startAddress = int.parse(code['start'], radix:16);
-        endAddress = int.parse(code['end'], radix:16);
-        name = code['name'];
-        userName = code['user_name'];
-        codeRef = toObservable({
-          'type': '@Code',
-          'id': code['id'],
-          'name': name,
-          'user_name': userName
-        });
-        functionRef = toObservable(code['function']);
-      }
-    }
-    if (startAddress == null) {
-      // Extract from Profile code.
-      // This is either a native or collected piece of code.
-      startAddress = int.parse(map['start'], radix:16);
-      endAddress = int.parse(map['end'], radix: 16);
-      name = map['name'];
-      userName = name;
-    }
+    var codeRef = map['code'];
+    assert(codeRef != null);
+    startAddress = int.parse(codeRef['start'], radix:16);
+    endAddress = int.parse(codeRef['end'], radix:16);
+    name = codeRef['name'];
+    userName = codeRef['user_name'];
     var code = new Code(kind, name, startAddress, endAddress);
     code.codeRef = codeRef;
-    code.functionRef = functionRef;
+    code.functionRef = toObservable(codeRef['function']);;
     code.userName = userName;
-    if (map['disassembly'] != null) {
-      code._loadInstructions(map['disassembly']);
+    if (codeRef['disassembly'] != null) {
+      code._loadInstructions(codeRef['disassembly']);
+      // Throw the JSON version away after loading the disassembly.
+      codeRef['disassembly'] = null;
     }
     return code;
   }
 
   // Refresh tick counts, etc for a code object.
   void _refresh(Map map) {
     inclusiveTicks = int.parse(map['inclusive_ticks']);
     exclusiveTicks = int.parse(map['exclusive_ticks']);
     // Load address ticks.
     var ticksList = map['ticks'];
@@ skipping 122 matching lines @@
     // and resolve callers and callees.
     assert(_codeObjectsInImportOrder.length == codes.length);
     for (var i = 0; i < codes.length; i++) {
       Code code = _codeObjectsInImportOrder[i];
       code.resolveCalls(codes[i], _codeObjectsInImportOrder);
     }
     _codeObjectsInImportOrder.clear();
   }
 
   int _extractCodeStartAddress(Map code) {
-    var kind = CodeKind.fromString(code['kind']);
-    if ((kind == CodeKind.Dart) && (code['code'] != null)) {
-      // Start address is inside the dart code map.
-      return int.parse(code['code']['start'], radix:16);
-    }
-    // Start address is inside the profile code map.
-    return int.parse(code['start'], radix:16);
+    return int.parse(code['code']['start'], radix:16);
   }
 
   void _processCode(Map profileCode) {
     if (profileCode['type'] != 'ProfileCode') {
       return;
     }
     int address = _extractCodeStartAddress(profileCode);
     var code = isolate.findCodeByAddress(address);
     if (code == null) {
       // Never seen a code object at this address before, create a new one.
@@ skipping 109 matching lines @@
     if (executableLines == 0) {
       return 0.0;
     }
     return (coveredLines / executableLines) * 100.0;
   }
 
   @observable String coveredPercentageFormatted() {
     return '(' + coveredPercentage().toStringAsFixed(1) + '% covered)';
   }
 }