14258 2007-06-20 21:29:42 -0700 Response time vs. download time should be shown in the network profile 2008-04-14 09:26:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 523.x (Safari 3) All All RESOLVED FIXED http://boredzo.org/blog InRadar P2 Normal --- 1 catfish.man catfish.man timothy oldest_to_newest 6956 0 catfish.man 2007-06-20 21:29:42 -0700 A page I just loaded took most of its time downloading a 17k document, despite the ~300k of images. Clearly this wasn't a result of network issues, but instead server latency. Being able to see this on the graph (perhaps darkening the section of the graph in which data is actually loading) would make this much clearer for diagnosing pageload perf problems. Note: the url may not demonstrate the issue well; it's just the one I saw it at 68592 1 aroben 2008-01-29 10:54:04 -0800 <rdar://problem/5712780> 74969 2 aroben 2008-03-24 05:51:28 -0700 *** Bug 18034 has been marked as a duplicate of this bug. *** 77384 3 20498 catfish.man 2008-04-13 01:47:33 -0700 Created attachment 20498 Initial patch This only changes the display of the individual resource bars, not the bar for totals. 77405 4 timothy 2008-04-13 11:36:47 -0700 Can you attach a screenshot? 77410 5 catfish.man 2008-04-13 12:42:47 -0700 (In reply to comment #4) > Can you attach a screenshot? > http://dscoder.com/inspectorwaitingtime.png 77454 6 timothy 2008-04-13 20:32:08 -0700 I think we need to update the sorting function to sort by response received and end time. 77458 7 catfish.man 2008-04-13 21:34:19 -0700 (In reply to comment #6) > I think we need to update the sorting function to sort by response received and > end time. > That ends up looking like this: http://dscoder.com/responsesorting.png I'm not actually sure which one I prefer... the new one is a little odd, although I certainly see the logic of it. 77459 8 20516 catfish.man 2008-04-13 21:38:31 -0700 Created attachment 20516 This tweaks opacities to look right, and sorts by response received time. 77460 9 catfish.man 2008-04-13 21:39:38 -0700 Argh, it also has a tab in it. Fixed locally. 77580 10 catfish.man 2008-04-14 09:26:37 -0700 Landed in r31863 20498 2008-04-13 01:47:33 -0700 2008-04-13 21:38:31 -0700 Initial patch inspector-response-time-bars.txt text/plain 4556 catfish.man SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTg0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMDQtMTMgIERhdmlkIFNtaXRoICA8Y2F0ZmlzaC5tYW5AZ21h aWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAK KyAgICAgICAgLSBGaXggaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 MjU4CisgICAgICAgIFJlc3BvbnNlIHRpbWUgdnMuIGRvd25sb2FkIHRpbWUgc2hvdWxkIGJlIHNo b3duIGluIHRoZSBuZXR3b3JrIHByb2ZpbGUKKworICAgICAgICBXQVJOSU5HOiBOTyBURVNUIENB U0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL1Jlc291cmNl c1BhbmVsLmpzOiBNYWtlIHR3byBiYXJzIGluc3RlYWQgb2Ygb25lOyBvbmUgZm9yIHRoZSB0b3Rh bCB0aW1lLCBvbmUgZm9yIHRoZSB0aW1lIHBvc3QtcmVzcG9uc2UuCisgICAgICAgICogcGFnZS9p bnNwZWN0b3IvaW5zcGVjdG9yLmNzczogQWRkIGEgbmV3IHJ1bGUgdG8gbWFrZSB0aGUgd2FpdGlu ZyBiYXIgaGF2ZSBhbiBvcGFjaXR5IG9mIDAuMzUsIGFuZCBjaGFuZ2UgdGhlIHRvdGFsIGJhciBv cGFjaXR5IHRvIDAuNDUgdG8gaGFuZGxlIHRoZSBvdmVybGFwCisKIDIwMDgtMDQtMTIgIERhdmlk IEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIE1lbW9yeSBtYW5hZ2VtZW50IGNs ZWFudXAgZm9yIHRoZSBuZXcgU3R5bGVDYWNoZWRJbWFnZSBhbmQgU3R5bGVHZW5lcmF0ZWRJbWFn ZSBjbGFzc2VzLiAgTWFrZSB0aGUgYmFjayBlbmQKSW5kZXg6IFdlYkNvcmUvcGFnZS9pbnNwZWN0 b3IvUmVzb3VyY2VzUGFuZWwuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2luc3BlY3Rv ci9SZXNvdXJjZXNQYW5lbC5qcwkocmV2aXNpb24gMzE4NDgpCisrKyBXZWJDb3JlL3BhZ2UvaW5z cGVjdG9yL1Jlc291cmNlc1BhbmVsLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yNjIsOSArMjYyLDEz IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSAKIAogICAgICAgICB2 YXIgcGVyY2VudGFnZXMgPSB0aGlzLmNhbGN1bGF0b3IuY29tcHV0ZUJhckdyYXBoUGVyY2VudGFn ZXMocmVzb3VyY2UpOwogCi0gICAgICAgIHZhciBiYXJFbGVtZW50ID0gcmVzb3VyY2UuX3Jlc291 cmNlc1RyZWVFbGVtZW50LmJhckVsZW1lbnQ7Ci0gICAgICAgIGJhckVsZW1lbnQuc3R5bGUubGVm dCA9IHBlcmNlbnRhZ2VzLnN0YXJ0ICsgIiUiOwotICAgICAgICBiYXJFbGVtZW50LnN0eWxlLnJp Z2h0ID0gKDEwMCAtIHBlcmNlbnRhZ2VzLmVuZCkgKyAiJSI7CisgICAgICAgIHZhciBiYXJMZWZ0 RWxlbWVudCA9IHJlc291cmNlLl9yZXNvdXJjZXNUcmVlRWxlbWVudC5iYXJMZWZ0RWxlbWVudDsK KyAgICAgICAgYmFyTGVmdEVsZW1lbnQuc3R5bGUubGVmdCA9IHBlcmNlbnRhZ2VzLnN0YXJ0ICsg IiUiOworICAgICAgICBiYXJMZWZ0RWxlbWVudC5zdHlsZS5yaWdodCA9ICgxMDAgLSBwZXJjZW50 YWdlcy5lbmQpICsgIiUiOworICAgICAgICAKKyAgICAgICAgdmFyIGJhclJpZ2h0RWxlbWVudCA9 IHJlc291cmNlLl9yZXNvdXJjZXNUcmVlRWxlbWVudC5iYXJSaWdodEVsZW1lbnQ7CisgICAgICAg IGJhclJpZ2h0RWxlbWVudC5zdHlsZS5sZWZ0ID0gcGVyY2VudGFnZXMubWlkZGxlICsgIiUiOwor ICAgICAgICBiYXJSaWdodEVsZW1lbnQuc3R5bGUucmlnaHQgPSAoMTAwIC0gcGVyY2VudGFnZXMu ZW5kKSArICIlIjsKICAgICB9LAogCiAgICAgc2hvd1Jlc291cmNlOiBmdW5jdGlvbihyZXNvdXJj ZSkKQEAgLTg4NSw3ICs4ODksNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYWxjdWxhdG9yLnBy b3RvdHlwCiAKICAgICBjb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlczogZnVuY3Rpb24ocmVzb3Vy Y2UpCiAgICAgewotICAgICAgICByZXR1cm4ge3N0YXJ0OiAwLCBlbmQ6ICh0aGlzLl92YWx1ZShy ZXNvdXJjZSkgLyB0aGlzLmJvdW5kYXJ5U3BhbikgKiAxMDB9OworICAgICAgICByZXR1cm4ge3N0 YXJ0OiAwLCBtaWRkbGU6IDAsIGVuZDogKHRoaXMuX3ZhbHVlKHJlc291cmNlKSAvIHRoaXMuYm91 bmRhcnlTcGFuKSAqIDEwMH07CiAgICAgfSwKIAogICAgIGdldCBib3VuZGFyeVNwYW4oKQpAQCAt OTkwLDEzICs5OTQsMTggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJhbnNmZXJUaW1lQ2FsY3Vs YQogICAgICAgICAgICAgdmFyIHN0YXJ0ID0gKChyZXNvdXJjZS5zdGFydFRpbWUgLSB0aGlzLm1p bmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3BhbikgKiAxMDA7CiAgICAgICAgIGVsc2UK ICAgICAgICAgICAgIHZhciBzdGFydCA9IDEwMDsKLQorICAgICAgICAKKyAgICAgICAgaWYgKHJl c291cmNlLnJlc3BvbnNlUmVjZWl2ZWRUaW1lICE9PSAtMSkKKyAgICAgICAgICAgIHZhciBtaWRk bGUgPSAoKHJlc291cmNlLnJlc3BvbnNlUmVjZWl2ZWRUaW1lIC0gdGhpcy5taW5pbXVtQm91bmRh cnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4pICogMTAwOworICAgICAgICBlbHNlCisgICAgICAgICAg ICB2YXIgbWlkZGxlID0gMTAwOworICAgICAgICAKICAgICAgICAgaWYgKHJlc291cmNlLmVuZFRp bWUgIT09IC0xKQogICAgICAgICAgICAgdmFyIGVuZCA9ICgocmVzb3VyY2UuZW5kVGltZSAtIHRo aXMubWluaW11bUJvdW5kYXJ5KSAvIHRoaXMuYm91bmRhcnlTcGFuKSAqIDEwMDsKICAgICAgICAg ZWxzZQogICAgICAgICAgICAgdmFyIGVuZCA9IDEwMDsKIAotICAgICAgICByZXR1cm4ge3N0YXJ0 OiBzdGFydCwgZW5kOiBlbmR9OworICAgICAgICByZXR1cm4ge3N0YXJ0OiBzdGFydCwgbWlkZGxl OiBtaWRkbGUsIGVuZDogZW5kfTsKICAgICB9LAogCiAgICAgdXBkYXRlQm91bmRyaWVzOiBmdW5j dGlvbihyZXNvdXJjZSkKQEAgLTEwNTcsOSArMTA2NiwxMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VTaWRlYmFyVHJlZUVsZW1lbnQgCiAgICAgdGhpcy5iYXJBcmVhRWxlbWVudC5jbGFzc05hbWUg PSAicmVzb3VyY2VzLWdyYXBoLWJhci1hcmVhIjsKICAgICB0aGlzLmdyYXBoU2lkZUVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5iYXJBcmVhRWxlbWVudCk7CiAKLSAgICB0aGlzLmJhckVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLmJhckVsZW1lbnQuY2xh c3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1iYXIiOwotICAgIHRoaXMuYmFyQXJlYUVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5iYXJFbGVtZW50KTsKKyAgICB0aGlzLmJhckxlZnRFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5iYXJMZWZ0RWxlbWVudC5j bGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhciB3YWl0aW5nIjsKKyAgICB0aGlzLmJhckFy ZWFFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuYmFyTGVmdEVsZW1lbnQpOworICAgIAorICAgIHRo aXMuYmFyUmlnaHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAg dGhpcy5iYXJSaWdodEVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1iYXIiOwor ICAgIHRoaXMuYmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5iYXJSaWdodEVsZW1lbnQp OwogfQogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewpJbmRleDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcwkocmV2aXNpb24gMzE4 NDgpCisrKyBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MJKHdvcmtpbmcgY29w eSkKQEAgLTEzOTAsMTAgKzEzOTAsMTQgQEAgYm9keS5pbmFjdGl2ZSAuc2lkZWJhciB7CiAgICAg Ym9yZGVyLXdpZHRoOiA2cHggN3B4IDZweCA3cHg7CiAgICAgaGVpZ2h0OiAxM3B4OwogICAgIG1p bi13aWR0aDogMTRweDsKLSAgICBvcGFjaXR5OiAwLjg7CisgICAgb3BhY2l0eTogMC40NTsKICAg ICAtd2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxHcmF5LnBuZykg NiA3IDYgNzsKIH0KIAorLnJlc291cmNlcy1ncmFwaC1iYXIud2FpdGluZyB7CisgICAgb3BhY2l0 eTogMC4zNTsKK30KKwogLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRl Z29yeS1kb2N1bWVudHMgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVy LWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbEJsdWUucG5nKSA2IDcgNiA3OwogfQo= 20516 2008-04-13 21:38:31 -0700 2008-04-14 09:19:52 -0700 This tweaks opacities to look right, and sorts by response received time. inspector-response-time-bars-sorted.txt text/plain 5104 catfish.man SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTg1NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMDQtMTMgIERhdmlkIFNtaXRoICA8Y2F0ZmlzaC5tYW5AZ21h aWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAK KyAgICAgICAgLSBGaXggaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 MjU4CisgICAgICAgIFJlc3BvbnNlIHRpbWUgdnMuIGRvd25sb2FkIHRpbWUgc2hvdWxkIGJlIHNo b3duIGluIHRoZSBuZXR3b3JrIHByb2ZpbGUKKworICAgICAgICBXQVJOSU5HOiBOTyBURVNUIENB U0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL1Jlc291cmNl c1BhbmVsLmpzOiBIb29rIHVwIHRoZSBleGlzdGluZyBpbmZyYXN0cnVjdHVyZSB0byB0d28gYmFy cyBpbnN0ZWFkIG9mIG9uZTsgb25lIGZvciB0aGUgdG90YWwgdGltZSwgb25lIGZvciB0aGUgdGlt ZSBwb3N0LXJlc3BvbnNlLgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3M6 IEFkZCBhIG5ldyBydWxlIHRvIG1ha2UgdGhlIHdhaXRpbmcgYmFyIGhhdmUgYW4gb3BhY2l0eSBv ZiAwLjM1LCBhbmQgY2hhbmdlIHRoZSB0b3RhbCBiYXIgb3BhY2l0eSB0byAwLjQ1IHRvIGhhbmRs ZSB0aGUgb3ZlcmxhcAorCiAyMDA4LTA0LTEzICBKYW4gTWljaGFlbCBBbG9uem8gIDxqbWFsb256 b0B1bnBsdWdnYWJsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCklu ZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlLmpzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2UuanMJKHJldmlzaW9uIDMxODU1KQorKysgV2Vi Q29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZS5qcwkod29ya2luZyBjb3B5KQpAQCAtNTAyLDYg KzUwMiwxMCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogCiBXZWJJbnNw ZWN0b3IuUmVzb3VyY2UuQ29tcGFyZUJ5VGltZSA9IGZ1bmN0aW9uKGEsIGIpCiB7CisJaWYgKGEu cmVzcG9uc2VSZWNlaXZlZFRpbWUgPCBiLnJlc3BvbnNlUmVjZWl2ZWRUaW1lKQorICAgICAgICBy ZXR1cm4gLTE7CisgICAgaWYgKGEucmVzcG9uc2VSZWNlaXZlZFRpbWUgPiBiLnJlc3BvbnNlUmVj ZWl2ZWRUaW1lKQorICAgICAgICByZXR1cm4gMTsKICAgICBpZiAoYS5zdGFydFRpbWUgPCBiLnN0 YXJ0VGltZSkKICAgICAgICAgcmV0dXJuIC0xOwogICAgIGlmIChhLnN0YXJ0VGltZSA+IGIuc3Rh cnRUaW1lKQpJbmRleDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZXNQYW5lbC5qcwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVsLmpzCShy ZXZpc2lvbiAzMTg1NSkKKysrIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwu anMJKHdvcmtpbmcgY29weSkKQEAgLTI2Miw5ICsyNjIsMTMgQEAgV2ViSW5zcGVjdG9yLlJlc291 cmNlc1BhbmVsLnByb3RvdHlwZSA9IAogCiAgICAgICAgIHZhciBwZXJjZW50YWdlcyA9IHRoaXMu Y2FsY3VsYXRvci5jb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlcyhyZXNvdXJjZSk7CiAKLSAgICAg ICAgdmFyIGJhckVsZW1lbnQgPSByZXNvdXJjZS5fcmVzb3VyY2VzVHJlZUVsZW1lbnQuYmFyRWxl bWVudDsKLSAgICAgICAgYmFyRWxlbWVudC5zdHlsZS5sZWZ0ID0gcGVyY2VudGFnZXMuc3RhcnQg KyAiJSI7Ci0gICAgICAgIGJhckVsZW1lbnQuc3R5bGUucmlnaHQgPSAoMTAwIC0gcGVyY2VudGFn ZXMuZW5kKSArICIlIjsKKyAgICAgICAgdmFyIGJhckxlZnRFbGVtZW50ID0gcmVzb3VyY2UuX3Jl c291cmNlc1RyZWVFbGVtZW50LmJhckxlZnRFbGVtZW50OworICAgICAgICBiYXJMZWZ0RWxlbWVu dC5zdHlsZS5sZWZ0ID0gcGVyY2VudGFnZXMuc3RhcnQgKyAiJSI7CisgICAgICAgIGJhckxlZnRF bGVtZW50LnN0eWxlLnJpZ2h0ID0gKDEwMCAtIHBlcmNlbnRhZ2VzLmVuZCkgKyAiJSI7CisgICAg ICAgIAorICAgICAgICB2YXIgYmFyUmlnaHRFbGVtZW50ID0gcmVzb3VyY2UuX3Jlc291cmNlc1Ry ZWVFbGVtZW50LmJhclJpZ2h0RWxlbWVudDsKKyAgICAgICAgYmFyUmlnaHRFbGVtZW50LnN0eWxl LmxlZnQgPSBwZXJjZW50YWdlcy5taWRkbGUgKyAiJSI7CisgICAgICAgIGJhclJpZ2h0RWxlbWVu dC5zdHlsZS5yaWdodCA9ICgxMDAgLSBwZXJjZW50YWdlcy5lbmQpICsgIiUiOwogICAgIH0sCiAK ICAgICBzaG93UmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlKQpAQCAtODg1LDcgKzg4OSw3IEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhbGN1bGF0b3IucHJvdG90eXAKIAogICAgIGNvbXB1dGVC YXJHcmFwaFBlcmNlbnRhZ2VzOiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7Ci0gICAgICAgIHJl dHVybiB7c3RhcnQ6IDAsIGVuZDogKHRoaXMuX3ZhbHVlKHJlc291cmNlKSAvIHRoaXMuYm91bmRh cnlTcGFuKSAqIDEwMH07CisgICAgICAgIHJldHVybiB7c3RhcnQ6IDAsIG1pZGRsZTogMCwgZW5k OiAodGhpcy5fdmFsdWUocmVzb3VyY2UpIC8gdGhpcy5ib3VuZGFyeVNwYW4pICogMTAwfTsKICAg ICB9LAogCiAgICAgZ2V0IGJvdW5kYXJ5U3BhbigpCkBAIC05OTAsMTMgKzk5NCwxOCBAQCBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VUcmFuc2ZlclRpbWVDYWxjdWxhCiAgICAgICAgICAgICB2YXIgc3Rh cnQgPSAoKHJlc291cmNlLnN0YXJ0VGltZSAtIHRoaXMubWluaW11bUJvdW5kYXJ5KSAvIHRoaXMu Ym91bmRhcnlTcGFuKSAqIDEwMDsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdmFyIHN0YXJ0 ID0gMTAwOwotCisgICAgICAgIAorICAgICAgICBpZiAocmVzb3VyY2UucmVzcG9uc2VSZWNlaXZl ZFRpbWUgIT09IC0xKQorICAgICAgICAgICAgdmFyIG1pZGRsZSA9ICgocmVzb3VyY2UucmVzcG9u c2VSZWNlaXZlZFRpbWUgLSB0aGlzLm1pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3Bh bikgKiAxMDA7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHZhciBtaWRkbGUgPSAxMDA7Cisg ICAgICAgIAogICAgICAgICBpZiAocmVzb3VyY2UuZW5kVGltZSAhPT0gLTEpCiAgICAgICAgICAg ICB2YXIgZW5kID0gKChyZXNvdXJjZS5lbmRUaW1lIC0gdGhpcy5taW5pbXVtQm91bmRhcnkpIC8g dGhpcy5ib3VuZGFyeVNwYW4pICogMTAwOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB2YXIg ZW5kID0gMTAwOwogCi0gICAgICAgIHJldHVybiB7c3RhcnQ6IHN0YXJ0LCBlbmQ6IGVuZH07Cisg ICAgICAgIHJldHVybiB7c3RhcnQ6IHN0YXJ0LCBtaWRkbGU6IG1pZGRsZSwgZW5kOiBlbmR9Owog ICAgIH0sCiAKICAgICB1cGRhdGVCb3VuZHJpZXM6IGZ1bmN0aW9uKHJlc291cmNlKQpAQCAtMTA1 Nyw5ICsxMDY2LDEzIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudCAK ICAgICB0aGlzLmJhckFyZWFFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMtZ3JhcGgtYmFy LWFyZWEiOwogICAgIHRoaXMuZ3JhcGhTaWRlRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmJhckFy ZWFFbGVtZW50KTsKIAotICAgIHRoaXMuYmFyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpOwotICAgIHRoaXMuYmFyRWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWdy YXBoLWJhciI7Ci0gICAgdGhpcy5iYXJBcmVhRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmJhckVs ZW1lbnQpOworICAgIHRoaXMuYmFyTGVmdEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKKyAgICB0aGlzLmJhckxlZnRFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMt Z3JhcGgtYmFyIHdhaXRpbmciOworICAgIHRoaXMuYmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5iYXJMZWZ0RWxlbWVudCk7CisgICAgCisgICAgdGhpcy5iYXJSaWdodEVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLmJhclJpZ2h0RWxlbWVudC5j bGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhciI7CisgICAgdGhpcy5iYXJBcmVhRWxlbWVu dC5hcHBlbmRDaGlsZCh0aGlzLmJhclJpZ2h0RWxlbWVudCk7CiB9CiAKIFdlYkluc3BlY3Rvci5S ZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CkluZGV4OiBXZWJDb3JlL3Bh Z2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2lu c3BlY3Rvci9pbnNwZWN0b3IuY3NzCShyZXZpc2lvbiAzMTg1NSkKKysrIFdlYkNvcmUvcGFnZS9p bnNwZWN0b3IvaW5zcGVjdG9yLmNzcwkod29ya2luZyBjb3B5KQpAQCAtMTM5MCwxMCArMTM5MCwx NCBAQCBib2R5LmluYWN0aXZlIC5zaWRlYmFyIHsKICAgICBib3JkZXItd2lkdGg6IDZweCA3cHgg NnB4IDdweDsKICAgICBoZWlnaHQ6IDEzcHg7CiAgICAgbWluLXdpZHRoOiAxNHB4OwotICAgIG9w YWNpdHk6IDAuODsKKyAgICBvcGFjaXR5OiAwLjY1OwogICAgIC13ZWJraXQtYm9yZGVyLWltYWdl OiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbEdyYXkucG5nKSA2IDcgNiA3OwogfQogCisucmVzb3Vy Y2VzLWdyYXBoLWJhci53YWl0aW5nIHsKKyAgICBvcGFjaXR5OiAwLjM1OworfQorCiAucmVzb3Vy Y2Utc2lkZWJhci10cmVlLWl0ZW0ucmVzb3VyY2VzLWNhdGVnb3J5LWRvY3VtZW50cyAucmVzb3Vy Y2VzLWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6IHVybChJbWFnZXMvdGlt ZWxpbmVQaWxsQmx1ZS5wbmcpIDYgNyA2IDc7CiB9Cg==