141339 2015-02-06 14:36:14 -0800 New perf dashboard should have multiple dashboard pages 2016-02-16 13:52:40 -0800 1 1 1 Unclassified WebKit Perf Dashboard 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 141237 1 rniwa rniwa benjamin cdumez kling rniwa oldest_to_newest 1067426 0 rniwa 2015-02-06 14:36:14 -0800 Support multiple predefined dashboard pages. 1067427 1 246180 rniwa 2015-02-06 14:38:01 -0800 Created attachment 246180 Patch 1067428 2 246180 cdumez 2015-02-06 14:41:32 -0800 Comment on attachment 246180 Patch rs=me 1067430 3 rniwa 2015-02-06 14:43:12 -0800 Committed r179763: <http://trac.webkit.org/changeset/179763> 246180 2015-02-06 14:38:01 -0800 2015-02-06 14:41:32 -0800 Patch bug-141339-20150206143800.patch text/plain 24067 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTc5NzU5KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDYyIEBACisyMDE1LTAyLTA2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIE5ldyBwZXJmIGRhc2hib2FyZCBzaG91bGQgaGF2ZSBtdWx0aXBsZSBkYXNoYm9h cmQgcGFnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0MTMzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZGVkIHRoZSBzdXBwb3J0IGZvciBtdWx0aXBsZSBkYXNoYm9hcmQgcGFnZXMuIEFsc28gYWRk ZWQgdGhlIHN0YXR1cyBvZiB0aGUgbGF0ZXN0IGRhdGEgcG9pbnQuCisgICAgICAgIGUuZy4gIjUl IGJldHRlciB0aGFuIHRhcmdldCIKKworICAgICAgICAqIHB1YmxpYy92Mi9hcHAuY3NzOiBUd2Vh a2VkIHRoZSBzdHlsZXMgdG8gd29yayBhcm91bmQgdGhlIGZhY3QgRW1iZXIuanMgY3JlYXRlcyBl bXB0eSBzY3JpcHQgZWxlbWVudHMuCisgICAgICAgIEFsc28gaGlkIHRoZSBib3JkZXIgbGluZXMg YXJvdW5kIGNoYXJ0cyBvbiB0aGUgZGFzaGJvYXJkIHBhZ2UgZm9yIGEgY2xlYW5lciBsb29rLgor CisgICAgICAgICogcHVibGljL3YyL2FwcC5qczoKKyAgICAgICAgKEFwcC5JbmRleFJvdXRlKTog QWRkZWQuIE5hdmlnYXRlIHRvIC9kYXNoYm9hcmQvPGRlZmF1bHREYXNoYm9hcmROYW1lPiBvbmNl IHRoZSBtYW5pZmVzdC5qc29uIGlzIGxvYWRlZC4KKyAgICAgICAgKEFwcC5JbmRleFJvdXRlLmJl Zm9yZU1vZGVsKTogQWRkZWQuCisgICAgICAgIChBcHAuRGFzaGJvYXJkUm91dGUpOiBBZGRlZC4K KyAgICAgICAgKEFwcC5EYXNoYm9hcmRSb3V0ZS5tb2RlbCk6IEFkZGVkLiBSZXR1cm4gdGhlIGRh c2hib2FyZCBzcGVjaWZpZWQgYnkgdGhlIG5hbWUuCisgICAgICAgIChBcHAuQ3VzdG9tRGFzaGJv YXJkUm91dGUpOiBBZGRlZC4gVGhpcyByb3V0ZSBpcyB1c2VkIGZvciBhIGN1c3RvbWl6ZWQgZGFz aGJvYXJkIHNwZWNpZmllZCBieSAiZ3JpZCIuCisgICAgICAgIChBcHAuQ3VzdG9tRGFzaGJvYXJk Um91dGUubW9kZWwpOiBDcmVhdGUgYSBkYXNoYm9hcmQgbW9kZWwgZnJvbSAiZ3JpZCIgcXVlcnkg cGFyYW1ldGVyLgorICAgICAgICAoQXBwLkN1c3RvbURhc2hib2FyZFJvdXRlLnJlbmRlclRlbXBs YXRlKTogVXNlIHRoZSBkYXNoYm9hcmQgdGVtcGxhdGUuCisgICAgICAgIChBcHAuRGFzaGJvYXJk Q29udHJvbGxlcik6IFJlbmFtZWQgZnJvbSBBcHAuSW5kZXhDb250cm9sbGVyLgorICAgICAgICAo QXBwLkRhc2hib2FyZENvbnRyb2xsZXIubW9kZWxDaGFuZ2VkKTogUmVuYW1lZCBmcm9tIGdyaWRD aGFuZ2VkLiBSZW1vdmVkIHRoZSBjb2RlIHRvIGRlYWwgd2l0aCAiZ3JpZCIKKyAgICAgICAgYW5k ICJkZWZhdWx0RGFzaGJvYXJkIiBhcyB0aGVzZSBhcmUgdGFrZW4gY2FyZSBvZiBieSBuZXdseSBh ZGRlZCByb3V0ZXJzLgorICAgICAgICAoQXBwLkRhc2hib2FyZENvbnRyb2xsZXIuY29tcHV0ZUdy aWQpOiBSZW5hbWVkIGZyb20gdXBkYXRlR3JpZC4gTm8gbG9uZ2VyIHVwZGF0ZXMgImdyaWQiIHNp bmNlIHRoaXMgaXMKKyAgICAgICAgbm93IGRvbmUgaW4gYWN0aW9ucy50b2dnbGVFZGl0TW9kZS4K KyAgICAgICAgKEFwcC5EYXNoYm9hcmRDb250cm9sbGVyLmFjdGlvbnMudG9nZ2xlRWRpdE1vZGUp OiBOYXZpZ2F0ZSB0byBDdXN0b21EYXNoYm9hcmRSb3V0ZSB3aGVuIHN0YXJ0IGVkaXRpbmcKKyAg ICAgICAgYW4gZXhpc3RpbmcgZGFzaGJvYXJkLgorCisgICAgICAgIChBcHAuUGFuZS5jb21wdXRl U3RhdHVzKTogTW92ZWQgZnJvbSBBcHAuUGFuZUNvbnRyb2xsZXIgc28gdGhhdCB0byBiZSBjYWxs ZWQgaW4gQXBwLlBhbmUubGF0ZXN0U3RhdHVzLgorICAgICAgICBBbHNvIG1vdmVkIHRoZSBjb2Rl IHRvIGNvbXB1dGUgdGhlIGRlbHRhIHdpdGggcmVzcGVjdCB0byB0aGUgcHJldmlvdXMgZGF0YSBw b2ludCBmcm9tIF91cGRhdGVEZXRhaWxzLgorICAgICAgICAoQXBwLlBhbmUuX3JlbGF0aXZlRGlm ZmVyZW50VG9MYXRlclBvaW50SW5UaW1lU2VyaWVzKTogRGl0dG8uCisgICAgICAgIChBcHAuUGFu ZS5sYXRlc3RTdGF0dXMpOiBBZGRlZC4gVXNlZCBieSB0aGUgZGFzaGJvYXJkIHRlbXBsYXRlIHRv IHNob3cgdGhlIHN0YXR1cyBvZiB0aGUgbGF0ZXN0IHJlc3VsdC4KKworICAgICAgICAoQXBwLmNy ZWF0ZUNoYXJ0RGF0YSk6IEFkZGVkIGRlbHRhRm9ybWF0dGVyIHRvIHNob3cgbGVzcyBzaWduaWZp Y2FudCBkaWdpdHMgZm9yIGRpZmZlcmVuY2VzLgorCisgICAgICAgIChBcHAuUGFuZUNvbnRyb2xs ZXIuX3VwZGF0ZURldGFpbHMpOiBVcGRhdGVkIHBlciBjaGFuZ2VzIHRvIGNvbXB1dGVTdGF0dXMu CisKKyAgICAgICAgKiBwdWJsaWMvdjIvY2hhcnQtcGFuZS5jc3M6IEFkZGVkIHN0eWxlIHJ1bGVz IGZvciB0aGUgc3RhdHVzIGxhYmVscyBvbiB0aGUgZGFzaGJvYXJkLgorCisgICAgICAgICogcHVi bGljL3YyL2RhdGEuanM6CisgICAgICAgIChUaW1lU2VyaWVzLnByb3RvdHlwZS5sYXN0UG9pbnQp OiBBZGRlZC4KKworICAgICAgICAqIHB1YmxpYy92Mi9pbmRleC5odG1sOiBQcmVmZXRjaCBtYW5p ZmVzdC5qc29uIGFzIHNvb24gYXMgcG9zc2libGUsIHNob3cgdGhlIGxhdGVzdCBkYXRhIHBvaW50 cycgc3RhdHVzCisgICAgICAgIG9uIHRoZSBkYXNoYm9hcmQsIGFuZCBlbnVtZXJhdGUgYWxsIHBy ZWRlZmluZWQgZGFzaGJvYXJkcy4KKworICAgICAgICAqIHB1YmxpYy92Mi9pbnRlcmFjdGl2ZS1j aGFydC5qczoKKyAgICAgICAgKEFwcC5JbnRlcmFjdGl2ZUNoYXJ0Q29tcG9uZW50Ll9yZWxheW91 dERhdGFBbmRBeGVzKTogU2xpZ2h0bHkgYWRqdXN0IHRoZSBvZmZzZXQgYXQgd2hpY2ggd2Ugc2hv dyB1bml0CisgICAgICAgIGZvciB0aGUgZGFzaGJvYXJkIHBhZ2UuCisKKyAgICAgICAgKiBwdWJs aWMvdjIvbWFuaWZlc3QuanM6CisgICAgICAgIChBcHAuRGFzaGJvYXJkKTogSW5oZXJpdCBmcm9t IEFwcC5OYW1lTGFiZWxNb2RlbCBub3cgdGhhdCBlYWNoIHByZWRlZmluZWQgZGFzaGJvYXJkIGhh cyBhIG5hbWUuCisgICAgICAgIChBcHAuTWV0cmljU2VyaWFsaXplci5ub3JtYWxpemVQYXlsb2Fk KTogUGFyc2UgYWxsIHByZWRlZmluZWQgZGFzaGJvYXJkcyBpbnN0ZWFkIG9mIGEgc2luZ2xlIGRh c2hib2FyZC4KKyAgICAgICAgSURzIGFyZSBnZW5lcmF0ZWQgZm9yIGVhY2ggZGFzaGJvYXJkIGZv ciBmb3J3YXJkIGNvbXBhdGliaWxpdHkuCisgICAgICAgIChBcHAuTWFuaWZlc3QpOgorICAgICAg ICAoQXBwLk1hbmlmZXN0LmRhc2hib2FyZEJ5TmFtZSk6IEFkZGVkLgorICAgICAgICAoQXBwLk1h bmlmZXN0LmRlZmF1bHREYXNoYm9hcmROYW1lKTogQWRkZWQuCisgICAgICAgIChBcHAuTWFuaWZl c3QuX2ZldGNoZWRNYW5pZmVzdCk6IENyZWF0ZSBkYXNoYm9hcmQgbW9kZWwgb2JqZWN0cyBmb3Ig YWxsIHByZWRlZmluZWQgb25lcy4KKwogMjAxNS0wMi0wNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIGNvbW1pdHMgdmlld2VyIHRvIHRoZSBlbmQgb2Yg ZGV0YWlscyB2aWV3CkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2Fw cC5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9h cHAuY3NzCShyZXZpc2lvbiAxNzk3NTgpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVi bGljL3YyL2FwcC5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTIwMSwxMiArMjAxLDEyIEBAIGJvZHkg ewogICAgIG1hcmdpbjogMDsKICAgICBsaW5lLWhlaWdodDogMXJlbTsKIH0KLSNuYXZpZ2F0aW9u IGxpOm5vdCg6bGFzdC1jaGlsZCkgYSB7CisjbmF2aWdhdGlvbiBsaTpub3QoOmxhc3Qtb2YtdHlw ZSkgYSB7CiAgICAgYm9yZGVyLXRvcC1yaWdodC1yYWRpdXM6IDA7CiAgICAgYm9yZGVyLWJvdHRv bS1yaWdodC1yYWRpdXM6IDA7CiAgICAgYm9yZGVyLXJpZ2h0OiAwOwogfQotI25hdmlnYXRpb24g bGk6bm90KDpmaXJzdC1jaGlsZCkgYSB7CisjbmF2aWdhdGlvbiBsaTpub3QoOmZpcnN0LW9mLXR5 cGUpIGEgewogICAgIGJvcmRlci10b3AtbGVmdC1yYWRpdXM6IDA7CiAgICAgYm9yZGVyLWJvdHRv bS1sZWZ0LXJhZGl1czogMDsKIH0KQEAgLTM5Nyw3ICszOTcsNyBAQCB0YWJsZS5kYXNoYm9hcmQg dGJvZHkgdGQgYS5yZXNldCBzdmcgewogfQogCiB0YWJsZS5kYXNoYm9hcmQgdGJvZHkgdGQgLmNo YXJ0IHsKLSAgICBib3JkZXI6IHNvbGlkIDFweCAjZGRkOworICAgIGJvcmRlcjogc29saWQgMHB4 ICNkZGQ7CiAgICAgYm9yZGVyLXJhZGl1czogMC41cmVtOwogICAgIG1hcmdpbjogMC41cmVtIDAu NXJlbTsKIH0KSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvYXBwLmpz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvYXBwLmpz CShyZXZpc2lvbiAxNzk3NTgpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yy L2FwcC5qcwkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDggQEAKIHdpbmRvdy5BcHAgPSBFbWJl ci5BcHBsaWNhdGlvbi5jcmVhdGUoKTsKIAogQXBwLlJvdXRlci5tYXAoZnVuY3Rpb24gKCkgewor ICAgIHRoaXMucmVzb3VyY2UoJ2N1c3RvbURhc2hib2FyZCcsIHtwYXRoOiAnZGFzaGJvYXJkL2N1 c3RvbSd9KTsKKyAgICB0aGlzLnJlc291cmNlKCdkYXNoYm9hcmQnLCB7cGF0aDogJ2Rhc2hib2Fy ZC86bmFtZSd9KTsKICAgICB0aGlzLnJlc291cmNlKCdjaGFydHMnLCB7cGF0aDogJ2NoYXJ0cyd9 KTsKICAgICB0aGlzLnJlc291cmNlKCdhbmFseXNpcycsIHtwYXRoOiAnYW5hbHlzaXMnfSk7CiAg ICAgdGhpcy5yZXNvdXJjZSgnYW5hbHlzaXNUYXNrJywge3BhdGg6ICdhbmFseXNpcy90YXNrLzp0 YXNrSWQnfSk7CkBAIC01NCwyOCArNTYsNDcgQEAgQXBwLkRhc2hib2FyZFBhbmVQcm94eUZvclBp Y2tlciA9IEVtYmVyLgogICAgIH0ucHJvcGVydHkoJ3BsYXRmb3JtSWQnLCAnbWV0cmljSWQnKSwK IH0pOwogCi1BcHAuSW5kZXhDb250cm9sbGVyID0gRW1iZXIuQ29udHJvbGxlci5leHRlbmQoewor QXBwLkluZGV4Um91dGUgPSBFbWJlci5Sb3V0ZS5leHRlbmQoeworICAgIGJlZm9yZU1vZGVsOiBm dW5jdGlvbiAoKQorICAgIHsKKyAgICAgICAgdmFyIHNlbGYgPSB0aGlzOworICAgICAgICBBcHAu TWFuaWZlc3QuZmV0Y2godGhpcy5zdG9yZSkudGhlbihmdW5jdGlvbiAoKSB7CisgICAgICAgICAg ICBzZWxmLnRyYW5zaXRpb25UbygnZGFzaGJvYXJkJywgQXBwLk1hbmlmZXN0LmRlZmF1bHREYXNo Ym9hcmROYW1lKCkpOworICAgICAgICB9KTsKKyAgICB9LAorfSk7CisKK0FwcC5EYXNoYm9hcmRS b3V0ZSA9IEVtYmVyLlJvdXRlLmV4dGVuZCh7CisgICAgbW9kZWw6IGZ1bmN0aW9uIChwYXJhbSkK KyAgICB7CisgICAgICAgIHJldHVybiBBcHAuTWFuaWZlc3QuZmV0Y2godGhpcy5zdG9yZSkudGhl bihmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICByZXR1cm4gQXBwLk1hbmlmZXN0LmRhc2hib2Fy ZEJ5TmFtZShwYXJhbS5uYW1lKTsKKyAgICAgICAgfSk7CisgICAgfSwKK30pOworCitBcHAuQ3Vz dG9tRGFzaGJvYXJkUm91dGUgPSBFbWJlci5Sb3V0ZS5leHRlbmQoeworICAgIGNvbnRyb2xsZXJO YW1lOiAnZGFzaGJvYXJkJywKKyAgICBtb2RlbDogZnVuY3Rpb24gKHBhcmFtKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuc3RvcmUuY3JlYXRlUmVjb3JkKCdkYXNoYm9hcmQnLCB7c2VyaWFs aXplZDogcGFyYW0uZ3JpZH0pOworICAgIH0sCisgICAgcmVuZGVyVGVtcGxhdGU6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIHRoaXMucmVuZGVyKCdkYXNoYm9hcmQnKTsKKyAgICB9Cit9KTsK KworQXBwLkRhc2hib2FyZENvbnRyb2xsZXIgPSBFbWJlci5Db250cm9sbGVyLmV4dGVuZCh7CiAg ICAgcXVlcnlQYXJhbXM6IFsnZ3JpZCcsICdudW1iZXJPZkRheXMnXSwKLSAgICBfcHJldmlvdXNH cmlkOiB7fSwKICAgICBoZWFkZXJDb2x1bW5zOiBbXSwKICAgICByb3dzOiBbXSwKICAgICBudW1i ZXJPZkRheXM6IDcsCiAgICAgZWRpdE1vZGU6IGZhbHNlLAogCi0gICAgZ3JpZENoYW5nZWQ6IGZ1 bmN0aW9uICgpCisgICAgbW9kZWxDaGFuZ2VkOiBmdW5jdGlvbiAoKQogICAgIHsKLSAgICAgICAg dmFyIGdyaWQgPSB0aGlzLmdldCgnZ3JpZCcpOwotICAgICAgICBpZiAoZ3JpZCA9PT0gdGhpcy5f cHJldmlvdXNHcmlkKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHZhciBkYXNoYm9h cmQgPSBudWxsOwotICAgICAgICBpZiAoZ3JpZCkgewotICAgICAgICAgICAgZGFzaGJvYXJkID0g dGhpcy5zdG9yZS5jcmVhdGVSZWNvcmQoJ2Rhc2hib2FyZCcsIHtzZXJpYWxpemVkOiBncmlkfSk7 Ci0gICAgICAgICAgICBpZiAoIWRhc2hib2FyZC5nZXQoJ2hlYWRlckNvbHVtbnMnKS5sZW5ndGgp Ci0gICAgICAgICAgICAgICAgZGFzaGJvYXJkID0gbnVsbDsKLSAgICAgICAgfQotICAgICAgICBp ZiAoIWRhc2hib2FyZCkKLSAgICAgICAgICAgIGRhc2hib2FyZCA9IEFwcC5NYW5pZmVzdC5nZXQo J2RlZmF1bHREYXNoYm9hcmQnKTsKKyAgICAgICAgdmFyIGRhc2hib2FyZCA9IHRoaXMuZ2V0KCdt b2RlbCcpOwogICAgICAgICBpZiAoIWRhc2hib2FyZCkKICAgICAgICAgICAgIHJldHVybjsKIApA QCAtOTUsOSArMTE2LDkgQEAgQXBwLkluZGV4Q29udHJvbGxlciA9IEVtYmVyLkNvbnRyb2xsZXIu ZQogICAgICAgICB9KSk7CiAKICAgICAgICAgdGhpcy5zZXQoJ2VtcHR5Um93JywgbmV3IEFycmF5 KGNvbHVtbkNvdW50KSk7Ci0gICAgfS5vYnNlcnZlcygnZ3JpZCcsICdBcHAuTWFuaWZlc3QuZGVm YXVsdERhc2hib2FyZCcpLm9uKCdpbml0JyksCisgICAgfS5vYnNlcnZlcygnbW9kZWwnKS5vbign aW5pdCcpLAogCi0gICAgdXBkYXRlR3JpZDogZnVuY3Rpb24oKQorICAgIGNvbXB1dGVHcmlkOiBm dW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgaGVhZGVycyA9IHRoaXMuZ2V0KCdoZWFkZXJD b2x1bW5zJykubWFwKGZ1bmN0aW9uIChoZWFkZXIpIHsgcmV0dXJuIGhlYWRlci5sYWJlbDsgfSk7 CiAgICAgICAgIHZhciB0YWJsZSA9IFtoZWFkZXJzXS5jb25jYXQodGhpcy5nZXQoJ3Jvd3MnKS5t YXAoZnVuY3Rpb24gKHJvdykgewpAQCAtMTA2LDggKzEyNyw3IEBAIEFwcC5JbmRleENvbnRyb2xs ZXIgPSBFbWJlci5Db250cm9sbGVyLmUKICAgICAgICAgICAgICAgICByZXR1cm4gcGxhdGZvcm1B bmRNZXRyaWNbMF0gfHwgcGxhdGZvcm1BbmRNZXRyaWNbMV0gPyBwbGF0Zm9ybUFuZE1ldHJpYyA6 IFtdOwogICAgICAgICAgICAgfSkpOwogICAgICAgICB9KSk7Ci0gICAgICAgIHRoaXMuX3ByZXZp b3VzR3JpZCA9IEpTT04uc3RyaW5naWZ5KHRhYmxlKTsKLSAgICAgICAgdGhpcy5zZXQoJ2dyaWQn LCB0aGlzLl9wcmV2aW91c0dyaWQpOworICAgICAgICByZXR1cm4gSlNPTi5zdHJpbmdpZnkodGFi bGUpOwogICAgIH0sCiAKICAgICBfc2hhcmVkRG9tYWluQ2hhbmdlZDogZnVuY3Rpb24gKCkKQEAg LTE3Myw4ICsxOTMsMTAgQEAgQXBwLkluZGV4Q29udHJvbGxlciA9IEVtYmVyLkNvbnRyb2xsZXIu ZQogICAgICAgICB0b2dnbGVFZGl0TW9kZTogZnVuY3Rpb24gKCkKICAgICAgICAgewogICAgICAg ICAgICAgdGhpcy50b2dnbGVQcm9wZXJ0eSgnZWRpdE1vZGUnKTsKLSAgICAgICAgICAgIGlmICgh dGhpcy5nZXQoJ2VkaXRNb2RlJykpCi0gICAgICAgICAgICAgICAgdGhpcy51cGRhdGVHcmlkKCk7 CisgICAgICAgICAgICBpZiAodGhpcy5nZXQoJ2VkaXRNb2RlJykpCisgICAgICAgICAgICAgICAg dGhpcy50cmFuc2l0aW9uVG9Sb3V0ZSgnZGFzaGJvYXJkJywgJ2N1c3RvbScsIHtuYW1lOiBudWxs LCBxdWVyeVBhcmFtczoge2dyaWQ6IHRoaXMuY29tcHV0ZUdyaWQoKX19KTsKKyAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICB0aGlzLnNldCgnZ3JpZCcsIHRoaXMuY29tcHV0ZUdyaWQo KSk7CiAgICAgICAgIH0sCiAgICAgfSwKIApAQCAtMzYyLDcgKzM4NCw1NiBAQCBBcHAuUGFuZSA9 IEVtYmVyLk9iamVjdC5leHRlbmQoewogICAgICAgICBpZiAodHlwZW9mKGlkKSA9PSAic3RyaW5n IikKICAgICAgICAgICAgIHJldHVybiAhIWlkLm1hdGNoKC9eW0EtWmEtejAtOV9dKyQvKTsKICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KKyAgICB9LAorICAgIGNvbXB1dGVTdGF0dXM6IGZ1 bmN0aW9uIChjdXJyZW50UG9pbnQsIHByZXZpb3VzUG9pbnQpCisgICAgeworICAgICAgICB2YXIg Y2hhcnREYXRhID0gdGhpcy5nZXQoJ2NoYXJ0RGF0YScpOworICAgICAgICB2YXIgZGlmZkZyb21C YXNlbGluZSA9IHRoaXMuX3JlbGF0aXZlRGlmZmVyZW50VG9MYXRlclBvaW50SW5UaW1lU2VyaWVz KGN1cnJlbnRQb2ludCwgY2hhcnREYXRhLmJhc2VsaW5lKTsKKyAgICAgICAgdmFyIGRpZmZGcm9t VGFyZ2V0ID0gdGhpcy5fcmVsYXRpdmVEaWZmZXJlbnRUb0xhdGVyUG9pbnRJblRpbWVTZXJpZXMo Y3VycmVudFBvaW50LCBjaGFydERhdGEudGFyZ2V0KTsKKworICAgICAgICB2YXIgbGFiZWwgPSAn JzsKKyAgICAgICAgdmFyIGNsYXNzTmFtZSA9ICcnOworICAgICAgICB2YXIgZm9ybWF0dGVyID0g ZDMuZm9ybWF0KCcuM3AnKTsKKworICAgICAgICB2YXIgc21hbGxlcklzQmV0dGVyID0gY2hhcnRE YXRhLnNtYWxsZXJJc0JldHRlcjsKKyAgICAgICAgaWYgKGRpZmZGcm9tQmFzZWxpbmUgIT09IHVu ZGVmaW5lZCAmJiBkaWZmRnJvbUJhc2VsaW5lID4gMCA9PSBzbWFsbGVySXNCZXR0ZXIpIHsKKyAg ICAgICAgICAgIGxhYmVsID0gZm9ybWF0dGVyKE1hdGguYWJzKGRpZmZGcm9tQmFzZWxpbmUpKSAr ICcgJyArIChzbWFsbGVySXNCZXR0ZXIgPyAnYWJvdmUnIDogJ2JlbG93JykgKyAnIGJhc2VsaW5l JzsKKyAgICAgICAgICAgIGNsYXNzTmFtZSA9ICd3b3JzZSc7CisgICAgICAgIH0gZWxzZSBpZiAo ZGlmZkZyb21UYXJnZXQgIT09IHVuZGVmaW5lZCAmJiBkaWZmRnJvbVRhcmdldCA8IDAgPT0gc21h bGxlcklzQmV0dGVyKSB7CisgICAgICAgICAgICBsYWJlbCA9IGZvcm1hdHRlcihNYXRoLmFicyhk aWZmRnJvbVRhcmdldCkpICsgJyAnICsgKHNtYWxsZXJJc0JldHRlciA/ICdiZWxvdycgOiAnYWJv dmUnKSArICcgdGFyZ2V0JzsKKyAgICAgICAgICAgIGNsYXNzTmFtZSA9ICdiZXR0ZXInOworICAg ICAgICB9IGVsc2UgaWYgKGRpZmZGcm9tVGFyZ2V0ICE9PSB1bmRlZmluZWQpCisgICAgICAgICAg ICBsYWJlbCA9IGZvcm1hdHRlcihNYXRoLmFicyhkaWZmRnJvbVRhcmdldCkpICsgJyB1bnRpbCB0 YXJnZXQnOworCisgICAgICAgIHZhciB2YWx1ZURlbHRhID0gcHJldmlvdXNQb2ludCA/IGNoYXJ0 RGF0YS5kZWx0YUZvcm1hdHRlcihjdXJyZW50UG9pbnQudmFsdWUgLSBwcmV2aW91c1BvaW50LnZh bHVlKSA6IG51bGw7CisgICAgICAgIGlmICh2YWx1ZURlbHRhICYmIHZhbHVlRGVsdGEgPiAwKQor ICAgICAgICAgICAgdmFsdWVEZWx0YSA9ICcrJyArIHZhbHVlRGVsdGE7CisKKyAgICAgICAgcmV0 dXJuIHtjbGFzc05hbWU6IGNsYXNzTmFtZSwgbGFiZWw6IGxhYmVsLCBjdXJyZW50VmFsdWU6IGNo YXJ0RGF0YS5mb3JtYXR0ZXIoY3VycmVudFBvaW50LnZhbHVlKSwgdmFsdWVEZWx0YTogdmFsdWVE ZWx0YX07CisgICAgfSwKKyAgICBfcmVsYXRpdmVEaWZmZXJlbnRUb0xhdGVyUG9pbnRJblRpbWVT ZXJpZXM6IGZ1bmN0aW9uIChjdXJyZW50UG9pbnQsIHRpbWVTZXJpZXMpCisgICAgeworICAgICAg ICBpZiAoIWN1cnJlbnRQb2ludCB8fCAhdGltZVNlcmllcykKKyAgICAgICAgICAgIHJldHVybiB1 bmRlZmluZWQ7CisKKyAgICAgICAgdmFyIHJlZmVyZW5jZVBvaW50ID0gdGltZVNlcmllcy5maW5k UG9pbnRBZnRlclRpbWUoY3VycmVudFBvaW50LnRpbWUpOworICAgICAgICBpZiAoIXJlZmVyZW5j ZVBvaW50KQorICAgICAgICAgICAgcmV0dXJuIHVuZGVmaW5lZDsKKworICAgICAgICByZXR1cm4g KGN1cnJlbnRQb2ludC52YWx1ZSAtIHJlZmVyZW5jZVBvaW50LnZhbHVlKSAvIHJlZmVyZW5jZVBv aW50LnZhbHVlOworICAgIH0sCisgICAgbGF0ZXN0U3RhdHVzOiBmdW5jdGlvbiAoKQorICAgIHsK KyAgICAgICAgdmFyIGNoYXJ0RGF0YSA9IHRoaXMuZ2V0KCdjaGFydERhdGEnKTsKKyAgICAgICAg aWYgKCFjaGFydERhdGEgfHwgIWNoYXJ0RGF0YS5jdXJyZW50KQorICAgICAgICAgICAgcmV0dXJu IG51bGw7CisKKyAgICAgICAgdmFyIGxhc3RQb2ludCA9IGNoYXJ0RGF0YS5jdXJyZW50Lmxhc3RQ b2ludCgpOworICAgICAgICBpZiAoIWxhc3RQb2ludCkKKyAgICAgICAgICAgIHJldHVybiBudWxs OworCisgICAgICAgIHJldHVybiB0aGlzLmNvbXB1dGVTdGF0dXMobGFzdFBvaW50LCBjaGFydERh dGEuY3VycmVudC5wcmV2aW91c1BvaW50KGxhc3RQb2ludCkpOworICAgIH0ucHJvcGVydHkoJ2No YXJ0RGF0YScpLAogfSk7CiAKIEFwcC5jcmVhdGVDaGFydERhdGEgPSBmdW5jdGlvbiAoZGF0YSkK QEAgLTM3NCw2ICs0NDUsNyBAQCBBcHAuY3JlYXRlQ2hhcnREYXRhID0gZnVuY3Rpb24gKGRhdGEp CiAgICAgICAgIHRhcmdldDogcnVucy50YXJnZXQgPyBydW5zLnRhcmdldC50aW1lU2VyaWVzQnlD b21taXRUaW1lKCkgOiBudWxsLAogICAgICAgICB1bml0OiBkYXRhLnVuaXQsCiAgICAgICAgIGZv cm1hdHRlcjogZGF0YS51c2VTSSA/IGQzLmZvcm1hdCgnLjRzJykgOiBkMy5mb3JtYXQoJy40Zycp LAorICAgICAgICBkZWx0YUZvcm1hdHRlcjogZGF0YS51c2VTSSA/IGQzLmZvcm1hdCgnLjJzJykg OiBkMy5mb3JtYXQoJy4yZycpLAogICAgICAgICBzbWFsbGVySXNCZXR0ZXI6IGRhdGEuc21hbGxl cklzQmV0dGVyLAogICAgIH07CiB9CkBAIC03MzAsMTUgKzgwMiwxNSBAQCBBcHAuUGFuZUNvbnRy b2xsZXIgPSBFbWJlci5PYmplY3RDb250cm9sCiAgICAgICAgIH0KIAogICAgICAgICB2YXIgY3Vy cmVudE1lYXN1cmVtZW50OwotICAgICAgICB2YXIgb2xkTWVhc3VyZW1lbnQ7CisgICAgICAgIHZh ciBwcmV2aW91c1BvaW50OwogICAgICAgICBpZiAoY3VycmVudFBvaW50KSB7CiAgICAgICAgICAg ICBjdXJyZW50TWVhc3VyZW1lbnQgPSBjdXJyZW50UG9pbnQubWVhc3VyZW1lbnQ7Ci0gICAgICAg ICAgICB2YXIgcHJldmlvdXNQb2ludCA9IGN1cnJlbnRQb2ludC5zZXJpZXMucHJldmlvdXNQb2lu dChjdXJyZW50UG9pbnQpOwotICAgICAgICAgICAgb2xkTWVhc3VyZW1lbnQgPSBwcmV2aW91c1Bv aW50ID8gcHJldmlvdXNQb2ludC5tZWFzdXJlbWVudCA6IG51bGw7CisgICAgICAgICAgICBwcmV2 aW91c1BvaW50ID0gY3VycmVudFBvaW50LnNlcmllcy5wcmV2aW91c1BvaW50KGN1cnJlbnRQb2lu dCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBjdXJyZW50TWVhc3VyZW1lbnQgPSBz ZWxlY3RlZFBvaW50c1tzZWxlY3RlZFBvaW50cy5sZW5ndGggLSAxXS5tZWFzdXJlbWVudDsKLSAg ICAgICAgICAgIG9sZE1lYXN1cmVtZW50ID0gc2VsZWN0ZWRQb2ludHNbMF0ubWVhc3VyZW1lbnQ7 ICAgICAgICAgICAgCisgICAgICAgICAgICBwcmV2aW91c1BvaW50ID0gc2VsZWN0ZWRQb2ludHNb MF07CiAgICAgICAgIH0KKyAgICAgICAgdmFyIG9sZE1lYXN1cmVtZW50ID0gcHJldmlvdXNQb2lu dCA/IHByZXZpb3VzUG9pbnQubWVhc3VyZW1lbnQgOiBudWxsOwogCiAgICAgICAgIHZhciBmb3Jt YXR0ZWRSZXZpc2lvbnMgPSBjdXJyZW50TWVhc3VyZW1lbnQuZm9ybWF0dGVkUmV2aXNpb25zKG9s ZE1lYXN1cmVtZW50KTsKICAgICAgICAgdmFyIHJldmlzaW9ucyA9IEFwcC5NYW5pZmVzdC5nZXQo J3JlcG9zaXRvcmllcycpCkBAIC03NjIsMTUgKzgzNCw4IEBAIEFwcC5QYW5lQ29udHJvbGxlciA9 IEVtYmVyLk9iamVjdENvbnRyb2wKICAgICAgICAgICAgICAgICBidWlsZFVSTCA9IGJ1aWxkZXIu dXJsRnJvbUJ1aWxkTnVtYmVyKGJ1aWxkTnVtYmVyKTsKICAgICAgICAgfQogCi0gICAgICAgIHZh ciBjaGFydERhdGEgPSB0aGlzLmdldCgnY2hhcnREYXRhJyk7Ci0gICAgICAgIHZhciB2YWx1ZURp ZmYgPSBvbGRNZWFzdXJlbWVudCA/IGNoYXJ0RGF0YS5mb3JtYXR0ZXIoY3VycmVudE1lYXN1cmVt ZW50Lm1lYW4oKSAtIG9sZE1lYXN1cmVtZW50Lm1lYW4oKSkgOiBudWxsOwotICAgICAgICBpZiAo dmFsdWVEaWZmICYmIHZhbHVlRGlmZiA+IDApCi0gICAgICAgICAgICB2YWx1ZURpZmYgPSAnKycg KyB2YWx1ZURpZmY7Ci0KICAgICAgICAgdGhpcy5zZXQoJ2RldGFpbHMnLCBFbWJlci5PYmplY3Qu Y3JlYXRlKHsKLSAgICAgICAgICAgIHN0YXR1czogdGhpcy5fY29tcHV0ZVN0YXR1cyhjdXJyZW50 UG9pbnQpLAotICAgICAgICAgICAgY3VycmVudFZhbHVlOiBjaGFydERhdGEuZm9ybWF0dGVyKGN1 cnJlbnRNZWFzdXJlbWVudC5tZWFuKCkpLAotICAgICAgICAgICAgdmFsdWVEaWZmOiB2YWx1ZURp ZmYsCisgICAgICAgICAgICBzdGF0dXM6IHRoaXMuZ2V0KCdtb2RlbCcpLmNvbXB1dGVTdGF0dXMo Y3VycmVudFBvaW50LCBwcmV2aW91c1BvaW50KSwKICAgICAgICAgICAgIGJ1aWxkTnVtYmVyOiBi dWlsZE51bWJlciwKICAgICAgICAgICAgIGJ1aWxkVVJMOiBidWlsZFVSTCwKICAgICAgICAgICAg IGJ1aWxkVGltZTogY3VycmVudE1lYXN1cmVtZW50LmZvcm1hdHRlZEJ1aWxkVGltZSgpLApAQCAt NzgzLDQwICs4NDgsNiBAQCBBcHAuUGFuZUNvbnRyb2xsZXIgPSBFbWJlci5PYmplY3RDb250cm9s CiAgICAgICAgIHZhciBwb2ludHMgPSB0aGlzLmdldCgnc2VsZWN0ZWRQb2ludHMnKTsKICAgICAg ICAgdGhpcy5zZXQoJ2Nhbm5vdEFuYWx5emUnLCAhdGhpcy5nZXQoJ25ld0FuYWx5c2lzVGFza05h bWUnKSB8fCAhcG9pbnRzIHx8IHBvaW50cy5sZW5ndGggPCAyKTsKICAgICB9Lm9ic2VydmVzKCdu ZXdBbmFseXNpc1Rhc2tOYW1lJyksCi0gICAgX2NvbXB1dGVTdGF0dXM6IGZ1bmN0aW9uIChjdXJy ZW50UG9pbnQpCi0gICAgewotICAgICAgICB2YXIgY2hhcnREYXRhID0gdGhpcy5nZXQoJ2NoYXJ0 RGF0YScpOwotCi0gICAgICAgIHZhciBkaWZmRnJvbUJhc2VsaW5lID0gdGhpcy5fcmVsYXRpdmVE aWZmZXJlbnRUb0xhdGVyUG9pbnRJblRpbWVTZXJpZXMoY3VycmVudFBvaW50LCBjaGFydERhdGEu YmFzZWxpbmUpOwotICAgICAgICB2YXIgZGlmZkZyb21UYXJnZXQgPSB0aGlzLl9yZWxhdGl2ZURp ZmZlcmVudFRvTGF0ZXJQb2ludEluVGltZVNlcmllcyhjdXJyZW50UG9pbnQsIGNoYXJ0RGF0YS50 YXJnZXQpOwotCi0gICAgICAgIHZhciBsYWJlbCA9ICcnOwotICAgICAgICB2YXIgY2xhc3NOYW1l ID0gJyc7Ci0gICAgICAgIHZhciBmb3JtYXR0ZXIgPSBkMy5mb3JtYXQoJy4zcCcpOwotCi0gICAg ICAgIHZhciBzbWFsbGVySXNCZXR0ZXIgPSBjaGFydERhdGEuc21hbGxlcklzQmV0dGVyOwotICAg ICAgICBpZiAoZGlmZkZyb21CYXNlbGluZSAhPT0gdW5kZWZpbmVkICYmIGRpZmZGcm9tQmFzZWxp bmUgPiAwID09IHNtYWxsZXJJc0JldHRlcikgewotICAgICAgICAgICAgbGFiZWwgPSBmb3JtYXR0 ZXIoTWF0aC5hYnMoZGlmZkZyb21CYXNlbGluZSkpICsgJyAnICsgKHNtYWxsZXJJc0JldHRlciA/ ICdhYm92ZScgOiAnYmVsb3cnKSArICcgYmFzZWxpbmUnOwotICAgICAgICAgICAgY2xhc3NOYW1l ID0gJ3dvcnNlJzsKLSAgICAgICAgfSBlbHNlIGlmIChkaWZmRnJvbVRhcmdldCAhPT0gdW5kZWZp bmVkICYmIGRpZmZGcm9tVGFyZ2V0IDwgMCA9PSBzbWFsbGVySXNCZXR0ZXIpIHsKLSAgICAgICAg ICAgIGxhYmVsID0gZm9ybWF0dGVyKE1hdGguYWJzKGRpZmZGcm9tVGFyZ2V0KSkgKyAnICcgKyAo c21hbGxlcklzQmV0dGVyID8gJ2JlbG93JyA6ICdhYm92ZScpICsgJyB0YXJnZXQnOwotICAgICAg ICAgICAgY2xhc3NOYW1lID0gJ2JldHRlcic7Ci0gICAgICAgIH0gZWxzZSBpZiAoZGlmZkZyb21U YXJnZXQgIT09IHVuZGVmaW5lZCkKLSAgICAgICAgICAgIGxhYmVsID0gZm9ybWF0dGVyKE1hdGgu YWJzKGRpZmZGcm9tVGFyZ2V0KSkgKyAnIHVudGlsIHRhcmdldCc7Ci0KLSAgICAgICAgcmV0dXJu IHtjbGFzc05hbWU6IGNsYXNzTmFtZSwgbGFiZWw6IGxhYmVsfTsKLSAgICB9LAotICAgIF9yZWxh dGl2ZURpZmZlcmVudFRvTGF0ZXJQb2ludEluVGltZVNlcmllczogZnVuY3Rpb24gKGN1cnJlbnRQ b2ludCwgdGltZVNlcmllcykKLSAgICB7Ci0gICAgICAgIGlmICghY3VycmVudFBvaW50IHx8ICF0 aW1lU2VyaWVzKQotICAgICAgICAgICAgcmV0dXJuIHVuZGVmaW5lZDsKLSAgICAgICAgCi0gICAg ICAgIHZhciByZWZlcmVuY2VQb2ludCA9IHRpbWVTZXJpZXMuZmluZFBvaW50QWZ0ZXJUaW1lKGN1 cnJlbnRQb2ludC50aW1lKTsKLSAgICAgICAgaWYgKCFyZWZlcmVuY2VQb2ludCkKLSAgICAgICAg ICAgIHJldHVybiB1bmRlZmluZWQ7Ci0KLSAgICAgICAgcmV0dXJuIChjdXJyZW50UG9pbnQudmFs dWUgLSByZWZlcmVuY2VQb2ludC52YWx1ZSkgLyByZWZlcmVuY2VQb2ludC52YWx1ZTsKLSAgICB9 CiB9KTsKIAogCkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2NoYXJ0 LXBhbmUuY3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMv djIvY2hhcnQtcGFuZS5jc3MJKHJldmlzaW9uIDE3OTc1OCkKKysrIFdlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjIvY2hhcnQtcGFuZS5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTMyMCwx NyArMzIwLDIzIEBACiAuY2hhcnQgcGF0aC5iYXNlbGluZSB7CiAgICAgc3Ryb2tlOiAjZjY2Owog fQotLmNoYXJ0LXBhbmUgLnN0YXR1cyAud29yc2UgeworLmNoYXJ0LXBhbmUgLnN0YXR1cyAud29y c2UsCisuZGFzaGJvYXJkLXN0YXR1cyAud29yc2UgewogICAgIGNvbG9yOiAjYzMzOwogfQogCiAu Y2hhcnQgcGF0aC50YXJnZXQgewogICAgIHN0cm9rZTogIzY2ZjsKIH0KLS5jaGFydC1wYW5lIC5z dGF0dXMgLmJldHRlciB7CisuY2hhcnQtcGFuZSAuc3RhdHVzIC5iZXR0ZXIsCisuZGFzaGJvYXJk LXN0YXR1cyAuYmV0dGVyIHsKICAgICBjb2xvcjogIzMzYzsKIH0KIAorLmRhc2hib2FyZC1zdGF0 dXMgLnN0YXR1cy1sYWJlbCB7CisgICAgbWFyZ2luLWxlZnQ6IDFyZW07Cit9CisKIC5jaGFydCAu YXhpcywKIC5jaGFydCAuZG9tYWluIHsKICAgZmlsbDogbm9uZTsKSW5kZXg6IFdlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvZGF0YS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2RhdGEuanMJKHJldmlzaW9uIDE3OTc1OCkKKysrIFdl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvZGF0YS5qcwkod29ya2luZyBjb3B5KQpA QCAtNDA1LDYgKzQwNSwxMyBAQCBUaW1lU2VyaWVzLnByb3RvdHlwZS5taW5NYXhGb3JUaW1lUmFu Z2UgCiAKIFRpbWVTZXJpZXMucHJvdG90eXBlLnNlcmllcyA9IGZ1bmN0aW9uICgpIHsgcmV0dXJu IHRoaXMuX3NlcmllczsgfQogCitUaW1lU2VyaWVzLnByb3RvdHlwZS5sYXN0UG9pbnQgPSBmdW5j dGlvbiAoKQoreworICAgIGlmICghdGhpcy5fc2VyaWVzIHx8ICF0aGlzLl9zZXJpZXMubGVuZ3Ro KQorICAgICAgICByZXR1cm4gbnVsbDsKKyAgICByZXR1cm4gdGhpcy5fc2VyaWVzW3RoaXMuX3Nl cmllcy5sZW5ndGggLSAxXTsKK30KKwogVGltZVNlcmllcy5wcm90b3R5cGUucHJldmlvdXNQb2lu dCA9IGZ1bmN0aW9uIChwb2ludCkKIHsKICAgICBpZiAoIXBvaW50LnNlcmllc0luZGV4KQpJbmRl eDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9pbmRleC5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvaW5kZXguaHRtbAkocmV2 aXNpb24gMTc5NzU4KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9pbmRl eC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0zLDYgKzMsMTQgQEAKIDxoZWFkPgogICAgIDxtZXRh IGNoYXJzZXQ9InV0Zi04Ij4KICAgICA8dGl0bGU+V2ViS2l0IFBlcmZvcm1hbmNlIE1vbml0b3Ig KEJldGEpPC90aXRsZT4KKworICAgIDxsaW5rIHJlbD0icHJlZmV0Y2giIGhyZWY9Ii4uL2RhdGEv bWFuaWZlc3QuanNvbiI+CisgICAgPHNjcmlwdCB0eXBlPSJhcHBsaWNhdGlvbi9qc29uIiBzcmM9 Ii4uL2RhdGEvbWFuaWZlc3QuanNvbiI+PC9zY3JpcHQ+CisKKyAgICA8bGluayByZWw9InN0eWxl c2hlZXQiIGhyZWY9ImFwcC5jc3MiPgorICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0i Y2hhcnQtcGFuZS5jc3MiPgorCisgICAgPHNjcmlwdCBzcmM9ImpzL2pxdWVyeS5taW4uanMiIGRl ZmVyPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJqcy9qcXVlcnkubWluLmpzIiBkZWZlcj48 L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0ianMvaGFuZGxlYmFycy5qcyIgZGVmZXI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCBzcmM9ImpzL2VtYmVyLmpzIiBkZWZlcj48L3NjcmlwdD4KQEAgLTE2 LDEwICsyNCw4IEBACiAgICAgPHNjcmlwdCBzcmM9InBvcHVwLmpzIiBkZWZlcj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHNyYz0iaW50ZXJhY3RpdmUtY2hhcnQuanMiIGRlZmVyPjwvc2NyaXB0Pgog ICAgIDxzY3JpcHQgc3JjPSJjb21taXRzLXZpZXdlci5qcyIgZGVmZXI+PC9zY3JpcHQ+Ci0gICAg PGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJhcHAuY3NzIj4KLSAgICA8bGluayByZWw9InN0 eWxlc2hlZXQiIGhyZWY9ImNoYXJ0LXBhbmUuY3NzIj4KIAotICAgIDxzY3JpcHQgdHlwZT0idGV4 dC94LWhhbmRsZWJhcnMiIGRhdGEtdGVtcGxhdGUtbmFtZT0iaW5kZXgiPgorICAgIDxzY3JpcHQg dHlwZT0idGV4dC94LWhhbmRsZWJhcnMiIGRhdGEtdGVtcGxhdGUtbmFtZT0iZGFzaGJvYXJkIj4K ICAgICAgICAgPGhlYWRlciBpZD0iaGVhZGVyIj4KICAgICAgICAgICAgIHt7cGFydGlhbCAibmF2 YmFyIn19CiAgICAgICAgICAgICB7e3ZpZXcgQXBwLk51bWJlck9mRGF5c0NvbnRyb2xWaWV3IHRh Z05hbWU9InVsIiBudW1iZXJPZkRheXM9bnVtYmVyT2ZEYXlzfX0KQEAgLTc4LDExICs4NCwxOSBA QAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7ey9pZn19CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAge3tlbHNlfX0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg e3sjaWYgY2hhcnREYXRhfX0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxk aXYgY2xhc3M9ImRhc2hib2FyZC1zdGF0dXMiPgorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHt7I2lmIGxhdGVzdFN0YXR1c319CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHt7bGF0ZXN0U3RhdHVzLmN1cnJlbnRWYWx1ZX19IHt7Y2hh cnREYXRhLnVuaXR9fQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB7eyNpZiBsYXRlc3RTdGF0dXMubGFiZWx9fQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPHNwYW4ge3tiaW5kLWF0dHIgY2xhc3M9IjpzdGF0dXMtbGFi ZWwgbGF0ZXN0U3RhdHVzLmNsYXNzTmFtZSJ9fT57e2xhdGVzdFN0YXR1cy5sYWJlbH19PC9zcGFu PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7ey9pZn19Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAge3svaWZ9fQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB7eyNsaW5rLXRvICdjaGFydHMnIChxdWVyeS1wYXJhbXMgcGFuZUxpc3Q9 cGFuZUxpc3Qgc2luY2U9Y29udHJvbGxlci5zaW5jZSl9fQotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAge3tpbnRlcmFjdGl2ZS1jaGFydAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNoYXJ0RGF0YT1jaGFydERhdGEKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBkb21haW49Y29udHJvbGxlci5zaGFyZWREb21haW4KLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbmFibGVTZWxlY3Rpb249ZmFs c2V9fQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHt7aW50ZXJhY3Rp dmUtY2hhcnQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hh cnREYXRhPWNoYXJ0RGF0YQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBkb21haW49Y29udHJvbGxlci5zaGFyZWREb21haW4KKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZW5hYmxlU2VsZWN0aW9uPWZhbHNlfX0KICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHt7L2xpbmstdG99fQogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB7e2Vsc2V9fQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAge3sjaWYgZmFpbHVyZX19CkBAIC0yNTgsOSArMjcyLDkgQEAKICAgICAgICAgICAgICAg ICA8dHI+CiAgICAgICAgICAgICAgICAgICAgIDx0aD5DdXJyZW50PC90aD4KICAgICAgICAgICAg ICAgICAgICAgPHRkPgotICAgICAgICAgICAgICAgICAgICAgICAge3tkZXRhaWxzLmN1cnJlbnRW YWx1ZX19IHt7Y2hhcnREYXRhLnVuaXR9fQotICAgICAgICAgICAgICAgICAgICAgICAge3sjaWYg ZGV0YWlscy52YWx1ZURpZmZ9fQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICh7e2RldGFp bHMudmFsdWVEaWZmfX0ge3tjaGFydERhdGEudW5pdH19KQorICAgICAgICAgICAgICAgICAgICAg ICAge3tkZXRhaWxzLnN0YXR1cy5jdXJyZW50VmFsdWV9fSB7e2NoYXJ0RGF0YS51bml0fX0KKyAg ICAgICAgICAgICAgICAgICAgICAgIHt7I2lmIGRldGFpbHMuc3RhdHVzLnZhbHVlRGVsdGF9fQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICh7e2RldGFpbHMuc3RhdHVzLnZhbHVlRGVsdGF9 fSB7e2NoYXJ0RGF0YS51bml0fX0pCiAgICAgICAgICAgICAgICAgICAgICAgICB7ey9pZn19CiAg ICAgICAgICAgICAgICAgICAgICAgICB7eyNpZiBkZXRhaWxzLnN0YXR1cy5sYWJlbH19CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgPGJyPgpAQCAtMzc4LDkgKzM5MiwxMyBAQAogICAgICAg ICA8bmF2IGlkPSJuYXZpZ2F0aW9uIiByb2xlPSJuYXZpZ2F0aW9uIj4KICAgICAgICAgICAgIDxo MT48YSBocmVmPSIjIj5XZWJLaXQgUGVyZiBNb25pdG9yPC9hPjwvaDE+CiAgICAgICAgICAgICA8 dWw+Ci0gICAgICAgICAgICAgICAge3sjbGluay10byAnaW5kZXgnIHRhZ05hbWU9J2xpJ319Ci0g ICAgICAgICAgICAgICAgICAgIHt7I2xpbmstdG8gJ2luZGV4J319RGFzaGJvYXJke3svbGluay10 b319Ci0gICAgICAgICAgICAgICAge3svbGluay10b319CisgICAgICAgICAgICAgICAge3sjZWFj aCBBcHAuTWFuaWZlc3QuZGFzaGJvYXJkc319CisgICAgICAgICAgICAgICAgICAgIHt7I2lmIG5h bWV9fQorICAgICAgICAgICAgICAgICAgICAgICAge3sjbGluay10byAnZGFzaGJvYXJkJyBuYW1l IHRhZ05hbWU9J2xpJ319CisgICAgICAgICAgICAgICAgICAgICAgICAgICAge3sjbGluay10byAn ZGFzaGJvYXJkJyBuYW1lfX17e2xhYmVsfX17ey9saW5rLXRvfX0KKyAgICAgICAgICAgICAgICAg ICAgICAgIHt7L2xpbmstdG99fQorICAgICAgICAgICAgICAgICAgICB7ey9pZn19CisgICAgICAg ICAgICAgICAge3svZWFjaH19CiAgICAgICAgICAgICAgICAge3sjbGluay10byAnY2hhcnRzJyB0 YWdOYW1lPSdsaSd9fQogICAgICAgICAgICAgICAgICAgICB7eyNsaW5rLXRvICdjaGFydHMnfX1D aGFydHN7ey9saW5rLXRvfX0KICAgICAgICAgICAgICAgICB7ey9saW5rLXRvfX0KSW5kZXg6IFdl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvaW50ZXJhY3RpdmUtY2hhcnQuanMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9pbnRlcmFjdGl2 ZS1jaGFydC5qcwkocmV2aXNpb24gMTc5NzU4KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3B1YmxpYy92Mi9pbnRlcmFjdGl2ZS1jaGFydC5qcwkod29ya2luZyBjb3B5KQpAQCAtMjg4LDcg KzI4OCw3IEBAIEFwcC5JbnRlcmFjdGl2ZUNoYXJ0Q29tcG9uZW50ID0gRW1iZXIuQ28KICAgICAg ICAgdGhpcy5feUF4aXNMYWJlbHMuY2FsbCh0aGlzLl95QXhpcyk7CiAgICAgICAgIGlmICh0aGlz Ll95QXhpc1VuaXRDb250YWluZXIpCiAgICAgICAgICAgICB0aGlzLl95QXhpc1VuaXRDb250YWlu ZXIucmVtb3ZlKCk7Ci0gICAgICAgIHZhciB4ID0gLSAzICogdGhpcy5fcmVtOworICAgICAgICB2 YXIgeCA9IC0gMy4yICogdGhpcy5fcmVtOwogICAgICAgICB2YXIgeSA9IHRoaXMuX2NvbnRlbnRI ZWlnaHQgLyAyOwogICAgICAgICB0aGlzLl95QXhpc1VuaXRDb250YWluZXIgPSB0aGlzLl95QXhp c0xhYmVscy5hcHBlbmQoInRleHQiKQogICAgICAgICAgICAgLmF0dHIoInRyYW5zZm9ybSIsICJy b3RhdGUoOTAgMCAwKSB0cmFuc2xhdGUoIiArIHkgKyAiLCAiICsgKC14KSArICIpIikKSW5kZXg6 IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvbWFuaWZlc3QuanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9tYW5pZmVzdC5qcwkocmV2 aXNpb24gMTc5NzU4KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9tYW5p ZmVzdC5qcwkod29ya2luZyBjb3B5KQpAQCAtOTIsNyArOTIsNyBAQCBBcHAuUmVwb3NpdG9yeSA9 IEFwcC5OYW1lTGFiZWxNb2RlbC5leHRlCiAgICAgfSwKIH0pOwogCi1BcHAuRGFzaGJvYXJkID0g QXBwLk1vZGVsLmV4dGVuZCh7CitBcHAuRGFzaGJvYXJkID0gQXBwLk5hbWVMYWJlbE1vZGVsLmV4 dGVuZCh7CiAgICAgc2VyaWFsaXplZDogRFMuYXR0cignc3RyaW5nJyksCiAgICAgdGFibGU6IGZ1 bmN0aW9uICgpCiAgICAgewpAQCAtMTUyLDcgKzE1Miw3IEBAIEFwcC5NZXRyaWNTZXJpYWxpemVy ID0gQXBwLlBsYXRmb3JtU2VyaWEKICAgICAgICAgICAgIG1ldHJpY3M6IHRoaXMuX25vcm1hbGl6 ZUlkTWFwKHBheWxvYWRbJ21ldHJpY3MnXSksCiAgICAgICAgICAgICByZXBvc2l0b3JpZXM6IHRo aXMuX25vcm1hbGl6ZUlkTWFwKHBheWxvYWRbJ3JlcG9zaXRvcmllcyddKSwKICAgICAgICAgICAg IGJ1Z1RyYWNrZXJzOiB0aGlzLl9ub3JtYWxpemVJZE1hcChwYXlsb2FkWydidWdUcmFja2Vycydd KSwKLSAgICAgICAgICAgIGRhc2hib2FyZHM6IFt7aWQ6IDEsIHNlcmlhbGl6ZWQ6IEpTT04uc3Ry aW5naWZ5KHBheWxvYWRbJ2RlZmF1bHREYXNoYm9hcmQnXSl9XSwKKyAgICAgICAgICAgIGRhc2hi b2FyZHM6IFtdLAogICAgICAgICB9OwogCiAgICAgICAgIGZvciAodmFyIHRlc3RJZCBpbiBwYXls b2FkWyd0ZXN0cyddKSB7CkBAIC0xNzMsNiArMTczLDE3IEBAIEFwcC5NZXRyaWNTZXJpYWxpemVy ID0gQXBwLlBsYXRmb3JtU2VyaWEKICAgICAgICAgICAgIHRlc3RbJ21ldHJpY3MnXS5wdXNoKG1l dHJpY0lkKTsKICAgICAgICAgfQogCisgICAgICAgIHZhciBpZCA9IDE7CisgICAgICAgIHZhciBk YXNoYm9hcmRzSW5QYXlsb2FkID0gcGF5bG9hZFsnZGFzaGJvYXJkcyddOworICAgICAgICBmb3Ig KHZhciBkYXNoYm9hcmROYW1lIGluIGRhc2hib2FyZHNJblBheWxvYWQpIHsKKyAgICAgICAgICAg IHJlc3VsdHNbJ2Rhc2hib2FyZHMnXS5wdXNoKHsKKyAgICAgICAgICAgICAgICBpZDogaWQsCisg ICAgICAgICAgICAgICAgbmFtZTogZGFzaGJvYXJkTmFtZSwKKyAgICAgICAgICAgICAgICBzZXJp YWxpemVkOiBKU09OLnN0cmluZ2lmeShkYXNoYm9hcmRzSW5QYXlsb2FkW2Rhc2hib2FyZE5hbWVd KQorICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBpZCsrOworICAgICAgICB9CisKICAgICAg ICAgcmV0dXJuIHJlc3VsdHM7CiAgICAgfSwKICAgICBfbm9ybWFsaXplSWRNYXA6IGZ1bmN0aW9u IChpZE1hcCkKQEAgLTIxMSw2ICsyMjIsOCBAQCBBcHAuTWFuaWZlc3QgPSBFbWJlci5Db250cm9s bGVyLmV4dGVuZCh7CiAgICAgX21ldHJpY0J5SWQ6IHt9LAogICAgIF9idWlsZGVyQnlJZDoge30s CiAgICAgX3JlcG9zaXRvcnlCeUlkOiB7fSwKKyAgICBfZGFzaGJvYXJkQnlOYW1lOiB7fSwKKyAg ICBfZGVmYXVsdERhc2hib2FyZE5hbWU6IG51bGwsCiAgICAgX2ZldGNoUHJvbWlzZTogbnVsbCwK ICAgICBmZXRjaDogZnVuY3Rpb24gKHN0b3JlKQogICAgIHsKQEAgLTIyMyw2ICsyMzYsOCBAQCBB cHAuTWFuaWZlc3QgPSBFbWJlci5Db250cm9sbGVyLmV4dGVuZCh7CiAgICAgbWV0cmljOiBmdW5j dGlvbiAoaWQpIHsgcmV0dXJuIHRoaXMuX21ldHJpY0J5SWRbaWRdOyB9LAogICAgIGJ1aWxkZXI6 IGZ1bmN0aW9uIChpZCkgeyByZXR1cm4gdGhpcy5fYnVpbGRlckJ5SWRbaWRdOyB9LAogICAgIHJl cG9zaXRvcnk6IGZ1bmN0aW9uIChpZCkgeyByZXR1cm4gdGhpcy5fcmVwb3NpdG9yeUJ5SWRbaWRd OyB9LAorICAgIGRhc2hib2FyZEJ5TmFtZTogZnVuY3Rpb24gKG5hbWUpIHsgcmV0dXJuIHRoaXMu X2Rhc2hib2FyZEJ5TmFtZVtuYW1lXTsgfSwKKyAgICBkZWZhdWx0RGFzaGJvYXJkTmFtZTogZnVu Y3Rpb24gKCkgeyByZXR1cm4gdGhpcy5fZGVmYXVsdERhc2hib2FyZE5hbWU7IH0sCiAgICAgX2Zl dGNoZWRNYW5pZmVzdDogZnVuY3Rpb24gKHN0b3JlKQogICAgIHsKICAgICAgICAgdmFyIHN0YXJ0 VGltZSA9IERhdGUubm93KCk7CkBAIC0yNTksNyArMjc0LDEwIEBAIEFwcC5NYW5pZmVzdCA9IEVt YmVyLkNvbnRyb2xsZXIuZXh0ZW5kKHsKIAogICAgICAgICB0aGlzLnNldCgnYnVnVHJhY2tlcnMn LCBzdG9yZS5hbGwoJ2J1Z1RyYWNrZXInKS5zb3J0QnkoJ25hbWUnKSk7CiAKLSAgICAgICAgdGhp cy5zZXQoJ2RlZmF1bHREYXNoYm9hcmQnLCBzdG9yZS5hbGwoJ2Rhc2hib2FyZCcpLm9iamVjdEF0 KDApKTsKKyAgICAgICAgdmFyIGRhc2hib2FyZHMgPSBzdG9yZS5hbGwoJ2Rhc2hib2FyZCcpLnNv cnRCeSgnbmFtZScpOworICAgICAgICB0aGlzLnNldCgnZGFzaGJvYXJkcycsIGRhc2hib2FyZHMp OworICAgICAgICBkYXNoYm9hcmRzLmZvckVhY2goZnVuY3Rpb24gKGRhc2hib2FyZCkgeyBzZWxm Ll9kYXNoYm9hcmRCeU5hbWVbZGFzaGJvYXJkLmdldCgnbmFtZScpXSA9IGRhc2hib2FyZDsgfSk7 CisgICAgICAgIHRoaXMuX2RlZmF1bHREYXNoYm9hcmROYW1lID0gZGFzaGJvYXJkcy5sZW5ndGgg PyBkYXNoYm9hcmRzWzBdLmdldCgnbmFtZScpIDogbnVsbDsKICAgICB9LAogICAgIGZldGNoUnVu c1dpdGhQbGF0Zm9ybUFuZE1ldHJpYzogZnVuY3Rpb24gKHN0b3JlLCBwbGF0Zm9ybUlkLCBtZXRy aWNJZCkKICAgICB7Cg==