Clovis: update resource sack to use new dependency graph.

tools/android/loading/core_set.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Compute core set for a page.
 
 This script is a collection of utilities for working with core sets.
 """
 
 import argparse
 import glob
 import json
 import logging
 import multiprocessing
 import os
 import sys
 
-import loading_model
+import dependency_graph
 import loading_trace
+import request_dependencies_lens
 import resource_sack
 
 
 def _Progress(x):
   sys.stderr.write(x + '\n')
 
 
 def _PageCore(prefix, graph_set_names, output):
   """Compute the page core over sets defined by graph_set_names."""
   assert graph_set_names
   graph_sets = []
   sack = resource_sack.GraphSack()
   for name in graph_set_names:
     name_graphs = []
     _Progress('Processing %s' % name)
     for filename in glob.iglob('-'.join([prefix, name, '*.trace'])):
       _Progress('Reading %s' % filename)
-      graph = loading_model.ResourceGraph(
-          loading_trace.LoadingTrace.FromJsonFile(filename))
+      trace = loading_trace.LoadingTrace.FromJsonFile(filename)
+      graph = dependency_graph.RequestDependencyGraph(
+          trace.request_track.GetEvents(),
+          request_dependencies_lens.RequestDependencyLens(trace))
       sack.ConsumeGraph(graph)
       name_graphs.append(graph)
     graph_sets.append(name_graphs)
   json.dump({'page_core': [l for l in sack.CoreSet(*graph_sets)],
              'threshold': sack.CORE_THRESHOLD},
             output, sort_keys=True, indent=2)
   output.write('\n')
 
 
 def _DoSite(site, graph_sets, input_dir, output_dir):
@@ skipping 34 matching lines @@
   _Progress('Using threshold %s' % threshold)
   big_sack = resource_sack.GraphSack()
   graph_sets = []
   for name in graph_set_names:
     _Progress('Finding core set for %s' % name)
     sack = resource_sack.GraphSack()
     sack.CORE_THRESHOLD = threshold
     this_set = []
     for filename in glob.iglob('-'.join([prefix, name, '*.trace'])):
       _Progress('Reading %s' % filename)
-      graph = loading_model.ResourceGraph(
-          loading_trace.LoadingTrace.FromJsonDict(json.load(open(filename))))
+      trace = loading_trace.LoadingTrace.FromJsonFile(filename)
+      graph = dependency_graph.RequestDependencyGraph(
+          trace.request_track.GetEvents(),
+          request_dependencies_lens.RequestDependencyLens(trace))
       sack.ConsumeGraph(graph)
       big_sack.ConsumeGraph(graph)
       this_set.append(graph)
     core_sets.append({
         'set_name': name,
         'core_set': [l for l in sack.CoreSet()]
     })
     graph_sets.append(this_set)
   json.dump({'core_sets': core_sets,
              'page_core': [l for l in big_sack.CoreSet(*graph_sets)]},
@@ skipping 91 matching lines @@
             'all_cores) using Jaccard index. Outputs on stdout'))
   compare.add_argument('--a', required=True, help='the first core set JSON')
   compare.add_argument('--b', required=True, help='the second core set JSON')
   compare.add_argument('--csv', action='store_true', help='output as CSV')
   compare.set_defaults(
       executor=lambda args:
       _Compare(args.a, args.b, args.csv))
 
   args = parser.parse_args()
   args.executor(args)