79245 2012-02-22 08:46:44 -0800 Web Inspector: in start-at-zero mode of timeline panel, calculate window boundaries based on filtered events 2012-05-17 07:45:59 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 562007 0 caseq 2012-02-22 08:46:44 -0800 Only include records in selection window when calculating event boundaries (i.e. pick scale according to visible events). 562009 1 128223 caseq 2012-02-22 08:47:41 -0800 Created attachment 128223 Patch 562010 2 128223 pfeldman 2012-02-22 08:50:05 -0800 Comment on attachment 128223 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128223&action=review > Source/WebCore/inspector/front-end/TimelinePanel.js:748 > + if (!this._boundariesAreValid && !this._startAtZero) This looks like a hack, we should come up with a better filtering strategy. 564196 3 128708 caseq 2012-02-24 04:37:44 -0800 Created attachment 128708 Patch 564206 4 128708 pfeldman 2012-02-24 04:53:29 -0800 Comment on attachment 128708 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128708&action=review > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:161 > + this._presentationModel.setWindowTimes(leftTime, rightTime); setWindowTimes -> setVisibleRecords (range) 626570 5 caseq 2012-05-17 07:45:59 -0700 This has been fixed by another change and works well now. 128223 2012-02-22 08:47:41 -0800 2012-02-24 04:37:37 -0800 Patch bug-79245-20120222204738.patch text/plain 3058 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmY3N2U1OWZkNTNlZDRi NmQwNmZiZjY5M2M5NGY5YzQ2YWFkZTM3Ni4uMjg1ZmRlMmU0NDVkY2Q1ZTBlMTUzZGQ0MTI1NGI3 ZThkMDFhZWYxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDEyLTAyLTIyICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogaW4gc3RhcnQtYXQtemVybyBtb2RlIG9mIHRpbWVsaW5lIHBhbmVsLCBjYWxjdWxhdGUgd2lu ZG93IGJvdW5kYXJpZXMgYmFzZWQgb24gZmlsdGVyZWQgZXZlbnRzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTI0NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1l bGluZVBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90 eXBlLl9yZWZyZXNoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3Rv dHlwZS5fdXBkYXRlQm91bmRhcmllcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5wcm90b3R5cGUuX3JlZnJlc2hSZWNvcmRzKToKKworMjAxMi0wMi0yMiAgQW5kcmV5IEtv c3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGZp eCBtZW1vcnkgY291bnRlcnMgYW5kIHN0YXJ0LWF0LXplcm8gbW9kZXMgb2YgdGltZWxpbmUgcGFu ZWxzIHRvIGNvLWV4aXN0IG5pY2VseQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzkyNDEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IDFmNTk2YTkxODkwODNhYjI5YzYzZGMy OGUyYzZjZjVlNDI1OWNlMWUuLjYxZDkzMDdhNTQyNGRhYjA4YWQ0ZDRkNmI1MjA2ZjA0Y2EyMDlk ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxp bmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs aW5lUGFuZWwuanMKQEAgLTY4MywyNiArNjgzLDIzIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX292ZXJ2aWV3UGFu ZS51cGRhdGUodGhpcy5fcm9vdFJlY29yZC5jaGlsZHJlbiwgdGhpcy5fc2hvd1Nob3J0RXZlbnRz KTsKLQotICAgICAgICBpZiAoIXRoaXMuX2JvdW5kYXJpZXNBcmVWYWxpZCkKLSAgICAgICAgICAg IHRoaXMuX3VwZGF0ZUJvdW5kYXJpZXMoKTsKICAgICAgICAgdGhpcy5fcmVmcmVzaFJlY29yZHMo IXRoaXMuX2JvdW5kYXJpZXNBcmVWYWxpZCk7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVJlY29yZHND b3VudGVyKCk7Ci0gICAgICAgIGlmKCF0aGlzLl9ib3VuZGFyaWVzQXJlVmFsaWQpCisgICAgICAg IGlmICghdGhpcy5fYm91bmRhcmllc0FyZVZhbGlkKQogICAgICAgICAgICAgdGhpcy5fdXBkYXRl RXZlbnREaXZpZGVycygpOwogICAgICAgICBpZiAodGhpcy5fbWVtb3J5U3RhdGlzdGljcyAmJiB0 aGlzLl9tZW1vcnlTdGF0aXN0aWNzLnZpc2libGUoKSkKICAgICAgICAgICAgIHRoaXMuX21lbW9y eVN0YXRpc3RpY3MucmVmcmVzaCgpOwogICAgICAgICB0aGlzLl9ib3VuZGFyaWVzQXJlVmFsaWQg PSB0cnVlOwogICAgIH0sCiAKLSAgICBfdXBkYXRlQm91bmRhcmllczogZnVuY3Rpb24oKQorICAg IF91cGRhdGVCb3VuZGFyaWVzOiBmdW5jdGlvbihyZWNvcmRzKQogICAgIHsKICAgICAgICAgdGhp cy5fY2FsY3VsYXRvci5yZXNldCgpOwogICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLndpbmRvd0xl ZnQgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC53aW5kb3dMZWZ0OwogICAgICAgICB0aGlzLl9j YWxjdWxhdG9yLndpbmRvd1JpZ2h0ID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwud2luZG93Umln aHQ7CiAKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9yb290UmVjb3JkLmNoaWxk cmVuLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgdGhpcy5fY2FsY3VsYXRvci51cGRhdGVCb3Vu ZGFyaWVzKHRoaXMuX3Jvb3RSZWNvcmQuY2hpbGRyZW5baV0pOworICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHJlY29yZHMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICB0aGlzLl9jYWxjdWxh dG9yLnVwZGF0ZUJvdW5kYXJpZXMocmVjb3Jkc1tpXSk7CiAKICAgICAgICAgdGhpcy5fY2FsY3Vs YXRvci5jYWxjdWxhdGVXaW5kb3coKTsKICAgICB9LApAQCAtNzQ4LDcgKzc0NSwxMSBAQCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBfcmVmcmVzaFJlY29y ZHM6IGZ1bmN0aW9uKHVwZGF0ZUJvdW5kYXJpZXMpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMu X2JvdW5kYXJpZXNBcmVWYWxpZCAmJiAhdGhpcy5fc3RhcnRBdFplcm8pCisgICAgICAgICAgICB0 aGlzLl91cGRhdGVCb3VuZGFyaWVzKHRoaXMuX3Jvb3RSZWNvcmQuY2hpbGRyZW4pOwogICAgICAg ICB2YXIgcmVjb3Jkc0luV2luZG93ID0gdGhpcy5fZmlsdGVyUmVjb3JkcygpOworICAgICAgICBp ZiAoIXRoaXMuX2JvdW5kYXJpZXNBcmVWYWxpZCAmJiB0aGlzLl9zdGFydEF0WmVybykKKyAgICAg ICAgICAgIHRoaXMuX3VwZGF0ZUJvdW5kYXJpZXMocmVjb3Jkc0luV2luZG93KTsKIAogICAgICAg ICAvLyBDYWxjdWxhdGUgdGhlIHZpc2libGUgYXJlYS4KICAgICAgICAgdGhpcy5fc2Nyb2xsVG9w ID0gdGhpcy5fY29udGFpbmVyRWxlbWVudC5zY3JvbGxUb3A7Cg== 128708 2012-02-24 04:37:44 -0800 2012-02-24 04:53:28 -0800 Patch bug-79245-20120224163742.patch text/plain 15054 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGIzYTM2ZGE4N2Y1MjY3 NzliMzQ1ZDJkYzcwYzhmNmU0YTY3MTVkNC4uOWMzM2I5ODk4YTEyODNmYjZhNDQzZWUzMWQyZGRk YTZjN2E3MzNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAyLTIyICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogaW4gc3RhcnQtYXQtemVybyBtb2RlIG9mIHRpbWVsaW5lIHBhbmVsLCBjYWxjdWxhdGUgd2lu ZG93IGJvdW5kYXJpZXMgYmFzZWQgb24gZmlsdGVyZWQgZXZlbnRzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTI0NQorCisgICAgICAgIC0gdXNlIGFi c29sdXRlICh0aW1lKSBib3VuZGFyaWVzIHdoZW4gZmlsdGVyaW5nIHJlY29yZHM7IGtlZXAgdGhl bSBpbiBUaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsCisgICAgICAgIC0gcmVjYWxjdWxhdGUgZXZl bnQgYm91bmRhcmllcyBhZnRlciBmaWx0ZXJpbmcgZXZlbnRzICh1c2VkIHRvIGJlIGJlZm9yZSkK KyAgICAgICAgLSBmZXcgZHJpdmUtYnkgZml4ZXMgYXJvdW5kIE1lbW9yeVN0YXRpc3RpY3MKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZVBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQYW5lbC5wcm90b3R5cGUuX3VwZGF0ZUJvdW5kYXJpZXMpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9yZWZyZXNoUmVjb3Jkcyk6CisKIDIwMTIt MDItMjQgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1ha2Ug Tm9kZTo6c2hvd1RyZWVGb3JUaGlzIChhbmQgTm9kZTo6c2hvd1RyZWVGb3JUaGlzQWNyb3NzRnJh bWUpIGR1bXAgbXVsdGlwbGUgc2hhZG93IHJvb3RzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNzLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNzLmpzCmluZGV4IGQ5ZDJmYmNm ZmJhMjQ3ZjMwODVlMGU2YmMxN2E5NDQ4M2M5YWMzODIuLjE5OGQ2MzVlNTI3MGY5ZGRjZGI0MDQ0 NzY5M2JiMjQ2ZTNiNjY0YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3RpY3MuanMKQEAgLTEzNSwxMSArMTM1LDExIEBAIFdl Ykluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJu IGNvbnRhaW5lcjsKICAgICB9LAogCi0gICAgYWRkVGltbGluZUV2ZW50OiBmdW5jdGlvbihldmVu dCkKKyAgICBhZGRUaW1saW5lUmVjb3JkOiBmdW5jdGlvbihyZWNvcmQpCiAgICAgewotICAgICAg ICB2YXIgY291bnRlcnMgPSBldmVudC5kYXRhWyJjb3VudGVycyJdOworICAgICAgICB2YXIgY291 bnRlcnMgPSByZWNvcmRbImNvdW50ZXJzIl07CiAgICAgICAgIHRoaXMuX2NvdW50ZXJzLnB1c2go ewotICAgICAgICAgICAgdGltZTogZXZlbnQuZGF0YS5lbmRUaW1lIHx8IGV2ZW50LmRhdGEuc3Rh cnRUaW1lLAorICAgICAgICAgICAgdGltZTogcmVjb3JkLmVuZFRpbWUgfHwgcmVjb3JkLnN0YXJ0 VGltZSwKICAgICAgICAgICAgIGRvY3VtZW50Q291bnQ6IGNvdW50ZXJzWyJkb2N1bWVudHMiXSwK ICAgICAgICAgICAgIG5vZGVDb3VudDogY291bnRlcnNbIm5vZGVzIl0sCiAgICAgICAgICAgICBs aXN0ZW5lckNvdW50OiBjb3VudGVyc1sianNFdmVudExpc3RlbmVycyJdCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFu ZS5qcwppbmRleCA4NTg3NDJjNmM1YTRiMGMwMGUxOGY4MDMwMWZmY2Y5MTk5Yzc3NTkzLi41Njgz NWMyNjRjYWI0MGY2OTJmYjk5ZWQzZGY1ZTAxYTYwOGRiMThlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUu anMKQEAgLTE1Miw3ICsxNTIsMTMgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5l LnByb3RvdHlwZSA9IHsKIAogICAgIF9vbldpbmRvd0NoYW5nZWQ6IGZ1bmN0aW9uKCkKICAgICB7 Ci0gICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNldFdpbmRvd1Bvc2l0aW9uKHRoaXMu X292ZXJ2aWV3V2luZG93LndpbmRvd0xlZnQsIHRoaXMuX292ZXJ2aWV3V2luZG93LndpbmRvd1Jp Z2h0KTsKKyAgICAgICAgdmFyIHRpbWVTcGFuID0gdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLmJv dW5kYXJ5U3BhbjsKKyAgICAgICAgdmFyIGxlZnRUaW1lID0gdGhpcy5fb3ZlcnZpZXdDYWxjdWxh dG9yLm1pbmltdW1Cb3VuZGFyeSArIHRoaXMuX292ZXJ2aWV3V2luZG93LndpbmRvd0xlZnQgKiB0 aW1lU3BhbjsKKyAgICAgICAgdmFyIHJpZ2h0VGltZSA9IHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRv ci5taW5pbXVtQm91bmRhcnkgKyB0aGlzLl9vdmVydmlld1dpbmRvdy53aW5kb3dSaWdodCAqIHRp bWVTcGFuOworICAgICAgICBpZiAocmlnaHRUaW1lICsgdGltZVNwYW4gLyAxMDAgPj0gdGhpcy5f b3ZlcnZpZXdDYWxjdWxhdG9yLm1heGltdW1Cb3VuZGFyeSkKKyAgICAgICAgICAgIHJpZ2h0VGlt ZSA9IG51bGw7CisKKyAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuc2V0V2luZG93VGlt ZXMobGVmdFRpbWUsIHJpZ2h0VGltZSk7CiAgICAgfSwKIAogICAgIF9vbkNhdGVnb3J5VmlzaWJp bGl0eUNoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQpAQCAtNDk2LDE1ICs1MDIsMTAgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdDYWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKIAogICAgIHVw ZGF0ZUJvdW5kYXJpZXM6IGZ1bmN0aW9uKHJlY29yZCkKICAgICB7Ci0gICAgICAgIGlmICh0eXBl b2YgdGhpcy5taW5pbXVtQm91bmRhcnkgPT09ICJ1bmRlZmluZWQiIHx8IHJlY29yZC5zdGFydFRp bWUgPCB0aGlzLm1pbmltdW1Cb3VuZGFyeSkgeworICAgICAgICBpZiAodHlwZW9mIHRoaXMubWlu aW11bUJvdW5kYXJ5ID09PSAidW5kZWZpbmVkIiB8fCByZWNvcmQuc3RhcnRUaW1lIDwgdGhpcy5t aW5pbXVtQm91bmRhcnkpCiAgICAgICAgICAgICB0aGlzLm1pbmltdW1Cb3VuZGFyeSA9IHJlY29y ZC5zdGFydFRpbWU7Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotICAgICAg ICBpZiAodHlwZW9mIHRoaXMubWF4aW11bUJvdW5kYXJ5ID09PSAidW5kZWZpbmVkIiB8fCByZWNv cmQuZW5kVGltZSA+IHRoaXMubWF4aW11bUJvdW5kYXJ5KSB7CisgICAgICAgIGlmICh0eXBlb2Yg dGhpcy5tYXhpbXVtQm91bmRhcnkgPT09ICJ1bmRlZmluZWQiIHx8IHJlY29yZC5lbmRUaW1lID4g dGhpcy5tYXhpbXVtQm91bmRhcnkpCiAgICAgICAgICAgICB0aGlzLm1heGltdW1Cb3VuZGFyeSA9 IHJlY29yZC5lbmRUaW1lOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0sCiAKICAgICBnZXQgYm91bmRhcnlTcGFuKCkKQEAg LTc2MCw3ICs3NjEsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTdGFydEF0WmVyb092ZXJ2aWV3 LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fY2FsY3VsYXRvci5yZXNldCgpOwogICAgICAg ICByZWNvcmRzID0gdGhpcy5fZmlsdGVyUmVjb3JkcyhyZWNvcmRzKTsKICAgICAgICAgcmVjb3Jk cy5mb3JFYWNoKHRoaXMuX2NhbGN1bGF0b3IudXBkYXRlQm91bmRhcmllcywgdGhpcy5fY2FsY3Vs YXRvcik7Ci0gICAgICAgIHRoaXMuX2NhbGN1bGF0b3IuY2FsY3VsYXRlV2luZG93KCk7CiAKICAg ICAgICAgdmFyIHNjYWxlID0gKHRoaXMuX292ZXJ2aWV3RWxlbWVudC5jbGllbnRIZWlnaHQgLSA0 KSAvIHRoaXMuX2NhbGN1bGF0b3IuYm91bmRhcnlTcGFuOwogICAgICAgICB0aGlzLl9yZWNvcmRz UGVyQmFyID0gTWF0aC5tYXgoMSwgcmVjb3Jkcy5sZW5ndGggKiA0IC8gdGhpcy5lbGVtZW50LmNs aWVudFdpZHRoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGltZWxpbmVQYW5lbC5qcwppbmRleCBiZjU4MGNkMjEzZTc1ZDk2YjUzNGYwYmY4NDZlYjZjOTBm MWYyN2Y4Li4xNTRjYjAzNjU5YjI3YzQ1YjllYzA4YTc5ODllYjQ1Njc1ODk4ZjA2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpz CkBAIC00ODMsNyArNDgzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLl9yZXNldFBhbmVsKCk7CiAgICAgICAgIHZhciByZWNvcmRzID0g dGhpcy5fbW9kZWwucmVjb3JkczsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZWNvcmRz Lmxlbmd0aDsgKytpKQotICAgICAgICAgICAgdGhpcy5faW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5l KHJlY29yZHNbaV0sIHRoaXMuX3Jvb3RSZWNvcmQpOworICAgICAgICAgICAgdGhpcy5fYWRkUmVj b3JkVG9UaW1lbGluZShyZWNvcmRzW2ldKTsKICAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNo KGZhbHNlKTsKICAgICB9LAogCkBAIC00OTQsMTEgKzQ5NCw4IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZVBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9vblRpbWVsaW5lRXZlbnRSZWNvcmRlZDog ZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9pbm5lckFkZFJlY29yZFRvVGlt ZWxpbmUoZXZlbnQuZGF0YSwgdGhpcy5fcm9vdFJlY29yZCk7CisgICAgICAgIHRoaXMuX2FkZFJl Y29yZFRvVGltZWxpbmUoZXZlbnQuZGF0YSk7CiAgICAgICAgIHRoaXMuX3NjaGVkdWxlUmVmcmVz aChmYWxzZSk7Ci0KLSAgICAgICAgaWYgKHRoaXMuX21lbW9yeVN0YXRpc3RpY3MgJiYgZXZlbnQu ZGF0YVsiY291bnRlcnMiXSkKLSAgICAgICAgICAgIHRoaXMuX21lbW9yeVN0YXRpc3RpY3MuYWRk VGltbGluZUV2ZW50KGV2ZW50KTsKICAgICB9LAogCiAgICAgX2ZpbmRQYXJlbnRSZWNvcmQ6IGZ1 bmN0aW9uKHJlY29yZCkKQEAgLTUyMSw2ICs1MTgsMTMgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gcGFyZW50UmVjb3JkOwogICAgIH0s CiAKKyAgICBfYWRkUmVjb3JkVG9UaW1lbGluZTogZnVuY3Rpb24ocmVjb3JkKQorICAgIHsKKyAg ICAgICAgdGhpcy5faW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZCwgdGhpcy5fcm9vdFJl Y29yZCk7CisgICAgICAgIGlmICh0aGlzLl9tZW1vcnlTdGF0aXN0aWNzICYmIHJlY29yZFsiY291 bnRlcnMiXSkKKyAgICAgICAgICAgIHRoaXMuX21lbW9yeVN0YXRpc3RpY3MuYWRkVGltbGluZVJl Y29yZChyZWNvcmQpOworICAgIH0sCisKICAgICBfaW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lOiBm dW5jdGlvbihyZWNvcmQsIHBhcmVudFJlY29yZCkKICAgICB7CiAgICAgICAgIHZhciBjb25uZWN0 ZWRUb09sZFJlY29yZCA9IGZhbHNlOwpAQCAtNzAzLDM1ICs3MDcsMzAgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5f b3ZlcnZpZXdQYW5lLnVwZGF0ZSh0aGlzLl9yb290UmVjb3JkLmNoaWxkcmVuLCB0aGlzLl9zaG93 U2hvcnRFdmVudHMpOwotCi0gICAgICAgIGlmICghdGhpcy5fYm91bmRhcmllc0FyZVZhbGlkKQot ICAgICAgICAgICAgdGhpcy5fdXBkYXRlQm91bmRhcmllcygpOwogICAgICAgICB0aGlzLl9yZWZy ZXNoUmVjb3JkcyghdGhpcy5fYm91bmRhcmllc0FyZVZhbGlkKTsKICAgICAgICAgdGhpcy5fdXBk YXRlUmVjb3Jkc0NvdW50ZXIoKTsKLSAgICAgICAgaWYoIXRoaXMuX2JvdW5kYXJpZXNBcmVWYWxp ZCkKKyAgICAgICAgaWYgKCF0aGlzLl9ib3VuZGFyaWVzQXJlVmFsaWQpCiAgICAgICAgICAgICB0 aGlzLl91cGRhdGVFdmVudERpdmlkZXJzKCk7CiAgICAgICAgIGlmICh0aGlzLl9tZW1vcnlTdGF0 aXN0aWNzICYmIHRoaXMuX21lbW9yeVN0YXRpc3RpY3MudmlzaWJsZSgpKQogICAgICAgICAgICAg dGhpcy5fbWVtb3J5U3RhdGlzdGljcy5yZWZyZXNoKCk7CiAgICAgICAgIHRoaXMuX2JvdW5kYXJp ZXNBcmVWYWxpZCA9IHRydWU7CiAgICAgfSwKIAotICAgIF91cGRhdGVCb3VuZGFyaWVzOiBmdW5j dGlvbigpCisgICAgX3VwZGF0ZUJvdW5kYXJpZXM6IGZ1bmN0aW9uKHJlY29yZHMpCiAgICAgewog ICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLnJlc2V0KCk7Ci0gICAgICAgIHRoaXMuX2NhbGN1bGF0 b3Iud2luZG93TGVmdCA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLndpbmRvd0xlZnQ7Ci0gICAg ICAgIHRoaXMuX2NhbGN1bGF0b3Iud2luZG93UmlnaHQgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2Rl bC53aW5kb3dSaWdodDsKIAotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3Jvb3RS ZWNvcmQuY2hpbGRyZW4ubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB0aGlzLl9jYWxjdWxhdG9y LnVwZGF0ZUJvdW5kYXJpZXModGhpcy5fcm9vdFJlY29yZC5jaGlsZHJlbltpXSk7CisgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgcmVjb3Jkcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHRo aXMuX2NhbGN1bGF0b3IudXBkYXRlQm91bmRhcmllcyhyZWNvcmRzW2ldKTsKIAotICAgICAgICB0 aGlzLl9jYWxjdWxhdG9yLmNhbGN1bGF0ZVdpbmRvdygpOworICAgICAgICB0aGlzLl9jYWxjdWxh dG9yLnNldFdpbmRvdyh0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC53aW5kb3dUaW1lTGVmdCwgdGhp cy5fcHJlc2VudGF0aW9uTW9kZWwud2luZG93VGltZVJpZ2h0KTsKICAgICB9LAogCiAgICAgX2Zp bHRlclJlY29yZHM6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciByZWNvcmRzSW5XaW5k b3cgPSBbXTsKICAgICAgICAgdmFyIGZpbHRlciA9IHRoaXMuX3N0YXJ0QXRaZXJvID8gbmV3IFdl Ykluc3BlY3Rvci5UaW1lbGluZVN0YXJ0QXRaZXJvUmVjb3JkRmlsdGVyKHRoaXMuX3ByZXNlbnRh dGlvbk1vZGVsLCB0aGlzLl9yb290UmVjb3JkLCB0aGlzLl9zaG93U2hvcnRFdmVudHMpCi0gICAg ICAgICAgICA6IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRGaWx0ZXIodGhpcy5fY2Fs Y3VsYXRvciwgdGhpcy5fc2hvd1Nob3J0RXZlbnRzKTsKKyAgICAgICAgICAgIDogbmV3IFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZEZpbHRlcih0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCwgdGhp cy5fc2hvd1Nob3J0RXZlbnRzKTsKICAgICAgICAgdGhpcy5fcm9vdFJlY29yZC5fdmlzaWJsZVJl Y29yZHNDb3VudCA9IDA7CiAKICAgICAgICAgdmFyIHN0YWNrID0gW3tjaGlsZHJlbjogdGhpcy5f cm9vdFJlY29yZC5jaGlsZHJlbiwgaW5kZXg6IDAsIHBhcmVudElzQ29sbGFwc2VkOiBmYWxzZX1d OwpAQCAtNzY5LDYgKzc2OCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlw ZSA9IHsKICAgICBfcmVmcmVzaFJlY29yZHM6IGZ1bmN0aW9uKHVwZGF0ZUJvdW5kYXJpZXMpCiAg ICAgewogICAgICAgICB2YXIgcmVjb3Jkc0luV2luZG93ID0gdGhpcy5fZmlsdGVyUmVjb3Jkcygp OworICAgICAgICBpZiAodXBkYXRlQm91bmRhcmllcykKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0 ZUJvdW5kYXJpZXMocmVjb3Jkc0luV2luZG93KTsKIAogICAgICAgICAvLyBDYWxjdWxhdGUgdGhl IHZpc2libGUgYXJlYS4KICAgICAgICAgdGhpcy5fc2Nyb2xsVG9wID0gdGhpcy5fY29udGFpbmVy RWxlbWVudC5zY3JvbGxUb3A7CkBAIC04NDEsNyArODQyLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9pdGVtc0dyYXBoc0VsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5fZXhwYW5kRWxlbWVudHMpOwogICAgICAgICB0aGlzLnNwbGl0Vmll dy5zaWRlYmFyUmVzaXplckVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gdGhpcy5zaWRlYmFyRWxlbWVu dC5jbGllbnRIZWlnaHQgKyAicHgiOwogICAgICAgICAvLyBSZXNlcnZlIHNvbWUgcm9vbSBmb3Ig ZXhwYW5kIC8gY29sbGFwc2UgY29udHJvbHMgdG8gdGhlIGxlZnQgZm9yIHJlY29yZHMgdGhhdCBz dGFydCBhdCAwbXMuCi0gICAgICAgIHZhciB0aW1lbGluZVBhZGRpbmdMZWZ0ID0gdGhpcy5fY2Fs Y3VsYXRvci53aW5kb3dMZWZ0ID09PSAwID8gdGhpcy5fZXhwYW5kT2Zmc2V0IDogMDsKKyAgICAg ICAgdmFyIHRpbWVsaW5lUGFkZGluZ0xlZnQgPSB0aGlzLl9jYWxjdWxhdG9yLmlzV2luZG93QXRT dGFydCgpID8gdGhpcy5fZXhwYW5kT2Zmc2V0IDogMDsKICAgICAgICAgaWYgKHVwZGF0ZUJvdW5k YXJpZXMpCiAgICAgICAgICAgICB0aGlzLl90aW1lbGluZUdyaWQudXBkYXRlRGl2aWRlcnModHJ1 ZSwgdGhpcy5fY2FsY3VsYXRvciwgdGltZWxpbmVQYWRkaW5nTGVmdCk7CiAgICAgICAgIHRoaXMu X2FkanVzdFNjcm9sbFBvc2l0aW9uKChyZWNvcmRzSW5XaW5kb3cubGVuZ3RoICsgMSkgKiByb3dI ZWlnaHQpOwpAQCAtOTIwLDggKzkyMSw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5 ID0gZnVuY3Rpb24obmFtZSwgdGl0bGUsIGNvbG9yKQogV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2Fs Y3VsYXRvciA9IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLnJlc2V0KCk7Ci0gICAgdGhpcy53aW5k b3dMZWZ0ID0gMC4wOwotICAgIHRoaXMud2luZG93UmlnaHQgPSAxLjA7CiB9CiAKIFdlYkluc3Bl Y3Rvci5UaW1lbGluZUNhbGN1bGF0b3IucHJvdG90eXBlID0gewpAQCAtOTQ4LDEzICs5NDcsMTgg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAg IHJldHVybiB7bGVmdDogbGVmdCwgd2lkdGg6IHdpZHRoLCB3aWR0aFdpdGhDaGlsZHJlbjogd2lk dGhXaXRoQ2hpbGRyZW59OwogICAgIH0sCiAKLSAgICBjYWxjdWxhdGVXaW5kb3c6IGZ1bmN0aW9u KCkKKyAgICBzZXRXaW5kb3c6IGZ1bmN0aW9uKGxlZnQsIHJpZ2h0KQogICAgIHsKLSAgICAgICAg dGhpcy5taW5pbXVtQm91bmRhcnkgPSB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSArIHRo aXMud2luZG93TGVmdCAqICh0aGlzLl9hYnNvbHV0ZU1heGltdW1Cb3VuZGFyeSAtIHRoaXMuX2Fi c29sdXRlTWluaW11bUJvdW5kYXJ5KTsKLSAgICAgICAgdGhpcy5tYXhpbXVtQm91bmRhcnkgPSB0 aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSArIHRoaXMud2luZG93UmlnaHQgKiAodGhpcy5f YWJzb2x1dGVNYXhpbXVtQm91bmRhcnkgLSB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSk7 CisgICAgICAgIHRoaXMubWluaW11bUJvdW5kYXJ5ID0gbGVmdCA/IGxlZnQgOiB0aGlzLl9hYnNv bHV0ZU1pbmltdW1Cb3VuZGFyeTsKKyAgICAgICAgdGhpcy5tYXhpbXVtQm91bmRhcnkgPSByaWdo dCA/IHJpZ2h0IDogdGhpcy5fYWJzb2x1dGVNYXhpbXVtQm91bmRhcnk7CiAgICAgICAgIHRoaXMu Ym91bmRhcnlTcGFuID0gdGhpcy5tYXhpbXVtQm91bmRhcnkgLSB0aGlzLm1pbmltdW1Cb3VuZGFy eTsKICAgICB9LAogCisgICAgaXNXaW5kb3dBdFN0YXJ0OiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICByZXR1cm4gdGhpcy5taW5pbXVtQm91bmRhcnkgPT09IHRoaXMuX2Fic29sdXRlTWluaW11 bUJvdW5kYXJ5OworICAgIH0sCisKICAgICByZXNldDogZnVuY3Rpb24oKQogICAgIHsKICAgICAg ICAgdGhpcy5fYWJzb2x1dGVNaW5pbXVtQm91bmRhcnkgPSAtMTsKQEAgLTk4Nyw4ICs5OTEsNiBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVN0YXJ0QXRaZXJvQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKCkKIHsKICAgICB0 aGlzLnJlc2V0KCk7Ci0gICAgdGhpcy53aW5kb3dMZWZ0ID0gMC4wOwotICAgIHRoaXMud2luZG93 UmlnaHQgPSAxLjA7CiB9CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVN0YXJ0QXRaZXJvQ2FsY3Vs YXRvci5wcm90b3R5cGUgPSB7CkBAIC0xMDAyLDUyICsxMDA0LDM3IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZVN0YXJ0QXRaZXJvQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIH07CiAg ICAgfSwKIAotICAgIGNvbXB1dGVCYXJHcmFwaFdpbmRvd1Bvc2l0aW9uOiBmdW5jdGlvbihyZWNv cmQsIGNsaWVudFdpZHRoKQotICAgIHsKLSAgICAgICAgY29uc3QgbWluV2lkdGggPSA1OwotICAg ICAgICBjb25zdCBib3JkZXJXaWR0aCA9IDQ7Ci0gICAgICAgIHZhciB3b3JraW5nQXJlYSA9IGNs aWVudFdpZHRoIC0gbWluV2lkdGggLSBib3JkZXJXaWR0aDsKLSAgICAgICAgdmFyIHBlcmNlbnRh Z2VzID0gdGhpcy5jb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlcyhyZWNvcmQpOwotICAgICAgICB2 YXIgbGVmdCA9IHBlcmNlbnRhZ2VzLnN0YXJ0IC8gMTAwICogd29ya2luZ0FyZWE7Ci0gICAgICAg IHZhciB3aWR0aCA9IChwZXJjZW50YWdlcy5lbmQgLSBwZXJjZW50YWdlcy5zdGFydCkgLyAxMDAg KiB3b3JraW5nQXJlYSArIG1pbldpZHRoOwotICAgICAgICB2YXIgd2lkdGhXaXRoQ2hpbGRyZW4g PSAgKHBlcmNlbnRhZ2VzLmVuZFdpdGhDaGlsZHJlbiAtIHBlcmNlbnRhZ2VzLnN0YXJ0KSAvIDEw MCAqIHdvcmtpbmdBcmVhOwotICAgICAgICBpZiAocGVyY2VudGFnZXMuZW5kV2l0aENoaWxkcmVu ID4gcGVyY2VudGFnZXMuZW5kKQotICAgICAgICAgICAgd2lkdGhXaXRoQ2hpbGRyZW4gKz0gYm9y ZGVyV2lkdGggKyBtaW5XaWR0aDsKLQotICAgICAgICByZXR1cm4ge2xlZnQ6IGxlZnQsIHdpZHRo OiB3aWR0aCwgd2lkdGhXaXRoQ2hpbGRyZW46IHdpZHRoV2l0aENoaWxkcmVufTsKLSAgICB9LAot Ci0gICAgY2FsY3VsYXRlV2luZG93OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLm1p bmltdW1Cb3VuZGFyeSA9IHRoaXMuX2Fic29sdXRlTWluaW11bUJvdW5kYXJ5OwotICAgICAgICB0 aGlzLm1heGltdW1Cb3VuZGFyeSA9IHRoaXMuX2Fic29sdXRlTWF4aW11bUJvdW5kYXJ5ICogMS4w NTsKLSAgICAgICAgdGhpcy5ib3VuZGFyeVNwYW4gPSB0aGlzLm1heGltdW1Cb3VuZGFyeSA+PSAw ID8gdGhpcy5tYXhpbXVtQm91bmRhcnkgOiAwOwotICAgIH0sCi0KICAgICByZXNldDogZnVuY3Rp b24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fYWJzb2x1dGVNaW5pbXVtQm91bmRhcnkgPSAtMTsK LSAgICAgICAgdGhpcy5fYWJzb2x1dGVNYXhpbXVtQm91bmRhcnkgPSAtMTsKKyAgICAgICAgdGhp cy5taW5pbXVtQm91bmRhcnkgPSAtMTsKKyAgICAgICAgdGhpcy5tYXhpbXVtQm91bmRhcnkgPSAt MTsKICAgICB9LAogCiAgICAgdXBkYXRlQm91bmRhcmllczogZnVuY3Rpb24ocmVjb3JkKQogICAg IHsKICAgICAgICAgdmFyIGxvd2VyQm91bmQgPSByZWNvcmQuc3RhcnRUaW1lOwotICAgICAgICBp ZiAodGhpcy5fYWJzb2x1dGVNaW5pbXVtQm91bmRhcnkgPT09IC0xIHx8IGxvd2VyQm91bmQgPCB0 aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSkKLSAgICAgICAgICAgIHRoaXMuX2Fic29sdXRl TWluaW11bUJvdW5kYXJ5ID0gbG93ZXJCb3VuZDsKKyAgICAgICAgaWYgKHRoaXMubWluaW11bUJv dW5kYXJ5ID09PSAtMSB8fCBsb3dlckJvdW5kIDwgdGhpcy5taW5pbXVtQm91bmRhcnkpCisgICAg ICAgICAgICB0aGlzLm1pbmltdW1Cb3VuZGFyeSA9IGxvd2VyQm91bmQ7CiAKICAgICAgICAgY29u c3QgbWluaW11bVRpbWVGcmFtZSA9IDAuMDAxOwogICAgICAgICB2YXIgdXBwZXJCb3VuZCA9IE1h dGgubWF4KHJlY29yZC5lbmRUaW1lIC0gcmVjb3JkLnN0YXJ0VGltZSwgbWluaW11bVRpbWVGcmFt ZSk7Ci0gICAgICAgIGlmICh0aGlzLl9hYnNvbHV0ZU1heGltdW1Cb3VuZGFyeSA9PT0gLTEgfHwg dXBwZXJCb3VuZCA+IHRoaXMuX2Fic29sdXRlTWF4aW11bUJvdW5kYXJ5KQotICAgICAgICAgICAg dGhpcy5fYWJzb2x1dGVNYXhpbXVtQm91bmRhcnkgPSB1cHBlckJvdW5kOworICAgICAgICBpZiAo dGhpcy5tYXhpbXVtQm91bmRhcnkgPT09IC0xIHx8IHVwcGVyQm91bmQgPiB0aGlzLm1heGltdW1C b3VuZGFyeSkKKyAgICAgICAgICAgIHRoaXMubWF4aW11bUJvdW5kYXJ5ID0gdXBwZXJCb3VuZDsK KyAgICAgICAgdGhpcy5ib3VuZGFyeVNwYW4gPSB0aGlzLm1heGltdW1Cb3VuZGFyeSA+PSAwID8g dGhpcy5tYXhpbXVtQm91bmRhcnkgOiAwOwogICAgIH0sCiAKICAgICBmb3JtYXRWYWx1ZTogZnVu Y3Rpb24odmFsdWUpCiAgICAgewogICAgICAgICByZXR1cm4gTnVtYmVyLnNlY29uZHNUb1N0cmlu Zyh2YWx1ZSwgdHJ1ZSk7CisgICAgfSwKKworICAgIHNldFdpbmRvdzogZnVuY3Rpb24oKQorICAg IHsKICAgICB9CiB9OwogCitXZWJJbnNwZWN0b3IuVGltZWxpbmVTdGFydEF0WmVyb0NhbGN1bGF0 b3IucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0b3Iu cHJvdG90eXBlOworCiAvKioKICAqIEBjb25zdHJ1Y3RvcgogICovCkBAIC0xNjYyLDggKzE2NDks OCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMgPSB7CiBX ZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAg cmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMud2luZG93TGVmdCA9IDAuMDsK LSAgICAgICAgdGhpcy53aW5kb3dSaWdodCA9IDEuMDsKKyAgICAgICAgdGhpcy53aW5kb3dUaW1l TGVmdCA9IDAuMDsKKyAgICAgICAgdGhpcy53aW5kb3dUaW1lUmlnaHQgPSBudWxsOwogICAgICAg ICB0aGlzLndpbmRvd0luZGV4TGVmdCA9IDA7CiAgICAgICAgIHRoaXMud2luZG93SW5kZXhSaWdo dCA9IG51bGw7CiAgICAgfSwKQEAgLTE2ODMsMTIgKzE2NzAsMTIgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICog QHBhcmFtIHtudW1iZXJ9IGxlZnQKLSAgICAgKiBAcGFyYW0ge251bWJlcn0gcmlnaHQKKyAgICAg KiBAcGFyYW0gez9udW1iZXJ9IHJpZ2h0CiAgICAgICovCi0gICAgc2V0V2luZG93UG9zaXRpb246 IGZ1bmN0aW9uKGxlZnQsIHJpZ2h0KQorICAgIHNldFdpbmRvd1RpbWVzOiBmdW5jdGlvbihsZWZ0 LCByaWdodCkKICAgICB7Ci0gICAgICAgIHRoaXMud2luZG93TGVmdCA9IGxlZnQ7Ci0gICAgICAg IHRoaXMud2luZG93UmlnaHQgPSByaWdodDsKKyAgICAgICAgdGhpcy53aW5kb3dUaW1lTGVmdCA9 IGxlZnQ7CisgICAgICAgIHRoaXMud2luZG93VGltZVJpZ2h0ID0gcmlnaHQ7CiAgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRh dGlvbk1vZGVsLkV2ZW50cy5XaW5kb3dDaGFuZ2VkKTsKICAgICB9LAogCkBAIC0xNzE2LDEyICsx NzAzLDEzIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZSA9IHsKIAogLyoqCiAgKiBAY29uc3RydWN0b3IKLSAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRp bWVsaW5lQ2FsY3VsYXRvcn0gY2FsY3VsYXRvcgorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQcmVzZW50YXRpb25Nb2RlbH0gbW9kZWwKICAqIEBwYXJhbSB7Ym9vbGVhbn0gc2hvd1No b3J0RXZlbnRzCiAgKi8KLVdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZEZpbHRlciA9IGZ1bmN0 aW9uKGNhbGN1bGF0b3IsIHNob3dTaG9ydEV2ZW50cykKK1dlYkluc3BlY3Rvci5UaW1lbGluZVJl Y29yZEZpbHRlciA9IGZ1bmN0aW9uKG1vZGVsLCBzaG93U2hvcnRFdmVudHMpCiB7Ci0gICAgdGhp cy5fY2FsY3VsYXRvciA9IGNhbGN1bGF0b3I7CisgICAgdGhpcy5fd2luZG93VGltZUxlZnQgPSBt b2RlbC53aW5kb3dUaW1lTGVmdDsKKyAgICB0aGlzLl93aW5kb3dUaW1lUmlnaHQgPSBtb2RlbC53 aW5kb3dUaW1lUmlnaHQ7CiAgICAgdGhpcy5fc2hvd1Nob3J0RXZlbnRzID0gc2hvd1Nob3J0RXZl bnRzOwogfQogCkBAIC0xNzM1LDggKzE3MjMsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmRGaWx0ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAg ICBpZiAoIXRoaXMuX3Nob3dTaG9ydEV2ZW50cyAmJiAhcmVjb3JkLmlzTG9uZygpKQogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB2YXIgcGVyY2VudGFnZXMgPSB0aGlzLl9jYWxj dWxhdG9yLmNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2VzKHJlY29yZCk7Ci0gICAgICAgIHJldHVy biBwZXJjZW50YWdlcy5zdGFydCA8PSAxMDAgJiYgcGVyY2VudGFnZXMuZW5kV2l0aENoaWxkcmVu ID49IDA7CisgICAgICAgIHJldHVybiAodHlwZW9mIHRoaXMuX3dpbmRvd1RpbWVSaWdodCAhPT0g Im51bWJlciIgfHwgcmVjb3JkLnN0YXJ0VGltZSA8PSB0aGlzLl93aW5kb3dUaW1lUmlnaHQpICYm IHJlY29yZC5fbGFzdENoaWxkRW5kVGltZSA+PSB0aGlzLl93aW5kb3dUaW1lTGVmdDsKICAgICB9 CiB9CiAK