193563 2019-01-17 22:00:38 -0800 Analyzing a chart that does not exist should not halt whole run-analysis script. 2019-01-22 20:30:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu dewei_zhu dewei_zhu rniwa oldest_to_newest 1495737 0 dewei_zhu 2019-01-17 22:00:38 -0800 Analyzing a chart that does not exist should not halt whole run-analysis script. 1495739 1 359449 dewei_zhu 2019-01-17 22:05:29 -0800 Created attachment 359449 Patch 1496174 2 359449 rniwa 2019-01-18 20:31:02 -0800 Comment on attachment 359449 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359449&action=review > Websites/perf.webkit.org/ChangeLog:17 > + (async.set requests): > + (async): Remove these? > Websites/perf.webkit.org/tools/js/measurement-set-analyzer.js:55 > + } catch (error) { > + this._logger.warn(`Skipping analysis for "${metric.fullName()}" on "${platform.name()}" as time series does not exit.`); Please check/assert for a specific error instead of swallowing any exception. 1496207 3 359598 dewei_zhu 2019-01-19 00:58:26 -0800 Created attachment 359598 Patch 1497163 4 359598 rniwa 2019-01-22 19:24:25 -0800 Comment on attachment 359598 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359598&action=review > Websites/perf.webkit.org/public/v3/models/measurement-set.js:86 > + if (promise && callback) { > promise.then(callback, callback); > - else { > + } else if (!promise) { It would be cleaner to nest if's as in: if (promise) { if (callback) ~ } else { ~ } 1497192 5 dewei_zhu 2019-01-22 20:30:13 -0800 Landed in r240319. 359449 2019-01-17 22:05:29 -0800 2019-01-19 00:58:25 -0800 Patch bug-193563-20190117220528.patch text/plain 5188 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTM2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA0MTU2YzEwZjA3ODJkYTY3Zjc5MTQ4NmU2ODQ2YjEyZDExNDAyMmJjLi45MDhjYWFmYTU4 NTFhM2Y4MDY5MDYxMzNiYzkxYjExM2RkMWJjMWQ1IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxOS0wMS0xNyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBBbmFseXppbmcgYSBjaGFydCB0aGF0IGRvZXMgbm90IGV4 aXN0IHNob3VsZCBub3QgaGFsdCB3aG9sZSBydW4tYW5hbHlzaXMgc2NyaXB0LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNTYzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGFsdGluZyB3aG9sZSBydW4t YW5hbHlzaXMgc2NyaXB0IHdoaWxlIHRoZXJlIGlzIGFueSBpbnZhbGlkIGNoYXJ0IHNwZWNpZmll ZCBpbiBNYW5pZmVzdCBtYWtlcyB0aGUgc2NyaXB0IGZyYWdpbGUuCisgICAgICAgIFJ1bi1hbmFs eXNpcyBpcyBhbHNvIHJlc3BvbnNpYmxlIGZvciBhZGRpbmcgcmV0cnkgYW5kIHNlbmRpbmcgbm90 aWZpY2F0aW9uIHdoaWNoIHNob3VsZCBub3QgYmUgYmxvY2sgYnkgdGhpcyBlcnJvci4KKyAgICAg ICAgU2tpcHBpbmcgYW5hbHl6aW5nIHRoZSBjb3JyZXNwb25kaW5nIGNvbmZpZ3VyYXRpb24gc2Vl bXMgcmVhc29uYWJsZS4KKworICAgICAgICAqIHRvb2xzL2pzL21lYXN1cmVtZW50LXNldC1hbmFs eXplci5qczoKKyAgICAgICAgKE1lYXN1cmVtZW50U2V0QW5hbHl6ZXIucHJvdG90eXBlLmFzeW5j Ll9hbmFseXplTWVhc3VyZW1lbnRTZXQpOiBDYXRjaCB0aGUgZXhjZXB0aW9uIHdoaWxlIGZhaWxp bmcgdG8gZmV0Y2ggYSBtZWFzdXJlbWVudCBzZXQgYW5kIHNraXAgdGhlIGFuYWx5c2lzIGZvciB0 aGlzIGNvbmZpZy4KKyAgICAgICAgKiB1bml0LXRlc3RzL21lYXN1cmVtZW50LXNldC1hbmFseXpl ci10ZXN0cy5qczogQWRkZWQgYSB1bml0IHRlc3QgZm9yIHRoaXMuCisgICAgICAgIChtb2NrTG9n Z2VyKToKKyAgICAgICAgKGFzeW5jLnNldCByZXF1ZXN0cyk6CisgICAgICAgIChhc3luYyk6CisK IDIwMTgtMTItMjEgIERld2VpIFpodSAgPGRld2VpX3podUBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIFVJIGluIGFuYWx5c2lzIHRhc2sgcGFnZSB0byBzaG93IGNvbW1pdCB0ZXN0YWJpbGl0eSBp bmZvcm1hdGlvbi4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9q cy9tZWFzdXJlbWVudC1zZXQtYW5hbHl6ZXIuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv dG9vbHMvanMvbWVhc3VyZW1lbnQtc2V0LWFuYWx5emVyLmpzCmluZGV4IGFlM2EyYzRjYmQwMGYx NGJkMjJmMmVkM2ZmNzE2OTVmZDM1YjIzNWQuLmI0MzY0Y2VlYzUxZjBiNzk5NTAzOGFhNzIyODM5 NjBiNzJjZjcyN2EgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9q cy9tZWFzdXJlbWVudC1zZXQtYW5hbHl6ZXIuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3Rvb2xzL2pzL21lYXN1cmVtZW50LXNldC1hbmFseXplci5qcwpAQCAtNDksNyArNDksMTIg QEAgY2xhc3MgTWVhc3VyZW1lbnRTZXRBbmFseXplciB7CiAgICAgICAgIGNvbnN0IG1ldHJpYyA9 IE1ldHJpYy5maW5kQnlJZChtZWFzdXJlbWVudFNldC5tZXRyaWNJZCgpKTsKICAgICAgICAgY29u c3QgcGxhdGZvcm0gPSBQbGF0Zm9ybS5maW5kQnlJZChtZWFzdXJlbWVudFNldC5wbGF0Zm9ybUlk KCkpOwogICAgICAgICB0aGlzLl9sb2dnZXIuaW5mbyhgPT09PSAiJHttZXRyaWMuZnVsbE5hbWUo KX0iIG9uICIke3BsYXRmb3JtLm5hbWUoKX0iID09PT1gKTsKLSAgICAgICAgYXdhaXQgbWVhc3Vy ZW1lbnRTZXQuZmV0Y2hCZXR3ZWVuKHRoaXMuX3N0YXJ0VGltZSwgdGhpcy5fZW5kVGltZSk7Cisg ICAgICAgIHRyeSB7CisgICAgICAgICAgICBhd2FpdCBtZWFzdXJlbWVudFNldC5mZXRjaEJldHdl ZW4odGhpcy5fc3RhcnRUaW1lLCB0aGlzLl9lbmRUaW1lKTsKKyAgICAgICAgfSBjYXRjaCAoZXJy b3IpIHsKKyAgICAgICAgICAgIHRoaXMuX2xvZ2dlci53YXJuKGBTa2lwcGluZyBhbmFseXNpcyBm b3IgIiR7bWV0cmljLmZ1bGxOYW1lKCl9IiBvbiAiJHtwbGF0Zm9ybS5uYW1lKCl9IiBhcyB0aW1l IHNlcmllcyBkb2VzIG5vdCBleGl0LmApOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9 CiAgICAgICAgIGNvbnN0IGN1cnJlbnRUaW1lU2VyaWVzID0gbWVhc3VyZW1lbnRTZXQuZmV0Y2hl ZFRpbWVTZXJpZXMoJ2N1cnJlbnQnLCBmYWxzZSwgZmFsc2UpOwogICAgICAgICBjb25zdCByYXdW YWx1ZXMgPSBjdXJyZW50VGltZVNlcmllcy52YWx1ZXMoKTsKICAgICAgICAgaWYgKCFyYXdWYWx1 ZXMgfHwgcmF3VmFsdWVzLmxlbmd0aCA8IDIpCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvdW5pdC10ZXN0cy9tZWFzdXJlbWVudC1zZXQtYW5hbHl6ZXItdGVzdHMuanMgYi9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9tZWFzdXJlbWVudC1zZXQtYW5hbHl6 ZXItdGVzdHMuanMKaW5kZXggMWYyMTQ5MWM1NTllZWE5MTI4Njk0YmUyMTM0Y2I4MTZiYmJhNjAz ZS4uODBiN2JkMzliMmEwYjM3NzQ4M2NkYTVmZmNiNDNjYjI3YjNlMjZhZSAxMDA2NDQKLS0tIGEv V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvbWVhc3VyZW1lbnQtc2V0LWFuYWx5 emVyLXRlc3RzLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL21l YXN1cmVtZW50LXNldC1hbmFseXplci10ZXN0cy5qcwpAQCAtMzUsMTAgKzM1LDEyIEBAIGRlc2Ny aWJlKCdNZWFzdXJlbWVudFNldEFuYWx5emVyJywgKCkgPT4gewogICAgIHsKICAgICAgICAgY29u c3QgaW5mb19sb2dzID0gW107CiAgICAgICAgIGNvbnN0IGVycm9yX2xvZ3MgPVtdOworICAgICAg ICBjb25zdCB3YXJuX2xvZ3MgPVtdOwogICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgaW5m bzogKG1lc3NhZ2UpID0+IGluZm9fbG9ncy5wdXNoKG1lc3NhZ2UpLAorICAgICAgICAgICAgd2Fy bjogKG1lc3NhZ2UpID0+IHdhcm5fbG9ncy5wdXNoKG1lc3NhZ2UpLAogICAgICAgICAgICAgZXJy b3I6IChtZXNzYWdlKSA9PiBlcnJvcl9sb2dzLnB1c2gobWVzc2FnZSksCi0gICAgICAgICAgICBp bmZvX2xvZ3MsIGVycm9yX2xvZ3MKKyAgICAgICAgICAgIGluZm9fbG9ncywgd2Fybl9sb2dzLCBl cnJvcl9sb2dzCiAgICAgICAgIH07CiAgICAgfQogCkBAIC04OSw2ICs5MSwyNSBAQCBkZXNjcmli ZSgnTWVhc3VyZW1lbnRTZXRBbmFseXplcicsICgpID0+IHsKICAgICAgICAgICAgIGFzc2VydC5k ZWVwRXF1YWwobG9nZ2VyLmVycm9yX2xvZ3MsIFtdKTsKICAgICAgICAgfSk7CiAKKyAgICAgICAg aXQoJ3Nob3VsZCBub3QgYW5hbHl6ZSBpZiBubyBjb3JyZXNwb25kaW5nIHRpbWUgc2VyaWVzIGZv ciBhIG1lYXN1cmVtZW50IHNldCcsIGFzeW5jICgpID0+IHsKKyAgICAgICAgICAgIGNvbnN0IG1l YXN1cmVtZW50U2V0ID0gTWVhc3VyZW1lbnRTZXQuZmluZFNldChNb2NrTW9kZWxzLnNvbWVQbGF0 Zm9ybS5pZCgpLCBNb2NrTW9kZWxzLnNvbWVNZXRyaWMuaWQoKSwgNTAwMCk7CisgICAgICAgICAg ICBjb25zdCBsb2dnZXIgPSBtb2NrTG9nZ2VyKCk7CisgICAgICAgICAgICBjb25zdCBtZWFzdXJl bWVudFNldEFuYWx5emVyID0gbmV3IE1lYXN1cmVtZW50U2V0QW5hbHl6ZXIoW21lYXN1cmVtZW50 U2V0XSwgNDAwMCwgNTAwMCwgbG9nZ2VyKTsKKyAgICAgICAgICAgIGNvbnN0IGFuYWx5c2lzUHJv bWlzZSA9IG1lYXN1cmVtZW50U2V0QW5hbHl6ZXIuYW5hbHl6ZU9uY2UobWVhc3VyZW1lbnRTZXQp OworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzLmxlbmd0aCwgMSk7CisgICAgICAg ICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHNbMF0udXJsLCBgL2RhdGEvbWVhc3VyZW1lbnQtc2V0 LSR7TW9ja01vZGVscy5zb21lUGxhdGZvcm0uaWQoKX0tJHtNb2NrTW9kZWxzLnNvbWVNZXRyaWMu aWQoKX0uanNvbmApOworICAgICAgICAgICAgcmVxdWVzdHNbMF0ucmVzb2x2ZSh7InBsYXRmb3Jt IjogTW9ja01vZGVscy5zb21lUGxhdGZvcm0uaWQoKSwibWV0cmljIjogTW9ja01vZGVscy5zb21l TWV0cmljLmlkKCksInN0YXR1cyI6IkNvbmZpZ3VyYXRpb25Ob3RGb3VuZCJ9KTsKKworICAgICAg ICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICBhd2FpdCBhbmFseXNpc1Byb21pc2U7CisgICAg ICAgICAgICB9IGNhdGNoIChlcnJvcikgeworICAgICAgICAgICAgICAgIGFzc2VydChmYWxzZSwg J1Nob3VsZCBub3QgdGhyb3cgYW55IGV4Y2VwdGlvbiBoZXJlJyk7CisgICAgICAgICAgICB9Cisg ICAgICAgICAgICBhc3NlcnQuZGVlcEVxdWFsKGxvZ2dlci5pbmZvX2xvZ3MsIFsnPT09PSAiU29t ZSB0ZXN0IDogU29tZSBtZXRyaWMiIG9uICJTb21lIHBsYXRmb3JtIiA9PT09J10pOworICAgICAg ICAgICAgYXNzZXJ0LmRlZXBFcXVhbChsb2dnZXIud2Fybl9sb2dzLCBbYFNraXBwaW5nIGFuYWx5 c2lzIGZvciAiJHtNb2NrTW9kZWxzLnNvbWVNZXRyaWMuZnVsbE5hbWUoKX0iIG9uICIke01vY2tN b2RlbHMuc29tZVBsYXRmb3JtLm5hbWUoKX0iIGFzIHRpbWUgc2VyaWVzIGRvZXMgbm90IGV4aXQu YF0pOworICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChsb2dnZXIuZXJyb3JfbG9ncywgW10p OworICAgICAgICB9KTsKKwogICAgICAgICBpdCgnc2hvdWxkIG5vdCBhbmFseXplIGlmIHRoZXJl IGlzIG9ubHkgb25lIGRhdGEgcG9pbnQgaW4gdGhlIG1lYXN1cmVtZW50IHNldCcsIGFzeW5jICgp ID0+IHsKICAgICAgICAgICAgIGNvbnN0IG1lYXN1cmVtZW50U2V0ID0gTWVhc3VyZW1lbnRTZXQu ZmluZFNldChNb2NrTW9kZWxzLnNvbWVQbGF0Zm9ybS5pZCgpLCBNb2NrTW9kZWxzLnNvbWVNZXRy aWMuaWQoKSwgNTAwMCk7CiAgICAgICAgICAgICBjb25zdCBsb2dnZXIgPSBtb2NrTG9nZ2VyKCk7 Cg== 359598 2019-01-19 00:58:26 -0800 2019-01-22 19:24:25 -0800 Patch bug-193563-20190119005825.patch text/plain 8576 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTM2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA0MTU2YzEwZjA3ODJkYTY3Zjc5MTQ4NmU2ODQ2YjEyZDExNDAyMmJjLi4wNThiODQyZjdh NTE4YmUxYmRiZjAyNWM2MzYxOTI1OWRmYzFiNjNjIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxOS0wMS0xNyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBBbmFseXppbmcgYSBjaGFydCB0aGF0IGRvZXMgbm90IGV4 aXN0IHNob3VsZCBub3QgaGFsdCB3aG9sZSBydW4tYW5hbHlzaXMgc2NyaXB0LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNTYzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGFsdGluZyB3aG9sZSBydW4t YW5hbHlzaXMgc2NyaXB0IHdoaWxlIHRoZXJlIGlzIGFueSBpbnZhbGlkIGNoYXJ0IHNwZWNpZmll ZCBpbiBNYW5pZmVzdCBtYWtlcyB0aGUgc2NyaXB0IGZyYWdpbGUuCisgICAgICAgIFJ1bi1hbmFs eXNpcyBpcyBhbHNvIHJlc3BvbnNpYmxlIGZvciBhZGRpbmcgcmV0cnkgYW5kIHNlbmRpbmcgbm90 aWZpY2F0aW9uIHdoaWNoIHNob3VsZCBub3QgYmUgYmxvY2sgYnkgdGhpcyBlcnJvci4KKyAgICAg ICAgU2tpcHBpbmcgYW5hbHl6aW5nIHRoZSBjb3JyZXNwb25kaW5nIGNvbmZpZ3VyYXRpb24gc2Vl bXMgcmVhc29uYWJsZS4KKworICAgICAgICAqIHB1YmxpYy92My9tb2RlbHMvbWVhc3VyZW1lbnQt c2V0LmpzOgorICAgICAgICAoTWVhc3VyZW1lbnRTZXQucHJvdG90eXBlLl9lbnN1cmVDbHVzdGVy UHJvbWlzZSk6IE9ubHkgYWRkIGNhbGxiYWNrIHdoZW4gY2FsbGJhY2sgaXMgc3BlY2lmaWVkLgor ICAgICAgICBUaGlzIHdpbGwgaGVscCB0byBmaXggJ1VuaGFuZGxlZFByb21pc2VSZWplY3Rpb25X YXJuaW5nJyB3aGlsZSBydW5uaW5nIHRoZSB0ZXN0LgorICAgICAgICAqIHRvb2xzL2pzL21lYXN1 cmVtZW50LXNldC1hbmFseXplci5qczoKKyAgICAgICAgKE1lYXN1cmVtZW50U2V0QW5hbHl6ZXIu cHJvdG90eXBlLmFzeW5jLl9hbmFseXplTWVhc3VyZW1lbnRTZXQpOiBDYXRjaCB0aGUgZXhjZXB0 aW9uIHdoaWxlIGZhaWxpbmcgdG8gZmV0Y2ggYSBtZWFzdXJlbWVudCBzZXQgYW5kIHNraXAgdGhl IGFuYWx5c2lzIGZvciB0aGlzIGNvbmZpZy4KKyAgICAgICAgKiB1bml0LXRlc3RzL21lYXN1cmVt ZW50LXNldC1hbmFseXplci10ZXN0cy5qczogQWRkZWQgdW5pdCB0ZXN0cyBmb3IgdGhpcy4KKwog MjAxOC0xMi0yMSAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1QGFwcGxlLmNvbT4KIAogICAgICAgICBB ZGQgVUkgaW4gYW5hbHlzaXMgdGFzayBwYWdlIHRvIHNob3cgY29tbWl0IHRlc3RhYmlsaXR5IGlu Zm9ybWF0aW9uLgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92 My9tb2RlbHMvbWVhc3VyZW1lbnQtc2V0LmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1 YmxpYy92My9tb2RlbHMvbWVhc3VyZW1lbnQtc2V0LmpzCmluZGV4IDU3YTI0Y2U3ODZjYTA3NDA5 ZmJjYTgzN2U5NjZkYjM5ODM2YTk1ZmQuLjU3NDM3YzNmNDAwYmZhMGNjMjU1ZmNkYjE1NjlkYjFl YTY4MjIzMDYgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMv bW9kZWxzL21lYXN1cmVtZW50LXNldC5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv cHVibGljL3YzL21vZGVscy9tZWFzdXJlbWVudC1zZXQuanMKQEAgLTYyLDcgKzYyLDggQEAgY2xh c3MgTWVhc3VyZW1lbnRTZXQgewogICAgICAgICBpZiAoIXRoaXMuX3ByaW1hcnlDbHVzdGVyUHJv bWlzZSkKICAgICAgICAgICAgIHRoaXMuX3ByaW1hcnlDbHVzdGVyUHJvbWlzZSA9IHRoaXMuX2Zl dGNoUHJpbWFyeUNsdXN0ZXIobm9DYWNoZSk7CiAgICAgICAgIHZhciBzZWxmID0gdGhpczsKLSAg ICAgICAgdGhpcy5fcHJpbWFyeUNsdXN0ZXJQcm9taXNlLmNhdGNoKGNhbGxiYWNrKTsKKyAgICAg ICAgaWYgKGNhbGxiYWNrKQorICAgICAgICAgICAgdGhpcy5fcHJpbWFyeUNsdXN0ZXJQcm9taXNl LmNhdGNoKGNhbGxiYWNrKTsKICAgICAgICAgcmV0dXJuIHRoaXMuX3ByaW1hcnlDbHVzdGVyUHJv bWlzZS50aGVuKGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIHNlbGYuX2FsbEZldGNoZXNbc2Vs Zi5fcHJpbWFyeUNsdXN0ZXJFbmRUaW1lXSA9IHNlbGYuX3ByaW1hcnlDbHVzdGVyUHJvbWlzZTsK ICAgICAgICAgICAgIHJldHVybiBQcm9taXNlLmFsbChzZWxmLmZpbmRDbHVzdGVycyhzdGFydFRp bWUsIGVuZFRpbWUpLm1hcChmdW5jdGlvbiAoY2x1c3RlckVuZFRpbWUpIHsKQEAgLTc2LDEyICs3 NywxMyBAQCBjbGFzcyBNZWFzdXJlbWVudFNldCB7CiAgICAgICAgIGlmICghdGhpcy5fY2FsbGJh Y2tNYXAuaGFzKGNsdXN0ZXJFbmRUaW1lKSkKICAgICAgICAgICAgIHRoaXMuX2NhbGxiYWNrTWFw LnNldChjbHVzdGVyRW5kVGltZSwgbmV3IFNldCk7CiAgICAgICAgIHZhciBjYWxsYmFja1NldCA9 IHRoaXMuX2NhbGxiYWNrTWFwLmdldChjbHVzdGVyRW5kVGltZSk7Ci0gICAgICAgIGNhbGxiYWNr U2V0LmFkZChjYWxsYmFjayk7CisgICAgICAgIGlmIChjYWxsYmFjaykKKyAgICAgICAgICAgIGNh bGxiYWNrU2V0LmFkZChjYWxsYmFjayk7CiAKICAgICAgICAgdmFyIHByb21pc2UgPSB0aGlzLl9h bGxGZXRjaGVzW2NsdXN0ZXJFbmRUaW1lXTsKLSAgICAgICAgaWYgKHByb21pc2UpCisgICAgICAg IGlmIChwcm9taXNlICYmIGNhbGxiYWNrKSB7CiAgICAgICAgICAgICBwcm9taXNlLnRoZW4oY2Fs bGJhY2ssIGNhbGxiYWNrKTsKLSAgICAgICAgZWxzZSB7CisgICAgICAgIH0gZWxzZSBpZiAoIXBy b21pc2UpIHsKICAgICAgICAgICAgIHByb21pc2UgPSB0aGlzLl9mZXRjaFNlY29uZGFyeUNsdXN0 ZXIoY2x1c3RlckVuZFRpbWUpOwogICAgICAgICAgICAgZm9yICh2YXIgZXhpc3RpbmdDYWxsYmFj ayBvZiBjYWxsYmFja1NldCkKICAgICAgICAgICAgICAgICBwcm9taXNlLnRoZW4oZXhpc3RpbmdD YWxsYmFjaywgZXhpc3RpbmdDYWxsYmFjayk7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvdG9vbHMvanMvbWVhc3VyZW1lbnQtc2V0LWFuYWx5emVyLmpzIGIvV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL21lYXN1cmVtZW50LXNldC1hbmFseXplci5qcwppbmRl eCBhZTNhMmM0Y2JkMDBmMTRiZDIyZjJlZDNmZjcxNjk1ZmQzNWIyMzVkLi5hYjg2YTFkNGUzMzc5 NGJlNzhjZmJiZTBmNzY1OTllYTg1N2JlYmFmIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvdG9vbHMvanMvbWVhc3VyZW1lbnQtc2V0LWFuYWx5emVyLmpzCisrKyBiL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9qcy9tZWFzdXJlbWVudC1zZXQtYW5hbHl6ZXIuanMK QEAgLTQ5LDcgKzQ5LDE0IEBAIGNsYXNzIE1lYXN1cmVtZW50U2V0QW5hbHl6ZXIgewogICAgICAg ICBjb25zdCBtZXRyaWMgPSBNZXRyaWMuZmluZEJ5SWQobWVhc3VyZW1lbnRTZXQubWV0cmljSWQo KSk7CiAgICAgICAgIGNvbnN0IHBsYXRmb3JtID0gUGxhdGZvcm0uZmluZEJ5SWQobWVhc3VyZW1l bnRTZXQucGxhdGZvcm1JZCgpKTsKICAgICAgICAgdGhpcy5fbG9nZ2VyLmluZm8oYD09PT0gIiR7 bWV0cmljLmZ1bGxOYW1lKCl9IiBvbiAiJHtwbGF0Zm9ybS5uYW1lKCl9IiA9PT09YCk7Ci0gICAg ICAgIGF3YWl0IG1lYXN1cmVtZW50U2V0LmZldGNoQmV0d2Vlbih0aGlzLl9zdGFydFRpbWUsIHRo aXMuX2VuZFRpbWUpOworICAgICAgICB0cnkgeworICAgICAgICAgICAgYXdhaXQgbWVhc3VyZW1l bnRTZXQuZmV0Y2hCZXR3ZWVuKHRoaXMuX3N0YXJ0VGltZSwgdGhpcy5fZW5kVGltZSk7CisgICAg ICAgIH0gY2F0Y2ggKGVycm9yKSB7CisgICAgICAgICAgICBpZiAoZXJyb3IgIT0gJ0NvbmZpZ3Vy YXRpb25Ob3RGb3VuZCcpCisgICAgICAgICAgICAgICAgdGhyb3cgZXJyb3I7CisgICAgICAgICAg ICB0aGlzLl9sb2dnZXIud2FybihgU2tpcHBpbmcgYW5hbHlzaXMgZm9yICIke21ldHJpYy5mdWxs TmFtZSgpfSIgb24gIiR7cGxhdGZvcm0ubmFtZSgpfSIgYXMgdGltZSBzZXJpZXMgZG9lcyBub3Qg ZXhpdC5gKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogICAgICAgICBjb25zdCBj dXJyZW50VGltZVNlcmllcyA9IG1lYXN1cmVtZW50U2V0LmZldGNoZWRUaW1lU2VyaWVzKCdjdXJy ZW50JywgZmFsc2UsIGZhbHNlKTsKICAgICAgICAgY29uc3QgcmF3VmFsdWVzID0gY3VycmVudFRp bWVTZXJpZXMudmFsdWVzKCk7CiAgICAgICAgIGlmICghcmF3VmFsdWVzIHx8IHJhd1ZhbHVlcy5s ZW5ndGggPCAyKQpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVz dHMvbWVhc3VyZW1lbnQtc2V0LWFuYWx5emVyLXRlc3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3VuaXQtdGVzdHMvbWVhc3VyZW1lbnQtc2V0LWFuYWx5emVyLXRlc3RzLmpzCmluZGV4 IDFmMjE0OTFjNTU5ZWVhOTEyODY5NGJlMjEzNGNiODE2YmJiYTYwM2UuLjdhYmVhZTJiYTNiZTQ2 MGEyMmVlN2Y3NWYxYzgzOGZhZTIwNTAwMmUgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy91bml0LXRlc3RzL21lYXN1cmVtZW50LXNldC1hbmFseXplci10ZXN0cy5qcworKysg Yi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9tZWFzdXJlbWVudC1zZXQtYW5h bHl6ZXItdGVzdHMuanMKQEAgLTM1LDEwICszNSwxMiBAQCBkZXNjcmliZSgnTWVhc3VyZW1lbnRT ZXRBbmFseXplcicsICgpID0+IHsKICAgICB7CiAgICAgICAgIGNvbnN0IGluZm9fbG9ncyA9IFtd OwogICAgICAgICBjb25zdCBlcnJvcl9sb2dzID1bXTsKKyAgICAgICAgY29uc3Qgd2Fybl9sb2dz ID1bXTsKICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIGluZm86IChtZXNzYWdlKSA9PiBp bmZvX2xvZ3MucHVzaChtZXNzYWdlKSwKKyAgICAgICAgICAgIHdhcm46IChtZXNzYWdlKSA9PiB3 YXJuX2xvZ3MucHVzaChtZXNzYWdlKSwKICAgICAgICAgICAgIGVycm9yOiAobWVzc2FnZSkgPT4g ZXJyb3JfbG9ncy5wdXNoKG1lc3NhZ2UpLAotICAgICAgICAgICAgaW5mb19sb2dzLCBlcnJvcl9s b2dzCisgICAgICAgICAgICBpbmZvX2xvZ3MsIHdhcm5fbG9ncywgZXJyb3JfbG9ncwogICAgICAg ICB9OwogICAgIH0KIApAQCAtODksNiArOTEsNDQgQEAgZGVzY3JpYmUoJ01lYXN1cmVtZW50U2V0 QW5hbHl6ZXInLCAoKSA9PiB7CiAgICAgICAgICAgICBhc3NlcnQuZGVlcEVxdWFsKGxvZ2dlci5l cnJvcl9sb2dzLCBbXSk7CiAgICAgICAgIH0pOwogCisgICAgICAgIGl0KCdzaG91bGQgbm90IGFu YWx5emUgaWYgbm8gY29ycmVzcG9uZGluZyB0aW1lIHNlcmllcyBmb3IgYSBtZWFzdXJlbWVudCBz ZXQnLCBhc3luYyAoKSA9PiB7CisgICAgICAgICAgICBjb25zdCBtZWFzdXJlbWVudFNldCA9IE1l YXN1cmVtZW50U2V0LmZpbmRTZXQoTW9ja01vZGVscy5zb21lUGxhdGZvcm0uaWQoKSwgTW9ja01v ZGVscy5zb21lTWV0cmljLmlkKCksIDUwMDApOworICAgICAgICAgICAgY29uc3QgbG9nZ2VyID0g bW9ja0xvZ2dlcigpOworICAgICAgICAgICAgY29uc3QgbWVhc3VyZW1lbnRTZXRBbmFseXplciA9 IG5ldyBNZWFzdXJlbWVudFNldEFuYWx5emVyKFttZWFzdXJlbWVudFNldF0sIDQwMDAsIDUwMDAs IGxvZ2dlcik7CisgICAgICAgICAgICBjb25zdCBhbmFseXNpc1Byb21pc2UgPSBtZWFzdXJlbWVu dFNldEFuYWx5emVyLmFuYWx5emVPbmNlKG1lYXN1cmVtZW50U2V0KTsKKyAgICAgICAgICAgIGFz c2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDEpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KHJlcXVlc3RzWzBdLnVybCwgYC9kYXRhL21lYXN1cmVtZW50LXNldC0ke01vY2tNb2RlbHMuc29t ZVBsYXRmb3JtLmlkKCl9LSR7TW9ja01vZGVscy5zb21lTWV0cmljLmlkKCl9Lmpzb25gKTsKKyAg ICAgICAgICAgIHJlcXVlc3RzWzBdLnJlamVjdCgnQ29uZmlndXJhdGlvbk5vdEZvdW5kJyk7CisK KyAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgICAgYXdhaXQgYW5hbHlzaXNQcm9taXNl OworICAgICAgICAgICAgfSBjYXRjaCAoZXJyb3IpIHsKKyAgICAgICAgICAgICAgICBhc3NlcnQo ZmFsc2UsICdTaG91bGQgbm90IHRocm93IGFueSBleGNlcHRpb24gaGVyZScpOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChsb2dnZXIuaW5mb19sb2dzLCBbJz09 PT0gIlNvbWUgdGVzdCA6IFNvbWUgbWV0cmljIiBvbiAiU29tZSBwbGF0Zm9ybSIgPT09PSddKTsK KyAgICAgICAgICAgIGFzc2VydC5kZWVwRXF1YWwobG9nZ2VyLndhcm5fbG9ncywgW2BTa2lwcGlu ZyBhbmFseXNpcyBmb3IgIiR7TW9ja01vZGVscy5zb21lTWV0cmljLmZ1bGxOYW1lKCl9IiBvbiAi JHtNb2NrTW9kZWxzLnNvbWVQbGF0Zm9ybS5uYW1lKCl9IiBhcyB0aW1lIHNlcmllcyBkb2VzIG5v dCBleGl0LmBdKTsKKyAgICAgICAgICAgIGFzc2VydC5kZWVwRXF1YWwobG9nZ2VyLmVycm9yX2xv Z3MsIFtdKTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgaXQoJ3Nob3VsZCB0aHJvdyBhbiBlcnJv ciBpZiAibWVhc3VyZW1lbnRTZXQuZmV0Y2hCZXR3ZWVuIiBpcyBub3QgZmFpbGVkIGR1ZSB0byAi Q29uZnVndXJhdGlvbk5vdEZvdW5kIicsIGFzeW5jICgpID0+IHsKKyAgICAgICAgICAgIGNvbnN0 IG1lYXN1cmVtZW50U2V0ID0gTWVhc3VyZW1lbnRTZXQuZmluZFNldChNb2NrTW9kZWxzLnNvbWVQ bGF0Zm9ybS5pZCgpLCBNb2NrTW9kZWxzLnNvbWVNZXRyaWMuaWQoKSwgNTAwMCk7CisgICAgICAg ICAgICBjb25zdCBsb2dnZXIgPSBtb2NrTG9nZ2VyKCk7CisgICAgICAgICAgICBjb25zdCBtZWFz dXJlbWVudFNldEFuYWx5emVyID0gbmV3IE1lYXN1cmVtZW50U2V0QW5hbHl6ZXIoW21lYXN1cmVt ZW50U2V0XSwgNDAwMCwgNTAwMCwgbG9nZ2VyKTsKKyAgICAgICAgICAgIGNvbnN0IGFuYWx5c2lz UHJvbWlzZSA9IG1lYXN1cmVtZW50U2V0QW5hbHl6ZXIuYW5hbHl6ZU9uY2UobWVhc3VyZW1lbnRT ZXQpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzLmxlbmd0aCwgMSk7CisgICAg ICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHNbMF0udXJsLCBgL2RhdGEvbWVhc3VyZW1lbnQt c2V0LSR7TW9ja01vZGVscy5zb21lUGxhdGZvcm0uaWQoKX0tJHtNb2NrTW9kZWxzLnNvbWVNZXRy aWMuaWQoKX0uanNvbmApOworICAgICAgICAgICAgcmVxdWVzdHNbMF0ucmVqZWN0KCdTb21lRXJy b3InKTsKKworICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICBhd2FpdCBhbmFseXNp c1Byb21pc2U7CisgICAgICAgICAgICB9IGNhdGNoIChlcnJvcikgeworICAgICAgICAgICAgICAg IGFzc2VydC5lcXVhbChlcnJvciwgJ1NvbWVFcnJvcicpOworICAgICAgICAgICAgfQorICAgICAg ICAgICAgYXNzZXJ0LmRlZXBFcXVhbChsb2dnZXIuaW5mb19sb2dzLCBbJz09PT0gIlNvbWUgdGVz dCA6IFNvbWUgbWV0cmljIiBvbiAiU29tZSBwbGF0Zm9ybSIgPT09PSddKTsKKyAgICAgICAgICAg IGFzc2VydC5kZWVwRXF1YWwobG9nZ2VyLndhcm5fbG9ncywgW10pOworICAgICAgICAgICAgYXNz ZXJ0LmRlZXBFcXVhbChsb2dnZXIuZXJyb3JfbG9ncywgW10pOworICAgICAgICB9KTsKKwogICAg ICAgICBpdCgnc2hvdWxkIG5vdCBhbmFseXplIGlmIHRoZXJlIGlzIG9ubHkgb25lIGRhdGEgcG9p bnQgaW4gdGhlIG1lYXN1cmVtZW50IHNldCcsIGFzeW5jICgpID0+IHsKICAgICAgICAgICAgIGNv bnN0IG1lYXN1cmVtZW50U2V0ID0gTWVhc3VyZW1lbnRTZXQuZmluZFNldChNb2NrTW9kZWxzLnNv bWVQbGF0Zm9ybS5pZCgpLCBNb2NrTW9kZWxzLnNvbWVNZXRyaWMuaWQoKSwgNTAwMCk7CiAgICAg ICAgICAgICBjb25zdCBsb2dnZXIgPSBtb2NrTG9nZ2VyKCk7CkBAIC0yOTcsNyArMzM3LDYgQEAg ZGVzY3JpYmUoJ01lYXN1cmVtZW50U2V0QW5hbHl6ZXInLCAoKSA9PiB7CiAgICAgICAgICAgICBh c3NlcnQuZGVlcEVxdWFsKGxvZ2dlci5lcnJvcl9sb2dzLCBbXSk7CiAgICAgICAgIH0pOwogCi0K ICAgICAgICAgaXQoJ3Nob3VsZCBub3QgY3JlYXRlIGNvbmZpcm1pbmcgQS9CIHRlc3RzIGlmIGEg bmV3IHJlZ3Jlc3Npb24gaXMgZGV0ZWN0ZWQgYnV0IG5vIHRyaWdnZXJhYmxlIGF2YWlsYWJsZScs IGFzeW5jICgpID0+IHsKICAgICAgICAgICAgIFByaXZpbGVnZWRBUEkuY29uZmlndXJlKCd0ZXN0 JywgJ3Bhc3N3b3JkJyk7CiAgICAgICAgICAgICBjb25zdCBtZWFzdXJlbWVudFNldCA9IE1lYXN1 cmVtZW50U2V0LmZpbmRTZXQoTW9ja01vZGVscy5zb21lUGxhdGZvcm0uaWQoKSwgTW9ja01vZGVs cy5zb21lTWV0cmljLmlkKCksIDUwMDApOwo=