141286 2015-02-05 00:24:43 -0800 New perf dashboard should compare results to baseline and target 2016-02-16 13:53:12 -0800 1 1 1 Unclassified WebKit Perf Dashboard 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 141237 1 rniwa rniwa benjamin cdumez commit-queue kling rniwa oldest_to_newest 1067060 0 rniwa 2015-02-05 00:24:43 -0800 As done in the v1 dashboard, we should compare results to the baseline and the target values. 1067061 1 246092 rniwa 2015-02-05 00:54:40 -0800 Created attachment 246092 Patch 1067191 2 246092 cdumez 2015-02-05 13:25:13 -0800 Comment on attachment 246092 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246092&action=review r=me > Websites/perf.webkit.org/public/v2/app.js:791 > + var formatter = d3.format('.3p'); Why don't we use the formatter from chartData? 1067217 3 246092 commit-queue 2015-02-05 14:34:19 -0800 Comment on attachment 246092 Patch Clearing flags on attachment: 246092 Committed r179710: <http://trac.webkit.org/changeset/179710> 1067218 4 commit-queue 2015-02-05 14:34:24 -0800 All reviewed patches have been landed. Closing bug. 246092 2015-02-05 00:54:40 -0800 2015-02-05 14:34:19 -0800 Patch bug-141286-20150205005441.patch text/plain 15397 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTc5Njc5KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQwIEBACisyMDE1LTAyLTA1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIE5ldyBwZXJmIGRhc2hib2FyZCBzaG91bGQgY29tcGFyZSByZXN1bHRzIHRvIGJh c2VsaW5lIGFuZCB0YXJnZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0MTI4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIENvbXBhcmUgdGhlIHNlbGVjdGVkIHZhbHVlIGFnYWluc3QgYmFzZWxpbmUgYW5k IHRhcmdldCB2YWx1ZXMgYXMgZG9uZSBpbiB2MS4gZS5nLiAiNSUgYmVsb3cgdGFyZ2V0IgorICAg ICAgICBBbHNvIHVzZSBkMy5mb3JtYXQgdG8gZm9ybWF0IHRoZSBzZWxlY3RlZCB2YWx1ZSB0byBz aG93IGZvdXIgc2lnbmlmaWNhbnQgZmlndXJlcy4KKworICAgICAgICAqIHB1YmxpYy92Mi9hcHAu anM6CisgICAgICAgIChBcHAuUGFuZS5zZWFyY2hDb21taXQpOgorICAgICAgICAoQXBwLlBhbmUu X2ZldGNoKTogQ3JlYXRlIHRpbWUgc2VyaWVzIGhlcmUgdmlhIGNyZWF0ZUNoYXJ0RGF0YSBzbyB0 aGF0IF9jb21wdXRlU3RhdHVzIGNhbiB1c2UgdGhlbQorICAgICAgICB0byBjb21wdXRlIHRoZSBz dGF0dXMgdGV4dCB3aXRob3V0IGhhdmluZyB0byByZWNyZWF0ZSB0aGVtLgorICAgICAgICAoQXBw LmNyZWF0ZUNoYXJ0RGF0YSk6IEFkZGVkLgorICAgICAgICAoQXBwLlBhbmVDb250cm9sbGVyLl91 cGRhdGVEZXRhaWxzKTogVXNlIDNkLmZvcm1hdCBvbiBjdXJyZW50IGFuZCBvbGQgdmFsdWVzLgor ICAgICAgICAoQXBwLlBhbmVDb250cm9sbGVyLl9jb21wdXRlU3RhdHVzKTogQWRkZWQuIENvbXB1 dGVzIHRoZSBzdGF0dXMgdGV4dC4KKyAgICAgICAgKEFwcC5QYW5lQ29udHJvbGxlci5fcmVsYXRp dmVEaWZmZXJlbnRUb0xhdGVyUG9pbnRJblRpbWVTZXJpZXMpOiBBZGRlZC4KKyAgICAgICAgKEFw cC5BbmFseXNpc1Rhc2tDb250cm9sbGVyLl9mZXRjaGVkTWFuaWZlc3QpOiBVc2UgY3JlYXRlQ2hh cnREYXRhIGFzIGRvbmUgaW4gQXBwLlBhbmUuX2ZldGNoLiBBbHNvCisgICAgICAgIGZvcm1hdCB0 aGUgdmFsdWVzIHVzaW5nIGNoYXJ0RGF0YS5mb3JtYXR0ZXIuCisKKyAgICAgICAgKiBwdWJsaWMv djIvY2hhcnQtcGFuZS5jc3M6IEVubGFyZ2UgdGhlIHN0YXR1cyB0ZXh0LiBTaG93IHRoZSBzdGF0 dXMgdGV4dCBpbiByZWQgaWYgaXQncyB3b3JzZSB0aGFuCisgICAgICAgIHRoZSBiYXNlbGluZSBh bmQgaW4gYmx1ZSBpZiBpdCdzIGJldHRlciB0aGFuIHRoZSB0YXJnZXQuCisKKyAgICAgICAgKiBw dWJsaWMvdjIvZGF0YS5qczoKKyAgICAgICAgKFRpbWVTZXJpZXMucHJvdG90eXBlLmZpbmRQb2lu dEFmdGVyVGltZSk6IEFkZGVkLgorCisgICAgICAgICogcHVibGljL3YyL2luZGV4Lmh0bWw6IEFk ZGVkIGEgbmV3IHRib2R5IGZvciB0aGUgc3RhdHVzIHRleHQgYW5kIHRoZSBzZWxlY3RlZCB2YWx1 ZS4gQWxzbyBmaXhlZAorICAgICAgICB0aGUgYnVnIHRoYXQgd2Ugd2VyZSBub3Qgc2hvd2luZyB0 aGUgb2xkIHZhbHVlJ3MgdW5pdC4KKworICAgICAgICAqIHB1YmxpYy92Mi9pbnRlcmFjdGl2ZS1j aGFydC5qczoKKyAgICAgICAgKEFwcC5JbnRlcmFjdGl2ZUNoYXJ0Q29tcG9uZW50Ll9jb25zdHJ1 Y3RHcmFwaElmUG9zc2libGUpOiBVc2UgY2hhcnREYXRhLmZvcm1hdHRlci4gQWxzbyBjbGVhbmVk IHVwCisgICAgICAgIHRoZSBjb2RlIHRvIHNob3cgdGhlIGJhc2VsaW5lIGFuZCB0aGUgdGFyZ2V0 IGxpbmVzLgorCisgICAgICAgICogcHVibGljL3YyL21hbmlmZXN0LmpzOgorICAgICAgICAoQXBw Lk1hbmlmZXN0LmZldGNoUnVuc1dpdGhQbGF0Zm9ybUFuZE1ldHJpYyk6IEFkZGVkIHNtYWxsZXJJ c0JldHRlci4KKwogMjAxNS0wMi0wNCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4K IAogICAgICAgICBOZXcgcGVyZiBkYXNoYm9hcmQgZG9lc24ndCBwcmVzZXJ2ZSB0aGUgbnVtYmVy IG9mIGRheXMgd2hlbiBjbGlja2luZyBvbiBhIGRhc2hib2FyZCBjaGFydApJbmRleDogV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9hcHAuanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9hcHAuanMJKHJldmlzaW9uIDE3OTY2MSkKKysr IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvYXBwLmpzCSh3b3JraW5nIGNvcHkp CkBAIC0yODEsNyArMjgxLDcgQEAgQXBwLlBhbmUgPSBFbWJlci5PYmplY3QuZXh0ZW5kKHsKICAg ICAgICAgQ29tbWl0TG9ncy5mZXRjaEZvclRpbWVSYW5nZShyZXBvc2l0b3J5SWQsIG51bGwsIG51 bGwsIGtleXdvcmQpLnRoZW4oZnVuY3Rpb24gKGNvbW1pdHMpIHsKICAgICAgICAgICAgIGlmIChz ZWxmLmlzRGVzdHJveWVkIHx8ICFzZWxmLmdldCgnY2hhcnREYXRhJykgfHwgIWNvbW1pdHMubGVu Z3RoKQogICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIHZhciBjdXJyZW50UnVu cyA9IHNlbGYuZ2V0KCdjaGFydERhdGEnKS5jdXJyZW50LnRpbWVTZXJpZXNCeUNvbW1pdFRpbWUo KS5zZXJpZXMoKTsKKyAgICAgICAgICAgIHZhciBjdXJyZW50UnVucyA9IHNlbGYuZ2V0KCdjaGFy dERhdGEnKS5jdXJyZW50LnNlcmllcygpOwogICAgICAgICAgICAgaWYgKCFjdXJyZW50UnVucy5s ZW5ndGgpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0zMjksNyArMzI5LDcgQEAgQXBw LlBhbmUgPSBFbWJlci5PYmplY3QuZXh0ZW5kKHsKICAgICAgICAgICAgIEFwcC5NYW5pZmVzdC5m ZXRjaFJ1bnNXaXRoUGxhdGZvcm1BbmRNZXRyaWModGhpcy5nZXQoJ3N0b3JlJyksIHBsYXRmb3Jt SWQsIG1ldHJpY0lkKS50aGVuKGZ1bmN0aW9uIChyZXN1bHQpIHsKICAgICAgICAgICAgICAgICBz ZWxmLnNldCgncGxhdGZvcm0nLCByZXN1bHQucGxhdGZvcm0pOwogICAgICAgICAgICAgICAgIHNl bGYuc2V0KCdtZXRyaWMnLCByZXN1bHQubWV0cmljKTsKLSAgICAgICAgICAgICAgICBzZWxmLnNl dCgnY2hhcnREYXRhJywgcmVzdWx0LnJ1bnMpOworICAgICAgICAgICAgICAgIHNlbGYuc2V0KCdj aGFydERhdGEnLCBBcHAuY3JlYXRlQ2hhcnREYXRhKHJlc3VsdCkpOwogICAgICAgICAgICAgfSwg ZnVuY3Rpb24gKHJlc3VsdCkgewogICAgICAgICAgICAgICAgIGlmICghcmVzdWx0IHx8IHR5cGVv ZihyZXN1bHQpID09PSAic3RyaW5nIikKICAgICAgICAgICAgICAgICAgICAgc2VsZi5zZXQoJ2Zh aWx1cmUnLCAnRmFpbGVkIHRvIGZldGNoIHRoZSBKU09OIHdpdGggYW4gZXJyb3I6ICcgKyByZXN1 bHQpOwpAQCAtMzY1LDYgKzM2NSwxOSBAQCBBcHAuUGFuZSA9IEVtYmVyLk9iamVjdC5leHRlbmQo ewogICAgIH0KIH0pOwogCitBcHAuY3JlYXRlQ2hhcnREYXRhID0gZnVuY3Rpb24gKGRhdGEpCit7 CisgICAgdmFyIHJ1bnMgPSBkYXRhLnJ1bnM7CisgICAgcmV0dXJuIHsKKyAgICAgICAgY3VycmVu dDogcnVucy5jdXJyZW50LnRpbWVTZXJpZXNCeUNvbW1pdFRpbWUoKSwKKyAgICAgICAgYmFzZWxp bmU6IHJ1bnMuYmFzZWxpbmUgPyBydW5zLmJhc2VsaW5lLnRpbWVTZXJpZXNCeUNvbW1pdFRpbWUo KSA6IG51bGwsCisgICAgICAgIHRhcmdldDogcnVucy50YXJnZXQgPyBydW5zLnRhcmdldC50aW1l U2VyaWVzQnlDb21taXRUaW1lKCkgOiBudWxsLAorICAgICAgICB1bml0OiBkYXRhLnVuaXQsCisg ICAgICAgIGZvcm1hdHRlcjogZGF0YS51c2VTSSA/IGQzLmZvcm1hdCgnLjRzJykgOiBkMy5mb3Jt YXQoJy40ZycpLAorICAgICAgICBzbWFsbGVySXNCZXR0ZXI6IGRhdGEuc21hbGxlcklzQmV0dGVy LAorICAgIH07Cit9CisKIEFwcC5lbmNvZGVQcmV0dGlmaWVkSlNPTiA9IGZ1bmN0aW9uIChwbGFp bikKIHsKICAgICBmdW5jdGlvbiBudW1iZXJJZlBvc3NpYmxlKHN0cmluZykgewpAQCAtNzQ5LDkg Kzc2MiwxMSBAQCBBcHAuUGFuZUNvbnRyb2xsZXIgPSBFbWJlci5PYmplY3RDb250cm9sCiAgICAg ICAgICAgICAgICAgYnVpbGRVUkwgPSBidWlsZGVyLnVybEZyb21CdWlsZE51bWJlcihidWlsZE51 bWJlcik7CiAgICAgICAgIH0KIAorICAgICAgICB2YXIgY2hhcnREYXRhID0gdGhpcy5nZXQoJ2No YXJ0RGF0YScpOwogICAgICAgICB0aGlzLnNldCgnZGV0YWlscycsIEVtYmVyLk9iamVjdC5jcmVh dGUoewotICAgICAgICAgICAgY3VycmVudFZhbHVlOiBjdXJyZW50TWVhc3VyZW1lbnQubWVhbigp LnRvRml4ZWQoMiksCi0gICAgICAgICAgICBvbGRWYWx1ZTogb2xkTWVhc3VyZW1lbnQgJiYgc2Vs ZWN0ZWRQb2ludHMgPyBvbGRNZWFzdXJlbWVudC5tZWFuKCkudG9GaXhlZCgyKSA6IG51bGwsCisg ICAgICAgICAgICBzdGF0dXM6IHRoaXMuX2NvbXB1dGVTdGF0dXMoY3VycmVudFBvaW50KSwKKyAg ICAgICAgICAgIGN1cnJlbnRWYWx1ZTogY2hhcnREYXRhLmZvcm1hdHRlcihjdXJyZW50TWVhc3Vy ZW1lbnQubWVhbigpKSwKKyAgICAgICAgICAgIG9sZFZhbHVlOiBvbGRNZWFzdXJlbWVudCAmJiBz ZWxlY3RlZFBvaW50cyA/IGNoYXJ0RGF0YS5mb3JtYXR0ZXIob2xkTWVhc3VyZW1lbnQubWVhbigp KSA6IG51bGwsCiAgICAgICAgICAgICBidWlsZE51bWJlcjogYnVpbGROdW1iZXIsCiAgICAgICAg ICAgICBidWlsZFVSTDogYnVpbGRVUkwsCiAgICAgICAgICAgICBidWlsZFRpbWU6IGN1cnJlbnRN ZWFzdXJlbWVudC5mb3JtYXR0ZWRCdWlsZFRpbWUoKSwKQEAgLTc2NCw2ICs3NzksNDAgQEAgQXBw LlBhbmVDb250cm9sbGVyID0gRW1iZXIuT2JqZWN0Q29udHJvbAogICAgICAgICB2YXIgcG9pbnRz ID0gdGhpcy5nZXQoJ3NlbGVjdGVkUG9pbnRzJyk7CiAgICAgICAgIHRoaXMuc2V0KCdjYW5ub3RB bmFseXplJywgIXRoaXMuZ2V0KCduZXdBbmFseXNpc1Rhc2tOYW1lJykgfHwgIXBvaW50cyB8fCBw b2ludHMubGVuZ3RoIDwgMik7CiAgICAgfS5vYnNlcnZlcygnbmV3QW5hbHlzaXNUYXNrTmFtZScp LAorICAgIF9jb21wdXRlU3RhdHVzOiBmdW5jdGlvbiAoY3VycmVudFBvaW50KQorICAgIHsKKyAg ICAgICAgdmFyIGNoYXJ0RGF0YSA9IHRoaXMuZ2V0KCdjaGFydERhdGEnKTsKKworICAgICAgICB2 YXIgZGlmZkZyb21CYXNlbGluZSA9IHRoaXMuX3JlbGF0aXZlRGlmZmVyZW50VG9MYXRlclBvaW50 SW5UaW1lU2VyaWVzKGN1cnJlbnRQb2ludCwgY2hhcnREYXRhLmJhc2VsaW5lKTsKKyAgICAgICAg dmFyIGRpZmZGcm9tVGFyZ2V0ID0gdGhpcy5fcmVsYXRpdmVEaWZmZXJlbnRUb0xhdGVyUG9pbnRJ blRpbWVTZXJpZXMoY3VycmVudFBvaW50LCBjaGFydERhdGEudGFyZ2V0KTsKKworICAgICAgICB2 YXIgbGFiZWwgPSAnJzsKKyAgICAgICAgdmFyIGNsYXNzTmFtZSA9ICcnOworICAgICAgICB2YXIg Zm9ybWF0dGVyID0gZDMuZm9ybWF0KCcuM3AnKTsKKworICAgICAgICB2YXIgc21hbGxlcklzQmV0 dGVyID0gY2hhcnREYXRhLnNtYWxsZXJJc0JldHRlcjsKKyAgICAgICAgaWYgKGRpZmZGcm9tQmFz ZWxpbmUgIT09IHVuZGVmaW5lZCAmJiBkaWZmRnJvbUJhc2VsaW5lID4gMCA9PSBzbWFsbGVySXNC ZXR0ZXIpIHsKKyAgICAgICAgICAgIGxhYmVsID0gZm9ybWF0dGVyKE1hdGguYWJzKGRpZmZGcm9t QmFzZWxpbmUpKSArICcgJyArIChzbWFsbGVySXNCZXR0ZXIgPyAnYWJvdmUnIDogJ2JlbG93Jykg KyAnIGJhc2VsaW5lJzsKKyAgICAgICAgICAgIGNsYXNzTmFtZSA9ICd3b3JzZSc7CisgICAgICAg IH0gZWxzZSBpZiAoZGlmZkZyb21UYXJnZXQgIT09IHVuZGVmaW5lZCAmJiBkaWZmRnJvbVRhcmdl dCA8IDAgPT0gc21hbGxlcklzQmV0dGVyKSB7CisgICAgICAgICAgICBsYWJlbCA9IGZvcm1hdHRl cihNYXRoLmFicyhkaWZmRnJvbVRhcmdldCkpICsgJyAnICsgKHNtYWxsZXJJc0JldHRlciA/ICdi ZWxvdycgOiAnYWJvdmUnKSArICcgdGFyZ2V0JzsKKyAgICAgICAgICAgIGNsYXNzTmFtZSA9ICdi ZXR0ZXInOworICAgICAgICB9IGVsc2UgaWYgKGRpZmZGcm9tVGFyZ2V0ICE9PSB1bmRlZmluZWQp CisgICAgICAgICAgICBsYWJlbCA9IGZvcm1hdHRlcihNYXRoLmFicyhkaWZmRnJvbVRhcmdldCkp ICsgJyB1bnRpbCB0YXJnZXQnOworCisgICAgICAgIHJldHVybiB7Y2xhc3NOYW1lOiBjbGFzc05h bWUsIGxhYmVsOiBsYWJlbH07CisgICAgfSwKKyAgICBfcmVsYXRpdmVEaWZmZXJlbnRUb0xhdGVy UG9pbnRJblRpbWVTZXJpZXM6IGZ1bmN0aW9uIChjdXJyZW50UG9pbnQsIHRpbWVTZXJpZXMpCisg ICAgeworICAgICAgICBpZiAoIWN1cnJlbnRQb2ludCB8fCAhdGltZVNlcmllcykKKyAgICAgICAg ICAgIHJldHVybiB1bmRlZmluZWQ7CisgICAgICAgIAorICAgICAgICB2YXIgcmVmZXJlbmNlUG9p bnQgPSB0aW1lU2VyaWVzLmZpbmRQb2ludEFmdGVyVGltZShjdXJyZW50UG9pbnQudGltZSk7Cisg ICAgICAgIGlmICghcmVmZXJlbmNlUG9pbnQpCisgICAgICAgICAgICByZXR1cm4gdW5kZWZpbmVk OworCisgICAgICAgIHJldHVybiAoY3VycmVudFBvaW50LnZhbHVlIC0gcmVmZXJlbmNlUG9pbnQu dmFsdWUpIC8gcmVmZXJlbmNlUG9pbnQudmFsdWU7CisgICAgfQogfSk7CiAKIApAQCAtODM1LDE3 ICs4ODQsMTggQEAgQXBwLkFuYWx5c2lzVGFza0NvbnRyb2xsZXIgPSBFbWJlci5Db250cgogICAg ICAgICBoaWdobGlnaHRlZEl0ZW1zW3N0YXJ0Lm1lYXN1cmVtZW50LmlkKCldID0gdHJ1ZTsKICAg ICAgICAgaGlnaGxpZ2h0ZWRJdGVtc1tlbmQubWVhc3VyZW1lbnQuaWQoKV0gPSB0cnVlOwogCisg ICAgICAgIHZhciBjaGFydERhdGEgPSBBcHAuY3JlYXRlQ2hhcnREYXRhKGRhdGEpOwogICAgICAg ICB2YXIgZm9ybWF0ZWRQb2ludHMgPSBjdXJyZW50VGltZVNlcmllcy5zZXJpZXNCZXR3ZWVuUG9p bnRzKHN0YXJ0LCBlbmQpLm1hcChmdW5jdGlvbiAocG9pbnQsIGluZGV4KSB7CiAgICAgICAgICAg ICByZXR1cm4gewogICAgICAgICAgICAgICAgIGlkOiBwb2ludC5tZWFzdXJlbWVudC5pZCgpLAog ICAgICAgICAgICAgICAgIG1lYXN1cmVtZW50OiBwb2ludC5tZWFzdXJlbWVudCwKICAgICAgICAg ICAgICAgICBsYWJlbDogJ1BvaW50ICcgKyAoaW5kZXggKyAxKSwKLSAgICAgICAgICAgICAgICB2 YWx1ZTogcG9pbnQudmFsdWUgKyAocnVucy51bml0ID8gJyAnICsgcnVucy51bml0IDogJycpLAor ICAgICAgICAgICAgICAgIHZhbHVlOiBjaGFydERhdGEuZm9ybWF0dGVyKHBvaW50LnZhbHVlKSAr IChkYXRhLnVuaXQgPyAnICcgKyBkYXRhLnVuaXQgOiAnJyksCiAgICAgICAgICAgICB9OwogICAg ICAgICB9KTsKIAogICAgICAgICB2YXIgbWFyZ2luID0gKGVuZC50aW1lIC0gc3RhcnQudGltZSkg KiAwLjE7Ci0gICAgICAgIHRoaXMuc2V0KCdjaGFydERhdGEnLCBydW5zKTsKKyAgICAgICAgdGhp cy5zZXQoJ2NoYXJ0RGF0YScsIGNoYXJ0RGF0YSk7CiAgICAgICAgIHRoaXMuc2V0KCdjaGFydERv bWFpbicsIFtzdGFydC50aW1lIC0gbWFyZ2luLCArZW5kLnRpbWUgKyBtYXJnaW5dKTsKICAgICAg ICAgdGhpcy5zZXQoJ2hpZ2hsaWdodGVkSXRlbXMnLCBoaWdobGlnaHRlZEl0ZW1zKTsKICAgICAg ICAgdGhpcy5zZXQoJ2FuYWx5c2lzUG9pbnRzJywgZm9ybWF0ZWRQb2ludHMpOwpJbmRleDogV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9jaGFydC1wYW5lLmNzcwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2NoYXJ0LXBhbmUuY3NzCShy ZXZpc2lvbiAxNzk2NjApCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2No YXJ0LXBhbmUuY3NzCSh3b3JraW5nIGNvcHkpCkBAIC0yMTAsNiArMjEwLDcgQEAKIC5jaGFydC1w YW5lIC5kZXRhaWxzLXRhYmxlIHRkIHRhYmxlIHRkIHsKICAgICB3b3JkLWJyZWFrOiBicmVhay13 b3JkOwogICAgIGJvcmRlci10b3A6IHNvbGlkIDFweCAjY2NjOworICAgIGJvcmRlci1ib3R0b206 IHNvbGlkIDFweCAjY2NjOwogICAgIHBhZGRpbmc6IDAuMnJlbTsKIH0KIApAQCAtMjMyLDYgKzIz MywxNCBAQAogICAgIGNvbnRlbnQ6ICIgOiAiOwogfQogCisuY2hhcnQtcGFuZSAuZGV0YWlscy10 YWJsZSAuc3RhdHVzIHRoIHsKKyAgICB2aXNpYmlsaXR5OiBoaWRkZW47Cit9CisKKy5jaGFydC1w YW5lIC5kZXRhaWxzLXRhYmxlIC5zdGF0dXMgdGQgeworICAgIGZvbnQtc2l6ZTogMXJlbTsKK30K KwogLmNoYXJ0LXBhbmUgLmNoYXJ0IHsKICAgICBoZWlnaHQ6IDEwMCU7CiB9CkBAIC0yNTcsMTAg KzI2Niw2IEBACiAgICAgc3Ryb2tlLXdpZHRoOiAxLjVweDsKIH0KIAotLmNoYXJ0IC5jb21taXQt dGltZS1saW5lIHsKLSAgICBzdHJva2U6ICM5OTk7Ci19Ci0KIC5jaGFydCAuZG90IHsKICAgICBm aWxsOiAjNjY2OwogICAgIHN0cm9rZTogbm9uZTsKQEAgLTI3MiwxNiArMjc3LDIyIEBACiAgICAg b3BhY2l0eTogMC44OwogfQogCi0uY2hhcnQgcGF0aC5hcmVhLmJhc2VsaW5lIHsKKy5jaGFydCBw YXRoLmN1cnJlbnQgeworICAgIHN0cm9rZTogIzk5OTsKK30KKworLmNoYXJ0IHBhdGguYmFzZWxp bmUgewogICAgIHN0cm9rZTogI2Y2NjsKLSAgICBmaWxsOiAjZmRkOwotICAgIG9wYWNpdHk6IDAu NDsKK30KKy5jaGFydC1wYW5lIC5zdGF0dXMgLndvcnNlIHsKKyAgICBjb2xvcjogI2MzMzsKIH0K IAotLmNoYXJ0IHBhdGguYXJlYS50YXJnZXQgeworLmNoYXJ0IHBhdGgudGFyZ2V0IHsKICAgICBz dHJva2U6ICM2NmY7Ci0gICAgZmlsbDogI2RkZjsKLSAgICBvcGFjaXR5OiAwLjQ7Cit9CisuY2hh cnQtcGFuZSAuc3RhdHVzIC5iZXR0ZXIgeworICAgIGNvbG9yOiAjMzNjOwogfQogCiAuY2hhcnQg LmF4aXMsCkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2RhdGEuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9kYXRhLmpz CShyZXZpc2lvbiAxNzk2NjApCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yy L2RhdGEuanMJKHdvcmtpbmcgY29weSkKQEAgLTM2MCw2ICszNjAsMTEgQEAgVGltZVNlcmllcy5w cm90b3R5cGUuZmluZFBvaW50QnlNZWFzdXJlbQogICAgIHJldHVybiB0aGlzLl9zZXJpZXMuZmlu ZChmdW5jdGlvbiAocG9pbnQpIHsgcmV0dXJuIHBvaW50Lm1lYXN1cmVtZW50LmlkKCkgPT0gbWVh c3VyZW1lbnRJZDsgfSk7CiB9CiAKK1RpbWVTZXJpZXMucHJvdG90eXBlLmZpbmRQb2ludEFmdGVy VGltZSA9IGZ1bmN0aW9uICh0aW1lKQoreworICAgIHJldHVybiB0aGlzLl9zZXJpZXMuZmluZChm dW5jdGlvbiAocG9pbnQpIHsgcmV0dXJuIHBvaW50LnRpbWUgPj0gdGltZTsgfSk7Cit9CisKIFRp bWVTZXJpZXMucHJvdG90eXBlLnNlcmllc0JldHdlZW5Qb2ludHMgPSBmdW5jdGlvbiAoc3RhcnRQ b2ludCwgZW5kUG9pbnQpCiB7CiAgICAgaWYgKCFzdGFydFBvaW50LnNlcmllc0luZGV4IHx8ICFl bmRQb2ludC5zZXJpZXNJbmRleCkKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJs aWMvdjIvaW5kZXguaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv cHVibGljL3YyL2luZGV4Lmh0bWwJKHJldmlzaW9uIDE3OTY2MSkKKysrIFdlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9wdWJsaWMvdjIvaW5kZXguaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMjU0LDEw ICsyNTQsMjEgQEAKICAgICAgICAgICAgICAgICB7ey9pZn19CiAgICAgICAgICAgICB7ey9lYWNo fX0KICAgICAgICAgICAgIDwvdGJvZHk+Ci0gICAgICAgICAgICA8dHI+PHRoPkN1cnJlbnQ8L3Ro Pjx0ZD57e2RldGFpbHMuY3VycmVudFZhbHVlfX0ge3tjaGFydERhdGEudW5pdH19Ci0gICAgICAg ICAgICB7eyNpZiBkZXRhaWxzLm9sZFZhbHVlfX0KLSAgICAgICAgICAgICAgICAoZnJvbSB7e2Rl dGFpbHMub2xkVmFsdWV9fSkKLSAgICAgICAgICAgIHt7L2lmfX08L3RkPjwvdHI+CisgICAgICAg ICAgICA8dGJvZHkgY2xhc3M9InN0YXR1cyI+CisgICAgICAgICAgICAgICAgPHRyPgorICAgICAg ICAgICAgICAgICAgICA8dGg+Q3VycmVudDwvdGg+CisgICAgICAgICAgICAgICAgICAgIDx0ZD4K KyAgICAgICAgICAgICAgICAgICAgICAgIHt7ZGV0YWlscy5jdXJyZW50VmFsdWV9fSB7e2NoYXJ0 RGF0YS51bml0fX0KKyAgICAgICAgICAgICAgICAgICAgICAgIHt7I2lmIGRldGFpbHMub2xkVmFs dWV9fQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmcm9tIHt7ZGV0YWlscy5vbGRWYWx1 ZX19IHt7Y2hhcnREYXRhLnVuaXR9fSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHt7L2lmfX0K KyAgICAgICAgICAgICAgICAgICAgICAgIHt7I2lmIGRldGFpbHMuc3RhdHVzLmxhYmVsfX0KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICA8YnI+CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPHNwYW4ge3tiaW5kLWF0dHIgY2xhc3M9ZGV0YWlscy5zdGF0dXMuY2xhc3NOYW1lfX0+e3tk ZXRhaWxzLnN0YXR1cy5sYWJlbH19PC9zcGFuPgorICAgICAgICAgICAgICAgICAgICAgICAge3sv aWZ9fQorICAgICAgICAgICAgICAgICAgICA8L3RkPgorICAgICAgICAgICAgICAgIDwvdHI+Cisg ICAgICAgICAgICA8L3Rib2R5PgogICAgICAgICAgICAge3sjaWYgZGV0YWlscy5idWlsZE51bWJl cn19CiAgICAgICAgICAgICAgICAgPHRyPgogICAgICAgICAgICAgICAgICAgICA8dGg+QnVpbGQ8 L3RoPgpJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9pbnRlcmFjdGl2 ZS1jaGFydC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YyL2ludGVyYWN0aXZlLWNoYXJ0LmpzCShyZXZpc2lvbiAxNzk2NjApCisrKyBXZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2ludGVyYWN0aXZlLWNoYXJ0LmpzCSh3b3JraW5nIGNv cHkpCkBAIC02Niw4ICs2Niw3IEBAIEFwcC5JbnRlcmFjdGl2ZUNoYXJ0Q29tcG9uZW50ID0gRW1i ZXIuQ28KICAgICAgICAgfQogCiAgICAgICAgIGlmICh0aGlzLmdldCgnc2hvd1lBeGlzJykpIHsK LSAgICAgICAgICAgIHRoaXMuX3lBeGlzID0gZDMuc3ZnLmF4aXMoKS5zY2FsZSh0aGlzLl95KS5v cmllbnQoImxlZnQiKS50aWNrcyg2KS50aWNrRm9ybWF0KAotICAgICAgICAgICAgICAgIGNoYXJ0 RGF0YS51c2VTSSA/IGQzLmZvcm1hdCgicyIpIDogZDMuZm9ybWF0KCIuM2ciKSk7CisgICAgICAg ICAgICB0aGlzLl95QXhpcyA9IGQzLnN2Zy5heGlzKCkuc2NhbGUodGhpcy5feSkub3JpZW50KCJs ZWZ0IikudGlja3MoNikudGlja0Zvcm1hdChjaGFydERhdGEuZm9ybWF0dGVyKTsKICAgICAgICAg ICAgIHRoaXMuX3lBeGlzTGFiZWxzID0gc3ZnLmFwcGVuZCgiZyIpCiAgICAgICAgICAgICAgICAg LmF0dHIoImNsYXNzIiwgInkgYXhpcyIpOwogICAgICAgICB9CkBAIC0xMDAsMzEgKzk5LDI0IEBA IEFwcC5JbnRlcmFjdGl2ZUNoYXJ0Q29tcG9uZW50ID0gRW1iZXIuQ28KICAgICAgICAgICAgIHRo aXMuX2hpZ2hsaWdodHMucmVtb3ZlKCk7CiAgICAgICAgIHRoaXMuX2hpZ2hsaWdodHMgPSBudWxs OwogCi0gICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lU2VyaWVzID0gY2hhcnREYXRhLmN1cnJlbnQu dGltZVNlcmllc0J5Q29tbWl0VGltZSgpOworICAgICAgICB0aGlzLl9jdXJyZW50VGltZVNlcmll cyA9IGNoYXJ0RGF0YS5jdXJyZW50OwogICAgICAgICB0aGlzLl9jdXJyZW50VGltZVNlcmllc0Rh dGEgPSB0aGlzLl9jdXJyZW50VGltZVNlcmllcy5zZXJpZXMoKTsKLSAgICAgICAgdGhpcy5fYmFz ZWxpbmVUaW1lU2VyaWVzID0gY2hhcnREYXRhLmJhc2VsaW5lID8gY2hhcnREYXRhLmJhc2VsaW5l LnRpbWVTZXJpZXNCeUNvbW1pdFRpbWUoKSA6IG51bGw7Ci0gICAgICAgIHRoaXMuX3RhcmdldFRp bWVTZXJpZXMgPSBjaGFydERhdGEudGFyZ2V0ID8gY2hhcnREYXRhLnRhcmdldC50aW1lU2VyaWVz QnlDb21taXRUaW1lKCkgOiBudWxsOworICAgICAgICB0aGlzLl9iYXNlbGluZVRpbWVTZXJpZXMg PSBjaGFydERhdGEuYmFzZWxpbmU7CisgICAgICAgIHRoaXMuX3RhcmdldFRpbWVTZXJpZXMgPSBj aGFydERhdGEudGFyZ2V0OwogCiAgICAgICAgIHRoaXMuX3lBeGlzVW5pdCA9IGNoYXJ0RGF0YS51 bml0OwogCi0gICAgICAgIHZhciBtaW5NYXggPSB0aGlzLl9taW5NYXhGb3JBbGxUaW1lU2VyaWVz KCk7Ci0gICAgICAgIHZhciBzbWFsbEVub3VnaFZhbHVlID0gbWluTWF4WzBdIC0gKG1pbk1heFsx XSAtIG1pbk1heFswXSkgKiAxMDsKLSAgICAgICAgdmFyIGxhcmdlRW5vdWdoVmFsdWUgPSBtaW5N YXhbMV0gKyAobWluTWF4WzFdIC0gbWluTWF4WzBdKSAqIDEwOwotCi0gICAgICAgIC8vIEZJWE1F OiBGbGlwIHRoZSBzaWRlcyBiYXNlZCBvbiBzbWFsbGVySXNCZXR0ZXItbmVzcy4KICAgICAgICAg aWYgKHRoaXMuX2Jhc2VsaW5lVGltZVNlcmllcykgewotICAgICAgICAgICAgdmFyIGRhdGEgPSB0 aGlzLl9iYXNlbGluZVRpbWVTZXJpZXMuc2VyaWVzKCk7Ci0gICAgICAgICAgICB0aGlzLl9hcmVh cy5wdXNoKHRoaXMuX2NsaXBwZWRDb250YWluZXIKKyAgICAgICAgICAgIHRoaXMuX3BhdGhzLnB1 c2godGhpcy5fY2xpcHBlZENvbnRhaW5lcgogICAgICAgICAgICAgICAgIC5hcHBlbmQoInBhdGgi KQotICAgICAgICAgICAgICAgIC5kYXR1bShkYXRhLm1hcChmdW5jdGlvbiAocG9pbnQpIHsgcmV0 dXJuIHt0aW1lOiBwb2ludC50aW1lLCB2YWx1ZTogcG9pbnQudmFsdWUsIGludGVydmFsOiBwb2lu dC5pbnRlcnZhbCA/IHBvaW50LmludGVydmFsIDogW3BvaW50LnZhbHVlLCBsYXJnZUVub3VnaFZh bHVlXX07IH0pKQotICAgICAgICAgICAgICAgIC5hdHRyKCJjbGFzcyIsICJhcmVhIGJhc2VsaW5l IikpOworICAgICAgICAgICAgICAgIC5kYXR1bSh0aGlzLl9iYXNlbGluZVRpbWVTZXJpZXMuc2Vy aWVzKCkpCisgICAgICAgICAgICAgICAgLmF0dHIoImNsYXNzIiwgImJhc2VsaW5lIikpOwogICAg ICAgICB9CiAgICAgICAgIGlmICh0aGlzLl90YXJnZXRUaW1lU2VyaWVzKSB7Ci0gICAgICAgICAg ICB2YXIgZGF0YSA9IHRoaXMuX3RhcmdldFRpbWVTZXJpZXMuc2VyaWVzKCk7Ci0gICAgICAgICAg ICB0aGlzLl9hcmVhcy5wdXNoKHRoaXMuX2NsaXBwZWRDb250YWluZXIKKyAgICAgICAgICAgIHRo aXMuX3BhdGhzLnB1c2godGhpcy5fY2xpcHBlZENvbnRhaW5lcgogICAgICAgICAgICAgICAgIC5h cHBlbmQoInBhdGgiKQotICAgICAgICAgICAgICAgIC5kYXR1bShkYXRhLm1hcChmdW5jdGlvbiAo cG9pbnQpIHsgcmV0dXJuIHt0aW1lOiBwb2ludC50aW1lLCB2YWx1ZTogcG9pbnQudmFsdWUsIGlu dGVydmFsOiBwb2ludC5pbnRlcnZhbCA/IHBvaW50LmludGVydmFsIDogW3NtYWxsRW5vdWdoVmFs dWUsIHBvaW50LnZhbHVlXX07IH0pKQotICAgICAgICAgICAgICAgIC5hdHRyKCJjbGFzcyIsICJh cmVhIHRhcmdldCIpKTsKKyAgICAgICAgICAgICAgICAuZGF0dW0odGhpcy5fdGFyZ2V0VGltZVNl cmllcy5zZXJpZXMoKSkKKyAgICAgICAgICAgICAgICAuYXR0cigiY2xhc3MiLCAidGFyZ2V0Iikp OwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fYXJlYXMucHVzaCh0aGlzLl9jbGlwcGVkQ29u dGFpbmVyCkBAIC0xMzUsNyArMTI3LDcgQEAgQXBwLkludGVyYWN0aXZlQ2hhcnRDb21wb25lbnQg PSBFbWJlci5DbwogICAgICAgICB0aGlzLl9wYXRocy5wdXNoKHRoaXMuX2NsaXBwZWRDb250YWlu ZXIKICAgICAgICAgICAgIC5hcHBlbmQoInBhdGgiKQogICAgICAgICAgICAgLmRhdHVtKHRoaXMu X2N1cnJlbnRUaW1lU2VyaWVzRGF0YSkKLSAgICAgICAgICAgIC5hdHRyKCJjbGFzcyIsICJjb21t aXQtdGltZS1saW5lIikpOworICAgICAgICAgICAgLmF0dHIoImNsYXNzIiwgImN1cnJlbnQiKSk7 CiAKICAgICAgICAgdGhpcy5fZG90cy5wdXNoKHRoaXMuX2NsaXBwZWRDb250YWluZXIKICAgICAg ICAgICAgIC5zZWxlY3RBbGwoIi5kb3QiKQpJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3B1YmxpYy92Mi9tYW5pZmVzdC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtp dC5vcmcvcHVibGljL3YyL21hbmlmZXN0LmpzCShyZXZpc2lvbiAxNzk2NjApCisrKyBXZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL21hbmlmZXN0LmpzCSh3b3JraW5nIGNvcHkpCkBA IC0yODEsMTIgKzI4MSw5IEBAIEFwcC5NYW5pZmVzdCA9IEVtYmVyLkNvbnRyb2xsZXIuZXh0ZW5k KHsKICAgICAgICAgICAgICAgICAnSGVhcCc6ICdieXRlcycsCiAgICAgICAgICAgICAgICAgJ0Fs bG9jYXRpb25zJzogJ2J5dGVzJwogICAgICAgICAgICAgfVtzdWZmaXhdOworICAgICAgICAgICAg dmFyIHNtYWxsZXJJc0JldHRlciA9IHVuaXQgIT0gJ2ZwcycgJiYgdW5pdCAhPSAnL3MnOyAvLyBB c3N1bWUgc21hbGxlciBpcyBiZXR0ZXIgZm9yIHVuaXQtbGVzcyBtZXRyaWNzLgogCi0gICAgICAg ICAgICAvLyBGSVhNRTogSW5jbHVkZSB0aGlzIGluZm9ybWF0aW9uIGluIEpTT04gYW5kIHByb2Nl c3MgaXQgaW4gUnVuc0RhdGEuZmV0Y2hSdW5zCi0gICAgICAgICAgICBydW5zLnVuaXQgPSB1bml0 OwotICAgICAgICAgICAgcnVucy51c2VTSSA9IHVuaXQgPT0gJ2J5dGVzJzsKLQotICAgICAgICAg ICAgcmV0dXJuIHtwbGF0Zm9ybTogcGxhdGZvcm0sIG1ldHJpYzogbWV0cmljLCBydW5zOiBydW5z fTsKKyAgICAgICAgICAgIHJldHVybiB7cGxhdGZvcm06IHBsYXRmb3JtLCBtZXRyaWM6IG1ldHJp YywgcnVuczogcnVucywgdW5pdDogdW5pdCwgdXNlU0k6IHVuaXQgPT0gJ2J5dGVzJywgc21hbGxl cklzQmV0dGVyOiBzbWFsbGVySXNCZXR0ZXJ9OwogICAgICAgICB9KTsKICAgICB9LAogfSkuY3Jl YXRlKCk7Cg==