199050 2019-06-19 18:25:49 -0700 [perf.webkit.org] Update summary page calculations to use mean instead of median 2019-06-24 11:21:21 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dean_johnson dean_johnson commit-queue dean_johnson dewei_zhu rniwa webkit-bug-importer oldest_to_newest 1546354 0 dean_johnson 2019-06-19 18:25:49 -0700 Median of a set of data points can see higher variation in each view of the summary page than when using mean. This means a benchmark + platform's status may see major shifts as new data comes in, or when a benchmark produces bi-modal results. The downside to using mean is that any major outliers will impact the score a benchmark sees for a longer period of time. When doing comparisons between both median and mean-based calculations locally, results did not appear to shift wildly (i.e. from regressed => progressed or progressed => regressed). That said, I did see the resolution of a major regression cause incremental decreases to a single calculation as more data points came in, which seems desirable over an abrupt shift. 1546355 1 dean_johnson 2019-06-19 18:28:05 -0700 <rdar://problem/51763007> 1546441 2 372539 dean_johnson 2019-06-19 23:10:16 -0700 Created attachment 372539 Patch 1546666 3 372539 rniwa 2019-06-20 14:46:57 -0700 Comment on attachment 372539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372539&action=review > Websites/perf.webkit.org/public/v3/pages/summary-page.js:378 > + static _medianForTimeRange(timeSeries, timeRange) > + { Why do we need this function given that we're no longer using median? 1546668 4 372539 dewei_zhu 2019-06-20 14:49:26 -0700 Comment on attachment 372539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372539&action=review > Websites/perf.webkit.org/public/v3/pages/summary-page.js:379 > + var [startPoint, endPoint] = SummaryPageConfigurationGroup._startAndEndPointForTimeRange(timeSeries, timeRange); We favor 'const'/'let' over 'var'. > Websites/perf.webkit.org/public/v3/pages/summary-page.js:385 > + var [startPoint, endPoint] = SummaryPageConfigurationGroup._startAndEndPointForTimeRange(timeSeries, timeRange); ditto 1546679 5 372539 rniwa 2019-06-20 15:11:22 -0700 Comment on attachment 372539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372539&action=review > Websites/perf.webkit.org/public/v3/pages/summary-page.js:350 > + var baselineMean = SummaryPageConfigurationGroup._meanForTimeRange(baselineTimeSeries, timeRange); > + var currentMean = SummaryPageConfigurationGroup._meanForTimeRange(currentTimeSeries, timeRange); We should use const here. 1546719 6 dean_johnson 2019-06-20 16:06:11 -0700 (In reply to Ryosuke Niwa from comment #3) > Comment on attachment 372539 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372539&action=review > > > Websites/perf.webkit.org/public/v3/pages/summary-page.js:378 > > + static _medianForTimeRange(timeSeries, timeRange) > > + { > > Why do we need this function given that we're no longer using median? I figured it was worth keeping in-case we wanted to revert or test what using median would look like instead, but in hindsight that was a poor decision since we'd just roll back this patch anyways. I'll remove it. (In reply to dewei_zhu from comment #4) > Comment on attachment 372539 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372539&action=review > > > Websites/perf.webkit.org/public/v3/pages/summary-page.js:379 > > + var [startPoint, endPoint] = SummaryPageConfigurationGroup._startAndEndPointForTimeRange(timeSeries, timeRange); > > We favor 'const'/'let' over 'var'. > > > Websites/perf.webkit.org/public/v3/pages/summary-page.js:385 > > + var [startPoint, endPoint] = SummaryPageConfigurationGroup._startAndEndPointForTimeRange(timeSeries, timeRange); > > ditto The existing code used var, but I can change it to const. (In reply to Ryosuke Niwa from comment #5) > Comment on attachment 372539 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372539&action=review > > > Websites/perf.webkit.org/public/v3/pages/summary-page.js:350 > > + var baselineMean = SummaryPageConfigurationGroup._meanForTimeRange(baselineTimeSeries, timeRange); > > + var currentMean = SummaryPageConfigurationGroup._meanForTimeRange(currentTimeSeries, timeRange); > > We should use const here. Will fix. 1546727 7 372599 dean_johnson 2019-06-20 16:15:14 -0700 Created attachment 372599 Patch 1546732 8 dean_johnson 2019-06-20 16:24:32 -0700 New patch should address comments around 'var' usage. 1546941 9 372599 dewei_zhu 2019-06-21 12:16:28 -0700 Comment on attachment 372599 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372599&action=review > Websites/perf.webkit.org/ChangeLog:12 > + (SummaryPageConfigurationGroup.set _meanForTimeRange): New. Returns the mean of a timeSeries across a Where is the '.set' coming from? 1546942 10 372599 dean_johnson 2019-06-21 12:17:36 -0700 Comment on attachment 372599 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372599&action=review >> Websites/perf.webkit.org/ChangeLog:12 >> + (SummaryPageConfigurationGroup.set _meanForTimeRange): New. Returns the mean of a timeSeries across a > > Where is the '.set' coming from? I'm not sure - it was auto-generated. I can upload a new patch without it if you'd like. 1547416 11 372599 commit-queue 2019-06-24 11:20:51 -0700 Comment on attachment 372599 Patch Clearing flags on attachment: 372599 Committed r246743: <https://trac.webkit.org/changeset/246743> 1547417 12 commit-queue 2019-06-24 11:20:52 -0700 All reviewed patches have been landed. Closing bug. 1547418 13 webkit-bug-importer 2019-06-24 11:21:21 -0700 <rdar://problem/52061931> 372539 2019-06-19 23:10:16 -0700 2019-06-20 16:15:12 -0700 Patch bug-199050-20190619231015.patch text/plain 3778 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjEyCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA4NWVmNDExNDJlZWY2NjY3OWJlZmUyMzZiODVmZGFkNDU1OTg3MTEzLi5hMDhjMGNjYTll ZjU1YzlmOTQzMGY2NjQ1MWEzZDFlNTVmOTc5MzhhIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxOS0wNi0xOSAgRGVhbiBKb2huc29uICA8ZGVhbl9q b2huc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbcGVyZi53ZWJraXQub3JnXSBVcGRhdGUgc3Vt bWFyeSBwYWdlIGNhbGN1bGF0aW9ucyB0byB1c2UgbWVhbiBpbnN0ZWFkIG9mIG1lZGlhbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDUwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvdjMv cGFnZXMvc3VtbWFyeS1wYWdlLmpzOgorICAgICAgICAoU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9u R3JvdXApOiBVcGRhdGVkICdtZWRpYW4nIHJlZmVyZW5jZXMgdG8gJ21lYW4nLgorICAgICAgICAo U3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuc2V0IF9zdGFydEFuZEVuZFBvaW50Rm9yVGlt ZVJhbmdlKTogRmFjdG9yZWQgb3V0IGxvZ2ljIGZvciBmaW5kaW5nIGRhdGEKKyAgICAgICAgcG9p bnRzIGluIGEgdGltZVNlcmllcywgd2l0aGluIGEgc3BlY2lmaWVkIHRpbWVSYW5nZS4KKyAgICAg ICAgKFN1bW1hcnlQYWdlQ29uZmlndXJhdGlvbkdyb3VwLnNldCBfbWVhbkZvclRpbWVSYW5nZSk6 IE5ldy4gU2FtZSBhcyBfbWVkaWFuRm9yVGltZVJhYW5nZSwgYnV0IHVzZXMKKyAgICAgICAgU3Rh dGlzdGljcy5tZWFuLgorICAgICAgICAoU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuc2V0 IF9tZWRpYW5Gb3JUaW1lUmFuZ2UpOgorCiAyMDE5LTA2LTE3ICBEZXdlaSBaaHUgIDxkZXdlaV96 aHVAYXBwbGUuY29tPgogCiAgICAgICAgIEN1c3RvbWl6YWJsZSB0ZXN0IGdyb3VwIGZvcm0gc2hv dWxkIGFsbG93IHVzZXIgdG8gc3VwcGx5IGEgcmV2aXNpb24gcHJlZml4IG9mIGEgY29tbWl0IGFu ZCByZXZpc2lvbiBzdGFydHMgd2l0aCAncicuCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcyBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzCmluZGV4IDA1YzYwMTMx NGUxZGU1N2JmYzA3YTYzOTVjNjI5MDlkMTAzMTQ4YWMuLjA4OWVkOTgyZDdiMDc0ZTQ1ZmUxYjYw YzJlYjVjMTU0NjljMzdiMzEgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9w dWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzCkBAIC0zNDYsMjEgKzM0NiwyMSBA QCBjbGFzcyBTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cCB7CiAgICAgICAgICAgICB2YXIg YmFzZWxpbmVUaW1lU2VyaWVzID0gc2V0LmZldGNoZWRUaW1lU2VyaWVzKCdiYXNlbGluZScsIGZh bHNlLCBmYWxzZSk7CiAgICAgICAgICAgICB2YXIgY3VycmVudFRpbWVTZXJpZXMgPSBzZXQuZmV0 Y2hlZFRpbWVTZXJpZXMoJ2N1cnJlbnQnLCBmYWxzZSwgZmFsc2UpOwogCi0gICAgICAgICAgICB2 YXIgYmFzZWxpbmVNZWRpYW4gPSBTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cC5fbWVkaWFu Rm9yVGltZVJhbmdlKGJhc2VsaW5lVGltZVNlcmllcywgdGltZVJhbmdlKTsKLSAgICAgICAgICAg IHZhciBjdXJyZW50TWVkaWFuID0gU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuX21lZGlh bkZvclRpbWVSYW5nZShjdXJyZW50VGltZVNlcmllcywgdGltZVJhbmdlKTsKKyAgICAgICAgICAg IHZhciBiYXNlbGluZU1lYW4gPSBTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cC5fbWVhbkZv clRpbWVSYW5nZShiYXNlbGluZVRpbWVTZXJpZXMsIHRpbWVSYW5nZSk7CisgICAgICAgICAgICB2 YXIgY3VycmVudE1lYW4gPSBTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cC5fbWVhbkZvclRp bWVSYW5nZShjdXJyZW50VGltZVNlcmllcywgdGltZVJhbmdlKTsKICAgICAgICAgICAgIHZhciBw bGF0Zm9ybSA9IFBsYXRmb3JtLmZpbmRCeUlkKHNldC5wbGF0Zm9ybUlkKCkpOwotICAgICAgICAg ICAgaWYgKCFjdXJyZW50TWVkaWFuKQorICAgICAgICAgICAgaWYgKCFjdXJyZW50TWVhbikKICAg ICAgICAgICAgICAgICBzZWxmLl9taXNzaW5nUGxhdGZvcm1zLmFkZChwbGF0Zm9ybSk7Ci0gICAg ICAgICAgICBlbHNlIGlmICghYmFzZWxpbmVNZWRpYW4pCisgICAgICAgICAgICBlbHNlIGlmICgh YmFzZWxpbmVNZWFuKQogICAgICAgICAgICAgICAgIHNlbGYuX3BsYXRmb3Jtc1dpdGhvdXRCYXNl bGluZS5hZGQocGxhdGZvcm0pOwogCi0gICAgICAgICAgICBzZXRUb1JhdGlvLnNldChzZXQsIGN1 cnJlbnRNZWRpYW4gLyBiYXNlbGluZU1lZGlhbik7CisgICAgICAgICAgICBzZXRUb1JhdGlvLnNl dChzZXQsIGN1cnJlbnRNZWFuIC8gYmFzZWxpbmVNZWFuKTsKICAgICAgICAgfSkuY2F0Y2goZnVu Y3Rpb24gKCkgewogICAgICAgICAgICAgc2V0VG9SYXRpby5zZXQoc2V0LCBOYU4pOwogICAgICAg ICB9KTsKICAgICB9CiAKLSAgICBzdGF0aWMgX21lZGlhbkZvclRpbWVSYW5nZSh0aW1lU2VyaWVz LCB0aW1lUmFuZ2UpCisgICAgc3RhdGljIF9zdGFydEFuZEVuZFBvaW50Rm9yVGltZVJhbmdlKHRp bWVTZXJpZXMsIHRpbWVSYW5nZSkKICAgICB7CiAgICAgICAgIGlmICghdGltZVNlcmllcy5maXJz dFBvaW50KCkpCiAgICAgICAgICAgICByZXR1cm4gTmFOOwpAQCAtMzcxLDYgKzM3MSwxOCBAQCBj bGFzcyBTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cCB7CiAgICAgICAgIGlmICghZW5kUG9p bnQgfHwgc3RhcnRQb2ludCA9PSBhZnRlckVuZFBvaW50KQogICAgICAgICAgICAgZW5kUG9pbnQg PSBhZnRlckVuZFBvaW50OwogCisgICAgICAgIHJldHVybiBbc3RhcnRQb2ludCwgZW5kUG9pbnRd OworICAgIH0KKworICAgIHN0YXRpYyBfbWVkaWFuRm9yVGltZVJhbmdlKHRpbWVTZXJpZXMsIHRp bWVSYW5nZSkKKyAgICB7CisgICAgICAgIHZhciBbc3RhcnRQb2ludCwgZW5kUG9pbnRdID0gU3Vt bWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuX3N0YXJ0QW5kRW5kUG9pbnRGb3JUaW1lUmFuZ2Uo dGltZVNlcmllcywgdGltZVJhbmdlKTsKICAgICAgICAgcmV0dXJuIFN0YXRpc3RpY3MubWVkaWFu KHRpbWVTZXJpZXMudmlld0JldHdlZW5Qb2ludHMoc3RhcnRQb2ludCwgZW5kUG9pbnQpLnZhbHVl cygpKTsKICAgICB9CisKKyAgICBzdGF0aWMgX21lYW5Gb3JUaW1lUmFuZ2UodGltZVNlcmllcywg dGltZVJhbmdlKQorICAgIHsKKyAgICAgICAgdmFyIFtzdGFydFBvaW50LCBlbmRQb2ludF0gPSBT dW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cC5fc3RhcnRBbmRFbmRQb2ludEZvclRpbWVSYW5n ZSh0aW1lU2VyaWVzLCB0aW1lUmFuZ2UpOworICAgICAgICByZXR1cm4gU3RhdGlzdGljcy5tZWFu KHRpbWVTZXJpZXMudmlld0JldHdlZW5Qb2ludHMoc3RhcnRQb2ludCwgZW5kUG9pbnQpLnZhbHVl cygpKTsKKyAgICB9CiB9Cg== 372599 2019-06-20 16:15:14 -0700 2019-06-24 11:20:51 -0700 Patch bug-199050-20190620161513.patch text/plain 3528 dean_johnson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjU3CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA4NWVmNDExNDJlZWY2NjY3OWJlZmUyMzZiODVmZGFkNDU1OTg3MTEzLi5mNzkwZmFlNjJk ZDI4MjJiZjZhMWRlMWY3YmE3ZTc2NjQyMjViNGQ0IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0wNi0yMCAgRGVhbiBKb2huc29uICA8ZGVhbl9q b2huc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbcGVyZi53ZWJraXQub3JnXSBVcGRhdGUgc3Vt bWFyeSBwYWdlIGNhbGN1bGF0aW9ucyB0byB1c2UgbWVhbiBpbnN0ZWFkIG9mIG1lZGlhbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDUwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvdjMv cGFnZXMvc3VtbWFyeS1wYWdlLmpzOgorICAgICAgICAoU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9u R3JvdXApOiBVcGRhdGVkICdtZWRpYW4nIHJlZmVyZW5jZXMgdG8gJ21lYW4nLgorICAgICAgICAo U3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuc2V0IF9zdGFydEFuZEVuZFBvaW50Rm9yVGlt ZVJhbmdlKTogRmFjdG9yZWQgb3V0IGxvZ2ljIGZvciBmaW5kaW5nIGRhdGEKKyAgICAgICAgcG9p bnRzIGluIGEgdGltZVNlcmllcywgd2l0aGluIGEgc3BlY2lmaWVkIHRpbWVSYW5nZS4KKyAgICAg ICAgKFN1bW1hcnlQYWdlQ29uZmlndXJhdGlvbkdyb3VwLnNldCBfbWVhbkZvclRpbWVSYW5nZSk6 IE5ldy4gUmV0dXJucyB0aGUgbWVhbiBvZiBhIHRpbWVTZXJpZXMgYWNyb3NzIGEKKyAgICAgICAg Z2l2ZW4gdGltZVJhbmdlLgorCiAyMDE5LTA2LTE3ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBw bGUuY29tPgogCiAgICAgICAgIEN1c3RvbWl6YWJsZSB0ZXN0IGdyb3VwIGZvcm0gc2hvdWxkIGFs bG93IHVzZXIgdG8gc3VwcGx5IGEgcmV2aXNpb24gcHJlZml4IG9mIGEgY29tbWl0IGFuZCByZXZp c2lvbiBzdGFydHMgd2l0aCAncicuCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzCmluZGV4IDA1YzYwMTMxNGUxZGU1 N2JmYzA3YTYzOTVjNjI5MDlkMTAzMTQ4YWMuLmU0NjE5YjE5NzQ4N2NlOTcyYzE4YzgwYWZlODli ZmRiMmNlYTg4N2YgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMv djMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9w dWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzCkBAIC0zNDYsMjEgKzM0NiwyMSBAQCBjbGFz cyBTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cCB7CiAgICAgICAgICAgICB2YXIgYmFzZWxp bmVUaW1lU2VyaWVzID0gc2V0LmZldGNoZWRUaW1lU2VyaWVzKCdiYXNlbGluZScsIGZhbHNlLCBm YWxzZSk7CiAgICAgICAgICAgICB2YXIgY3VycmVudFRpbWVTZXJpZXMgPSBzZXQuZmV0Y2hlZFRp bWVTZXJpZXMoJ2N1cnJlbnQnLCBmYWxzZSwgZmFsc2UpOwogCi0gICAgICAgICAgICB2YXIgYmFz ZWxpbmVNZWRpYW4gPSBTdW1tYXJ5UGFnZUNvbmZpZ3VyYXRpb25Hcm91cC5fbWVkaWFuRm9yVGlt ZVJhbmdlKGJhc2VsaW5lVGltZVNlcmllcywgdGltZVJhbmdlKTsKLSAgICAgICAgICAgIHZhciBj dXJyZW50TWVkaWFuID0gU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuX21lZGlhbkZvclRp bWVSYW5nZShjdXJyZW50VGltZVNlcmllcywgdGltZVJhbmdlKTsKKyAgICAgICAgICAgIGNvbnN0 IGJhc2VsaW5lTWVhbiA9IFN1bW1hcnlQYWdlQ29uZmlndXJhdGlvbkdyb3VwLl9tZWFuRm9yVGlt ZVJhbmdlKGJhc2VsaW5lVGltZVNlcmllcywgdGltZVJhbmdlKTsKKyAgICAgICAgICAgIGNvbnN0 IGN1cnJlbnRNZWFuID0gU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAuX21lYW5Gb3JUaW1l UmFuZ2UoY3VycmVudFRpbWVTZXJpZXMsIHRpbWVSYW5nZSk7CiAgICAgICAgICAgICB2YXIgcGxh dGZvcm0gPSBQbGF0Zm9ybS5maW5kQnlJZChzZXQucGxhdGZvcm1JZCgpKTsKLSAgICAgICAgICAg IGlmICghY3VycmVudE1lZGlhbikKKyAgICAgICAgICAgIGlmICghY3VycmVudE1lYW4pCiAgICAg ICAgICAgICAgICAgc2VsZi5fbWlzc2luZ1BsYXRmb3Jtcy5hZGQocGxhdGZvcm0pOwotICAgICAg ICAgICAgZWxzZSBpZiAoIWJhc2VsaW5lTWVkaWFuKQorICAgICAgICAgICAgZWxzZSBpZiAoIWJh c2VsaW5lTWVhbikKICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9ybXNXaXRob3V0QmFzZWxp bmUuYWRkKHBsYXRmb3JtKTsKIAotICAgICAgICAgICAgc2V0VG9SYXRpby5zZXQoc2V0LCBjdXJy ZW50TWVkaWFuIC8gYmFzZWxpbmVNZWRpYW4pOworICAgICAgICAgICAgc2V0VG9SYXRpby5zZXQo c2V0LCBjdXJyZW50TWVhbiAvIGJhc2VsaW5lTWVhbik7CiAgICAgICAgIH0pLmNhdGNoKGZ1bmN0 aW9uICgpIHsKICAgICAgICAgICAgIHNldFRvUmF0aW8uc2V0KHNldCwgTmFOKTsKICAgICAgICAg fSk7CiAgICAgfQogCi0gICAgc3RhdGljIF9tZWRpYW5Gb3JUaW1lUmFuZ2UodGltZVNlcmllcywg dGltZVJhbmdlKQorICAgIHN0YXRpYyBfc3RhcnRBbmRFbmRQb2ludEZvclRpbWVSYW5nZSh0aW1l U2VyaWVzLCB0aW1lUmFuZ2UpCiAgICAgewogICAgICAgICBpZiAoIXRpbWVTZXJpZXMuZmlyc3RQ b2ludCgpKQogICAgICAgICAgICAgcmV0dXJuIE5hTjsKQEAgLTM3MSw2ICszNzEsMTIgQEAgY2xh c3MgU3VtbWFyeVBhZ2VDb25maWd1cmF0aW9uR3JvdXAgewogICAgICAgICBpZiAoIWVuZFBvaW50 IHx8IHN0YXJ0UG9pbnQgPT0gYWZ0ZXJFbmRQb2ludCkKICAgICAgICAgICAgIGVuZFBvaW50ID0g YWZ0ZXJFbmRQb2ludDsKIAotICAgICAgICByZXR1cm4gU3RhdGlzdGljcy5tZWRpYW4odGltZVNl cmllcy52aWV3QmV0d2VlblBvaW50cyhzdGFydFBvaW50LCBlbmRQb2ludCkudmFsdWVzKCkpOwor ICAgICAgICByZXR1cm4gW3N0YXJ0UG9pbnQsIGVuZFBvaW50XTsKKyAgICB9CisKKyAgICBzdGF0 aWMgX21lYW5Gb3JUaW1lUmFuZ2UodGltZVNlcmllcywgdGltZVJhbmdlKQorICAgIHsKKyAgICAg ICAgY29uc3QgW3N0YXJ0UG9pbnQsIGVuZFBvaW50XSA9IFN1bW1hcnlQYWdlQ29uZmlndXJhdGlv bkdyb3VwLl9zdGFydEFuZEVuZFBvaW50Rm9yVGltZVJhbmdlKHRpbWVTZXJpZXMsIHRpbWVSYW5n ZSk7CisgICAgICAgIHJldHVybiBTdGF0aXN0aWNzLm1lYW4odGltZVNlcmllcy52aWV3QmV0d2Vl blBvaW50cyhzdGFydFBvaW50LCBlbmRQb2ludCkudmFsdWVzKCkpOwogICAgIH0KIH0K