Revert "Added ability to request zone memory information for all isolates through the VM service an…

runtime/observatory/lib/src/service/object.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 service;
 
 // Some value smaller than the object ring, so requesting a large array
 // doesn't result in an expired ref because the elements lapped it in the
 // object ring.
 const int kDefaultFieldLimit = 100;
@@ skipping 220 matching lines @@
         break;
       case 'Library':
         obj = new Library._empty(owner);
         break;
       case 'Message':
         obj = new ServiceMessage._empty(owner);
         break;
       case 'SourceLocation':
         obj = new SourceLocation._empty(owner);
         break;
-      case '_Thread':
-        obj = new Thread._empty(owner);
-        break;
       case 'UnresolvedSourceLocation':
         obj = new UnresolvedSourceLocation._empty(owner);
         break;
       case 'Object':
         switch (vmType) {
           case 'ICData':
             obj = new ICData._empty(owner);
             break;
           case 'LocalVarDescriptors':
             obj = new LocalVarDescriptors._empty(owner);
@@ skipping 1243 matching lines @@
   final HeapSpace newSpace = new HeapSpace();
   final HeapSpace oldSpace = new HeapSpace();
 
   String fileAndLine;
 
   DartError error;
   StreamController _snapshotFetch;
 
   List<ByteData> _chunksInProgress;
 
-  List<Thread> get threads => _threads;
-  final List<Thread> _threads = new List<Thread>();
-
   void _loadHeapSnapshot(ServiceEvent event) {
     if (_snapshotFetch == null || _snapshotFetch.isClosed) {
       // No outstanding snapshot request. Presumably another client asked for a
       // snapshot.
       Logger.root.info("Dropping unsolicited heap snapshot chunk");
       return;
     }
 
     // Occasionally these actually arrive out of order.
     var chunkIndex = event.chunkIndex;
@@ skipping 103 matching lines @@
     libraries.addAll(map['libraries']);
     libraries.sort(ServiceObject.LexicalSortName);
     if (savedStartTime == null) {
       vm._buildIsolateList();
     }
 
     extensionRPCs.clear();
     if (map['extensionRPCs'] != null) {
       extensionRPCs.addAll(map['extensionRPCs']);
     }
-
-    threads.clear();
-    if(map['threads'] != null) {
-      threads.addAll(map['threads']);
-    }
   }
 
   Future<TagProfile> updateTagProfile() {
     return isolate.invokeRpcNoUpgrade('_getTagProfile', {}).then((Map map) {
       var seconds = new DateTime.now().millisecondsSinceEpoch / 1000.0;
       tagProfile._processTagProfile(seconds, map);
       return tagProfile;
     });
   }
 
@@ skipping 1412 matching lines @@
 
     kind = stringToSentinelKind(map['kind']);
     valueAsString = map['valueAsString'];
     _loaded = true;
   }
 
   String toString() => 'Sentinel($kind)';
   String get shortName => valueAsString;
 }
 
-class Thread extends ServiceObject implements M.Thread {
-  M.ThreadKind get kind => _kind;
-  M.ThreadKind _kind;
-  List<Zone> get zones => _zones;
-  final List<Zone> _zones = new List<Zone>();
-
-  Thread._empty(ServiceObjectOwner owner) : super._empty(owner);
-
-  void _update(Map map, bool mapIsRef) {
-    String kindString = map['kind'];
-    List<Map> zoneList = map['zones'];
-
-    switch(kindString) {
-      case "kUnknownTask":
-        _kind = M.ThreadKind.unknownTask;
-        break;
-      case "kMutatorTask":
-        _kind = M.ThreadKind.mutatorTask;
-        break;
-      case "kCompilerTask":
-        _kind = M.ThreadKind.compilerTask;
-        break;
-      case "kSweeperTask":
-        _kind = M.ThreadKind.sweeperTask;
-        break;
-      case "kMarkerTask":
-        _kind = M.ThreadKind.markerTask;
-        break;
-      case "kFinalizerTask":
-        _kind = M.ThreadKind.finalizerTask;
-        break;
-      default:
-        assert(false);
-    }
-    zones.clear();
-    zoneList.forEach((zone) {
-      int capacity = zone['capacity'];
-      int used = zone['used'];
-      zones.add(new Zone(capacity, used));
-    });
-  }
-}
-
-class Zone implements M.Zone {
-  int get capacity => _capacity;
-  int _capacity;
-  int get used => _used;
-  int _used;
-
-  Zone(this._capacity, this._used);
-}
-
 class Field extends HeapObject implements M.Field {
   // Library or Class.
   HeapObject dartOwner;
   Library library;
   Instance declaredType;
   bool isStatic;
   bool isFinal;
   bool isConst;
   Instance staticValue;
   String name;
@@ skipping 1351 matching lines @@
     var v = list[i];
     if ((v is Map) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is List) {
       _upgradeList(v, owner);
     } else if (v is Map) {
       _upgradeMap(v, owner);
     }
   }
 }