Skip to content

GitLab

T
tangled
Commit d1fd8fc9 authored by nednguyen's avatar nednguyen Committed by Commit Bot
Browse files
Options

Make sure page of different cache temperatures & traffic settings are named differently (part 2) 


Bug: 849363
Change-Id: Ief8da1eda983c68c0db49f08cbca7d388c952741
Reviewed-on: https://chromium-review.googlesource.com/1102910Reviewed-by: default avatarEthan Kuefner <eakuefner@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#568466}
parent c896955e
Show whitespace changes
Inline Side-by-side
Showing with 486 additions and 220 deletions
tools/perf/contrib/cros_benchmarks/page_cycler_v2.py
View file @ d1fd8fc9
......@@ -13,7 +13,6 @@ import page_sets
from benchmarks import loading_metrics_category
from telemetry import benchmark
from telemetry.page import cache_temperature
from telemetry.web_perf import timeline_based_measurement
class _PageCyclerV2(perf_benchmark.PerfBenchmark):
......@@ -38,9 +37,7 @@ class PageCyclerV2Typical25(_PageCyclerV2):
return 'page_cycler_v2.typical_25'
def CreateStorySet(self, options):
return page_sets.Typical25PageSet(run_no_page_interactions=True,
cache_temperatures=[
cache_temperature.COLD, cache_temperature.WARM])
return page_sets.Typical25PageSet()
@benchmark.Owner(emails=['kouhei@chromium.org', 'ksakamoto@chromium.org'])
......@@ -56,8 +53,7 @@ class PageCyclerV2IntlArFaHe(_PageCyclerV2):
return 'page_cycler_v2.intl_ar_fa_he'
def CreateStorySet(self, options):
return page_sets.IntlArFaHePageSet(cache_temperatures=[
cache_temperature.COLD, cache_temperature.WARM])
return page_sets.IntlArFaHePageSet()
@benchmark.Owner(emails=['kouhei@chromium.org', 'ksakamoto@chromium.org'])
......@@ -73,8 +69,7 @@ class PageCyclerV2IntlEsFrPtBr(_PageCyclerV2):
return 'page_cycler_v2.intl_es_fr_pt-BR'
def CreateStorySet(self, options):
return page_sets.IntlEsFrPtBrPageSet(cache_temperatures=[
cache_temperature.COLD, cache_temperature.WARM])
return page_sets.IntlEsFrPtBrPageSet()
@benchmark.Owner(emails=['kouhei@chromium.org', 'ksakamoto@chromium.org'])
......@@ -90,8 +85,7 @@ class PageCyclerV2IntlHiRu(_PageCyclerV2):
return 'page_cycler_v2.intl_hi_ru'
def CreateStorySet(self, options):
return page_sets.IntlHiRuPageSet(cache_temperatures=[
cache_temperature.COLD, cache_temperature.WARM])
return page_sets.IntlHiRuPageSet()
@benchmark.Owner(emails=['kouhei@chromium.org', 'ksakamoto@chromium.org'])
......@@ -106,8 +100,7 @@ class PageCyclerV2IntlJaZh(_PageCyclerV2):
return 'page_cycler_v2.intl_ja_zh'
def CreateStorySet(self, options):
return page_sets.IntlJaZhPageSet(cache_temperatures=[
cache_temperature.COLD, cache_temperature.WARM])
return page_sets.IntlJaZhPageSet()
@benchmark.Owner(emails=['kouhei@chromium.org', 'ksakamoto@chromium.org'])
......@@ -123,5 +116,4 @@ class PageCyclerV2IntlKoThVi(_PageCyclerV2):
return 'page_cycler_v2.intl_ko_th_vi'
def CreateStorySet(self, options):
return page_sets.IntlKoThViPageSet(cache_temperatures=[
cache_temperature.COLD, cache_temperature.WARM])
return page_sets.IntlKoThViPageSet()
tools/perf/page_sets/data/intl_ar_fa_he.json
View file @ d1fd8fc9
{
"archives": {
"http://farsnews.com/": {
"http://farsnews.com/_cold": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://msn.co.il/": {
"http://farsnews.com/_warm": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.aljayyash.net/": {
"http://msn.co.il/_cold": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.google.com.sa/": {
"http://msn.co.il/_warm": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.islamweb.net/": {
"http://www.aljayyash.net/_cold": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.kooora.com/default.aspx": {
"http://www.aljayyash.net/_warm": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.masrawy.com/": {
"http://www.google.com.sa/_cold": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.startimes.com/f.aspx": {
"http://www.google.com.sa/_warm": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.walla.co.il/": {
"http://www.islamweb.net/_cold": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://ynet.co.il/": {
"http://www.islamweb.net/_warm": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.masrawy.com/_cold": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.masrawy.com/_warm": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.startimes.com/f.aspx_cold": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://www.startimes.com/f.aspx_warm": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://ynet.co.il/_cold": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
},
"http://ynet.co.il/_warm": {
"DEFAULT": "intl_ar_fa_he_000.wprgo"
}
},
......
tools/perf/page_sets/data/intl_es_fr_pt-BR.json
View file @ d1fd8fc9
{
"archives": {
"http://elmundo.es/": {
"http://elmundo.es/_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://produto.mercadolivre.com.br/MLB-468424957-pelicula-protetora-smartphone-h5500-e-h5300-43-frete-free-_JM": {
"http://elmundo.es/_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://terra.es/": {
"http://produto.mercadolivre.com.br/MLB-468424957-pelicula-protetora-smartphone-h5500-e-h5300-43-frete-free-_JM_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.ebay.es/sch/i.html?_sacat=382&_trkparms=clkid%3D6548971389060485883&_qi=RTM1381637": {
"http://produto.mercadolivre.com.br/MLB-468424957-pelicula-protetora-smartphone-h5500-e-h5300-43-frete-free-_JM_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.eltiempo.es/talavera-de-la-reina.html": {
"http://terra.es/_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.free.fr/adsl/index.html": {
"http://terra.es/_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.leboncoin.fr/annonces/offres/limousin/": {
"http://www.ebay.es/sch/i.html?_sacat=382&_trkparms=clkid%3D6548971389060485883&_qi=RTM1381637_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.orange.fr/": {
"http://www.ebay.es/sch/i.html?_sacat=382&_trkparms=clkid%3D6548971389060485883&_qi=RTM1381637_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.uol.com.br/": {
"http://www.eltiempo.es/talavera-de-la-reina.html_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.voila.fr/": {
"http://www.eltiempo.es/talavera-de-la-reina.html_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.free.fr/adsl/index.html_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.free.fr/adsl/index.html_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.leboncoin.fr/annonces/offres/limousin/_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.leboncoin.fr/annonces/offres/limousin/_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.orange.fr/_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.orange.fr/_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.uol.com.br/_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.uol.com.br/_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.voila.fr/_cold": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
},
"http://www.voila.fr/_warm": {
"DEFAULT": "intl_es_fr_pt-BR_000.wprgo"
}
},
......
tools/perf/page_sets/data/intl_hi_ru.json
View file @ d1fd8fc9
{
"archives": {
"http://apeha.ru/": {
"http://apeha.ru/_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://hindi.oneindia.in/": {
"http://apeha.ru/_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://hindi.webdunia.com/": {
"http://hindi.oneindia.in/_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://narod.yandex.ru/": {
"http://hindi.oneindia.in/_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://news.google.co.in/nwshp?tab=in&hl=hi": {
"http://hindi.webdunia.com/_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://photofile.ru/": {
"http://hindi.webdunia.com/_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://ru.wikipedia.org/": {
"http://narod.yandex.ru/_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://rutracker.org/forum/index.php": {
"http://narod.yandex.ru/_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://www.indiatimes.com/": {
"http://news.google.co.in/nwshp?tab=in&hl=hi_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://www.rambler.ru/": {
"http://news.google.co.in/nwshp?tab=in&hl=hi_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://yandex.ru/yandsearch?lr=102567&text=%D0%9F%D0%BE%D0%B3%D0%BE%D0%B4%D0%B0": {
"http://photofile.ru/_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://photofile.ru/_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://ru.wikipedia.org/_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://ru.wikipedia.org/_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://rutracker.org/forum/index.php_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://rutracker.org/forum/index.php_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://www.indiatimes.com/_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://www.indiatimes.com/_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://www.rambler.ru/_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://www.rambler.ru/_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://yandex.ru/yandsearch?lr=102567&text=%D0%9F%D0%BE%D0%B3%D0%BE%D0%B4%D0%B0_cold": {
"DEFAULT": "intl_hi_ru_000.wprgo"
},
"http://yandex.ru/yandsearch?lr=102567&text=%D0%9F%D0%BE%D0%B3%D0%BE%D0%B4%D0%B0_warm": {
"DEFAULT": "intl_hi_ru_000.wprgo"
}
},
......
tools/perf/page_sets/data/intl_ja_zh.json
View file @ d1fd8fc9
{
"archives": {
"http://2ch.net/": {
"http://2ch.net/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://cn.yahoo.com/": {
"http://2ch.net/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://dtiblog.com/": {
"http://cn.yahoo.com/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://fc2.com/ja/": {
"http://cn.yahoo.com/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://goo.ne.jp/": {
"http://dtiblog.com/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://hatena.ne.jp/": {
"http://dtiblog.com/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://jugem.jp/": {
"http://fc2.com/ja/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://kakaku.com/": {
"http://fc2.com/ja/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://mixi.jp/": {
"http://goo.ne.jp/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://ruten.com.tw/": {
"http://goo.ne.jp/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://udn.com/NEWS/mainpage.shtml": {
"http://hatena.ne.jp/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.amazon.co.jp": {
"http://hatena.ne.jp/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.baidu.com/s?wd=%D0%C2%20%CE%C5": {
"http://jugem.jp/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.google.com.hk/#q=%E9%82%84%E6%8F%90%E4%BE%9B&fp=c44d333e710cb480": {
"http://jugem.jp/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.qq.com/": {
"http://kakaku.com/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.sina.com.cn/": {
"http://kakaku.com/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.taobao.com/index_global.php": {
"http://mixi.jp/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.yahoo.co.jp/": {
"http://mixi.jp/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://zol.com.cn/": {
"http://ruten.com.tw/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://ruten.com.tw/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://udn.com/NEWS/mainpage.shtml_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://udn.com/NEWS/mainpage.shtml_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.amazon.co.jp_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.amazon.co.jp_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.baidu.com/s?wd=%D0%C2%20%CE%C5_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.baidu.com/s?wd=%D0%C2%20%CE%C5_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.google.com.hk/#q=%E9%82%84%E6%8F%90%E4%BE%9B&fp=c44d333e710cb480_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.google.com.hk/#q=%E9%82%84%E6%8F%90%E4%BE%9B&fp=c44d333e710cb480_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.qq.com/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.qq.com/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.sina.com.cn/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.sina.com.cn/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.taobao.com/index_global.php_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.taobao.com/index_global.php_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.yahoo.co.jp/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://www.yahoo.co.jp/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://zol.com.cn/_cold": {
"DEFAULT": "intl_ja_zh_000.wprgo"
},
"http://zol.com.cn/_warm": {
"DEFAULT": "intl_ja_zh_000.wprgo"
}
},
......
tools/perf/page_sets/data/intl_ko_th_vi.json
View file @ d1fd8fc9
{
"archives": {
"http://kenh14.vn/home.chn": {
"http://kenh14.vn/home.chn_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://news.zing.vn/the-gioi/ba-dam-thep-margaret-thatcher-qua-doi/a312895.html#home_noibat1": {
"http://kenh14.vn/home.chn_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://pantip.com/": {
"http://pantip.com/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://thaimisc.com/": {
"http://pantip.com/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://us.24h.com.vn/": {
"http://thaimisc.com/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://vietnamnet.vn/": {
"http://thaimisc.com/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://vnexpress.net/": {
"http://us.24h.com.vn/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.chosun.com/": {
"http://us.24h.com.vn/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.danawa.com/": {
"http://vietnamnet.vn/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.daum.net/": {
"http://vietnamnet.vn/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.donga.com/": {
"http://vnexpress.net/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.naver.com/": {
"http://vnexpress.net/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.sanook.com/": {
"http://www.chosun.com/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.chosun.com/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.danawa.com/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.danawa.com/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.daum.net/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.daum.net/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.donga.com/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.donga.com/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.naver.com/_cold": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
},
"http://www.naver.com/_warm": {
"DEFAULT": "intl_ko_th_vi_000.wprgo"
}
},
......
tools/perf/page_sets/data/typical_25.json
View file @ d1fd8fc9
{
"archives": {
"http://allrecipes.com/Recipe/Pull-Apart-Hot-Cross-Buns/Detail.aspx": {
"http://allrecipes.com/Recipe/Pull-Apart-Hot-Cross-Buns/Detail.aspx_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://arstechnica.com/": {
"http://allrecipes.com/Recipe/Pull-Apart-Hot-Cross-Buns/Detail.aspx_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://colorado.edu": {
"http://arstechnica.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://gawker.com/5939683/based-on-a-true-story-is-a-rotten-lie-i-hope-you-never-believe": {
"http://arstechnica.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://money.cnn.com/": {
"http://colorado.edu_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://premierleague.com": {
"http://colorado.edu_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://walgreens.com": {
"http://gawker.com/5939683/based-on-a-true-story-is-a-rotten-lie-i-hope-you-never-believe_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.airbnb.com/": {
"http://gawker.com/5939683/based-on-a-true-story-is-a-rotten-lie-i-hope-you-never-believe_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.barnesandnoble.com/u/books-bestselling-books/379003057/": {
"http://money.cnn.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.economist.com/news/science-and-technology/21573529-small-models-cosmic-phenomena-are-shedding-light-real-thing-how-build": {
"http://money.cnn.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.fda.gov": {
"http://premierleague.com_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.fifa.com/": {
"http://premierleague.com_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.flickr.com/search/?q=monkeys&f=hp": {
"http://walgreens.com_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.gamestop.com/ps3": {
"http://walgreens.com_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.html5rocks.com/en/": {
"http://www.airbnb.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.ign.com/": {
"http://www.airbnb.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.imdb.com/title/tt0910970/": {
"http://www.economist.com/news/science-and-technology/21573529-small-models-cosmic-phenomena-are-shedding-light-real-thing-how-build_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.mlb.com/": {
"http://www.economist.com/news/science-and-technology/21573529-small-models-cosmic-phenomena-are-shedding-light-real-thing-how-build_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.nationalgeographic.com/": {
"http://www.fda.gov_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.nick.com/games": {
"http://www.fda.gov_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.osubeavers.com/": {
"http://www.fifa.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.rei.com/": {
"http://www.fifa.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.theonion.com": {
"http://www.flickr.com/search/?q=monkeys&f=hp_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.theverge.com/2013/3/5/4061684/inside-ted-the-smartest-bubble-in-the-world": {
"http://www.flickr.com/search/?q=monkeys&f=hp_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.ticketmaster.com/JAY-Z-and-Justin-Timberlake-tickets/artist/1837448?brand=none&tm_link=tm_homeA_rc_name2": {
"http://www.gamestop.com/ps3_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.gamestop.com/ps3_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.html5rocks.com/en/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.html5rocks.com/en/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.ign.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.ign.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.imdb.com/title/tt0910970/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.imdb.com/title/tt0910970/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.mlb.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.mlb.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.nationalgeographic.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.nationalgeographic.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.nick.com/games_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.nick.com/games_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.osubeavers.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.osubeavers.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.rei.com/_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.rei.com/_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.theonion.com_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.theonion.com_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.theverge.com/2013/3/5/4061684/inside-ted-the-smartest-bubble-in-the-world_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.theverge.com/2013/3/5/4061684/inside-ted-the-smartest-bubble-in-the-world_warm": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.ticketmaster.com/JAY-Z-and-Justin-Timberlake-tickets/artist/1837448?brand=none&tm_link=tm_homeA_rc_name2_cold": {
"DEFAULT": "typical_25_002.wprgo"
},
"http://www.ticketmaster.com/JAY-Z-and-Justin-Timberlake-tickets/artist/1837448?brand=none&tm_link=tm_homeA_rc_name2_warm": {
"DEFAULT": "typical_25_002.wprgo"
}
},
......
tools/perf/page_sets/intl_ar_fa_he.py
View file @ d1fd8fc9
......@@ -11,18 +11,26 @@ from telemetry import story
class IntlArFaHePage(page_cycler_story.PageCyclerStory):
def __init__(self, url, page_set, cache_temperature=None):
if cache_temperature == cache_temperature_module.COLD:
temp_suffix = '_cold'
elif cache_temperature == cache_temperature_module.WARM:
temp_suffix = '_warm'
else:
raise NotImplementedError
super(IntlArFaHePage, self).__init__(
url=url, page_set=page_set,
shared_page_state_class=shared_page_state.SharedDesktopPageState,
cache_temperature=cache_temperature,
name=url)
name=url + temp_suffix)
class IntlArFaHePageSet(story.StorySet):
""" Popular pages in right-to-left languages Arabic, Farsi and Hebrew. """
def __init__(self, cache_temperatures=None):
def __init__(self, cache_temperatures=(cache_temperature_module.COLD,
cache_temperature_module.WARM)):
super(IntlArFaHePageSet, self).__init__(
archive_data_file='data/intl_ar_fa_he.json',
cloud_storage_bucket=story.PARTNER_BUCKET)
......
tools/perf/page_sets/intl_es_fr_pt-BR.py
View file @ d1fd8fc9
......@@ -11,11 +11,18 @@ from telemetry.page import shared_page_state
class IntlEsFrPtBrPage(page_cycler_story.PageCyclerStory):
def __init__(self, url, page_set, cache_temperature=None):
if cache_temperature == cache_temperature_module.COLD:
temp_suffix = '_cold'
elif cache_temperature == cache_temperature_module.WARM:
temp_suffix = '_warm'
else:
raise NotImplementedError
super(IntlEsFrPtBrPage, self).__init__(
url=url, page_set=page_set,
shared_page_state_class=shared_page_state.SharedDesktopPageState,
cache_temperature=cache_temperature,
name=url)
name=url + temp_suffix)
class IntlEsFrPtBrPageSet(story.StorySet):
......@@ -24,7 +31,8 @@ class IntlEsFrPtBrPageSet(story.StorySet):
Popular pages in Romance languages Spanish, French and Brazilian Portuguese.
"""
def __init__(self, cache_temperatures=None):
def __init__(self, cache_temperatures=(cache_temperature_module.COLD,
cache_temperature_module.WARM)):
super(IntlEsFrPtBrPageSet, self).__init__(
archive_data_file='data/intl_es_fr_pt-BR.json',
cloud_storage_bucket=story.PARTNER_BUCKET)
......
tools/perf/page_sets/intl_hi_ru.py
View file @ d1fd8fc9
......@@ -11,18 +11,26 @@ from telemetry import story
class IntlHiRuPage(page_cycler_story.PageCyclerStory):
def __init__(self, url, page_set, cache_temperature=None):
if cache_temperature == cache_temperature_module.COLD:
temp_suffix = '_cold'
elif cache_temperature == cache_temperature_module.WARM:
temp_suffix = '_warm'
else:
raise NotImplementedError
super(IntlHiRuPage, self).__init__(
url=url, page_set=page_set,
shared_page_state_class=shared_page_state.SharedDesktopPageState,
cache_temperature=cache_temperature,
name=url)
name=url+temp_suffix)
class IntlHiRuPageSet(story.StorySet):
""" Popular pages in Hindi and Russian. """
def __init__(self, cache_temperatures=None):
def __init__(self, cache_temperatures=(cache_temperature_module.COLD,
cache_temperature_module.WARM)):
super(IntlHiRuPageSet, self).__init__(
archive_data_file='data/intl_hi_ru.json',
cloud_storage_bucket=story.PARTNER_BUCKET)
......
tools/perf/page_sets/intl_ja_zh.py
View file @ d1fd8fc9
......@@ -11,18 +11,26 @@ from telemetry import story
class IntlJaZhPage(page_cycler_story.PageCyclerStory):
def __init__(self, url, page_set, cache_temperature=None):
if cache_temperature == cache_temperature_module.COLD:
temp_suffix = '_cold'
elif cache_temperature == cache_temperature_module.WARM:
temp_suffix = '_warm'
else:
raise NotImplementedError
super(IntlJaZhPage, self).__init__(
url=url, page_set=page_set,
shared_page_state_class=shared_page_state.SharedDesktopPageState,
cache_temperature=cache_temperature,
name=url)
name=url+temp_suffix)
class IntlJaZhPageSet(story.StorySet):
""" Popular pages in Japanese and Chinese. """
def __init__(self, cache_temperatures=None):
def __init__(self, cache_temperatures=(cache_temperature_module.COLD,
cache_temperature_module.WARM)):
super(IntlJaZhPageSet, self).__init__(
archive_data_file='data/intl_ja_zh.json',
cloud_storage_bucket=story.PARTNER_BUCKET)
......
tools/perf/page_sets/intl_ko_th_vi.py
View file @ d1fd8fc9
......@@ -11,18 +11,26 @@ from telemetry.page import shared_page_state
class IntlKoThViPage(page_cycler_story.PageCyclerStory):
def __init__(self, url, page_set, cache_temperature=None):
if cache_temperature == cache_temperature_module.COLD:
temp_suffix = '_cold'
elif cache_temperature == cache_temperature_module.WARM:
temp_suffix = '_warm'
else:
raise NotImplementedError
super(IntlKoThViPage, self).__init__(
url=url, page_set=page_set,
shared_page_state_class=shared_page_state.SharedDesktopPageState,
cache_temperature=cache_temperature,
name=url)
name=url+temp_suffix)
class IntlKoThViPageSet(story.StorySet):
""" Popular pages in Korean, Thai and Vietnamese. """
def __init__(self, cache_temperatures=None):
def __init__(self, cache_temperatures=(cache_temperature_module.COLD,
cache_temperature_module.WARM)):
super(IntlKoThViPageSet, self).__init__(
archive_data_file='data/intl_ko_th_vi.json',
cloud_storage_bucket=story.PARTNER_BUCKET)
......
tools/perf/page_sets/typical_25.py
View file @ d1fd8fc9
......@@ -10,33 +10,34 @@ from telemetry import story
class Typical25Page(page_module.Page):
def __init__(self, url, page_set, run_no_page_interactions,
def __init__(self, url, page_set,
shared_page_state_class=shared_page_state.SharedDesktopPageState,
cache_temperature=None):
if cache_temperature == cache_temperature_module.COLD:
temp_suffix = '_cold'
elif cache_temperature == cache_temperature_module.WARM:
temp_suffix = '_warm'
else:
raise NotImplementedError
super(Typical25Page, self).__init__(
url=url, page_set=page_set,
shared_page_state_class=shared_page_state_class,
cache_temperature=cache_temperature, name=url)
cache_temperature=cache_temperature, name=url + temp_suffix)
if cache_temperature != cache_temperature_module.ANY:
self.grouping_keys['cache_temperature'] = cache_temperature
self._run_no_page_interactions = run_no_page_interactions
def RunPageInteractions(self, action_runner):
if self._run_no_page_interactions:
action_runner.WaitForJavaScriptCondition(
'performance.timing.loadEventStart > 0')
return
with action_runner.CreateGestureInteraction('ScrollAction'):
action_runner.ScrollPage()
class Typical25PageSet(story.StorySet):
""" Pages designed to represent the median, not highly optimized web """
def __init__(self, run_no_page_interactions=False,
page_class=Typical25Page,
cache_temperatures=None):
def __init__(self, cache_temperatures=(cache_temperature_module.COLD,
cache_temperature_module.WARM)):
super(Typical25PageSet, self).__init__(
archive_data_file='data/typical_25.json',
cloud_storage_bucket=story.PARTNER_BUCKET)
......@@ -83,5 +84,4 @@ class Typical25PageSet(story.StorySet):
for url in urls_list:
for temp in cache_temperatures:
self.AddStory(page_class(
url, self, run_no_page_interactions, cache_temperature=temp))
self.AddStory(Typical25Page(url, self, cache_temperature=temp))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment