42178 2010-07-13 10:58:23 -0700 Update media element's seeking logic 2010-07-24 14:43:26 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC All RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson abarth eric jwieczorek webkit.review.bot oldest_to_newest 250625 0 eric.carlson 2010-07-13 10:58:23 -0700 The logic in HTMLMediaElement::seek is out of sync with the current spec. 250627 1 eric.carlson 2010-07-13 11:09:39 -0700 <rdar://problem/8185817> 250732 2 61413 eric.carlson 2010-07-13 14:02:57 -0700 Created attachment 61413 WIP patch 250742 3 61416 eric.carlson 2010-07-13 14:29:04 -0700 Created attachment 61416 proposed patch. 250774 4 61416 darin 2010-07-13 15:20:44 -0700 Comment on attachment 61416 proposed patch. > + if (abs(startTime - time) < closest) > + closest = abs(startTime - time); > + else if (abs(endTime - time) < closest) > + closest = abs(endTime - time); The function used here should be fabsf, not abs. Calling abs converts the number to an int! Also, I am concerned about the ignored ExceptionCode. Why is it OK to ignore it? Can there be an exception. r=me but please fix that fabsf thing 251184 5 eric.carlson 2010-07-14 07:41:51 -0700 (In reply to comment #4) > (From update of attachment 61416 [details]) > > + if (abs(startTime - time) < closest) > > + closest = abs(startTime - time); > > + else if (abs(endTime - time) < closest) > > + closest = abs(endTime - time); > > The function used here should be fabsf, not abs. Calling abs converts the number to an int! > Ack, I assume it would use the "inline float" version in cmath. Thanks! > Also, I am concerned about the ignored ExceptionCode. Why is it OK to ignore it? Can there be an exception. > An exception is returned by start() and end() if the index is out of bounds, which can't happen here. > r=me but please fix that fabsf thing Thanks! 251185 6 eric.carlson 2010-07-14 07:42:17 -0700 http://trac.webkit.org/changeset/63319 251186 7 webkit.review.bot 2010-07-14 07:42:38 -0700 http://trac.webkit.org/changeset/63319 might have broken Qt Linux Release minimal 255745 8 jwieczorek 2010-07-24 14:43:26 -0700 (In reply to comment #6) > http://trac.webkit.org/changeset/63319 Are you sure this is correct? Aren't you returning the distance between time and the nearest position rather than the nearest position? And this: + else if (fabs(endTime - time) < closest) looks wrong. This shouldn't be an else if, endTime might be closer than startTime. You could save some function calls and unnecessary input checks by operating on the private vector instead of calling the public functions. 61413 2010-07-13 14:02:57 -0700 2010-07-13 14:29:04 -0700 WIP patch patch_2.txt text/plain 6767 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MzI0NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDctMTMgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXBkYXRlIG1lZGlhIGVsZW1lbnQncyBzZWVraW5nIGxvZ2ljCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjE3OAorCisgICAgICAgICogaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 OnNlZWspOgorICAgICAgICAqIGh0bWwvVGltZVJhbmdlcy5jcHA6CisgICAgICAgIChUaW1lUmFu Z2VzOjpuZWFyZXN0KToKKyAgICAgICAgKiBodG1sL1RpbWVSYW5nZXMuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW06CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGU6OmN1cnJlbnRUaW1lKToKKwogMjAxMC0wNy0x MyAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBUaW1vdGh5IEhhdGNoZXIuCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZp c2lvbiA2MzEwNSkKKysrIFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTAwNSw0OSArMTAwNSw1NSBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OnN1 cHBvcnRzU2F2ZSgpIGNvCiAgICAgCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNlZWsoZmxvYXQg dGltZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgLy8gNC44LjEwLjEwLiBTZWVraW5nCi0g ICAgLy8gMQorICAgIC8vIDQuOC45LjkgU2Vla2luZworCisgICAgLy8gMSAtIElmIHRoZSBtZWRp YSBlbGVtZW50J3MgcmVhZHlTdGF0ZSBpcyBIQVZFX05PVEhJTkcsIHRoZW4gcmFpc2UgYW4gSU5W QUxJRF9TVEFURV9FUlIgZXhjZXB0aW9uLgogICAgIGlmIChtX3JlYWR5U3RhdGUgPT0gSEFWRV9O T1RISU5HIHx8ICFtX3BsYXllcikgewogICAgICAgICBlYyA9IElOVkFMSURfU1RBVEVfRVJSOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8gMgotICAgIHRpbWUgPSBtaW4odGltZSwg ZHVyYXRpb24oKSk7CisgICAgLy8gR2V0IHRoZSBjdXJyZW50IHRpbWUgYmVmb3JlIHNldHRpbmcg bV9zZWVraW5nLCBtX2xhc3RTZWVrVGltZSBpcyByZXR1cm5lZCBvbmNlIGl0IGlzIHNldC4KKyAg ICBmbG9hdCBub3cgPSBjdXJyZW50VGltZSgpOworCisgICAgLy8gMyAtIFNldCB0aGUgc2Vla2lu ZyBJREwgYXR0cmlidXRlIHRvIHRydWUuCisgICAgLy8gVGhlIGZsYWcgd2lsbCBiZSBjbGVhcmVk IHdoZW4gdGhlIGVuZ2luZSB0ZWxscyBpcyB0aGUgdGltZSBoYXMgYWN0dWFsbHkgY2hhbmdlZAor ICAgIG1fc2Vla2luZyA9IHRydWU7CiAKLSAgICAvLyAzCi0gICAgdGltZSA9IG1heCh0aW1lLCAw LjBmKTsKKyAgICAvLyA0IC0gUXVldWUgYSB0YXNrIHRvIGZpcmUgYSBzaW1wbGUgZXZlbnQgbmFt ZWQgdGltZXVwZGF0ZSBhdCB0aGUgZWxlbWVudC4KKyAgICBzY2hlZHVsZVRpbWV1cGRhdGVFdmVu dChmYWxzZSk7CisKKyAgICAvLyA2IC0gSWYgdGhlIG5ldyBwbGF5YmFjayBwb3NpdGlvbiBpcyBs YXRlciB0aGFuIHRoZSBlbmQgb2YgdGhlIG1lZGlhIHJlc291cmNlLCB0aGVuIGxldCBpdCBiZSB0 aGUgZW5kIAorICAgIC8vIG9mIHRoZSBtZWRpYSByZXNvdXJjZSBpbnN0ZWFkLgorICAgIHRpbWUg PSBtaW4odGltZSwgZHVyYXRpb24oKSk7CiAKLSAgICAvLyA0CisgICAgLy8gNyAtIElmIHRoZSBu ZXcgcGxheWJhY2sgcG9zaXRpb24gaXMgbGVzcyB0aGFuIHRoZSBlYXJsaWVzdCBwb3NzaWJsZSBw b3NpdGlvbiwgbGV0IGl0IGJlIHRoYXQgcG9zaXRpb24gaW5zdGVhZC4KKyAgICBmbG9hdCBlYXJs aWVzdFRpbWUgPSBtX3BsYXllci0+c3RhcnRUaW1lKCk7CisgICAgdGltZSA9IG1heCh0aW1lLCBl YXJsaWVzdFRpbWUpOworCisgICAgLy8gOCAtIElmIHRoZSAocG9zc2libHkgbm93IGNoYW5nZWQp IG5ldyBwbGF5YmFjayBwb3NpdGlvbiBpcyBub3QgaW4gb25lIG9mIHRoZSByYW5nZXMgZ2l2ZW4g aW4gdGhlIAorICAgIC8vIHNlZWthYmxlIGF0dHJpYnV0ZSwgdGhlbiBsZXQgaXQgYmUgdGhlIHBv c2l0aW9uIGluIG9uZSBvZiB0aGUgcmFuZ2VzIGdpdmVuIGluIHRoZSBzZWVrYWJsZSBhdHRyaWJ1 dGUgCisgICAgLy8gdGhhdCBpcyB0aGUgbmVhcmVzdCB0byB0aGUgbmV3IHBsYXliYWNrIHBvc2l0 aW9uLiAuLi4gSWYgdGhlcmUgYXJlIG5vIHJhbmdlcyBnaXZlbiBpbiB0aGUgc2Vla2FibGUKKyAg ICAvLyBhdHRyaWJ1dGUgdGhlbiBzZXQgdGhlIHNlZWtpbmcgSURMIGF0dHJpYnV0ZSB0byBmYWxz ZSBhbmQgYWJvcnQgdGhlc2Ugc3RlcHMuCiAgICAgUmVmUHRyPFRpbWVSYW5nZXM+IHNlZWthYmxl UmFuZ2VzID0gc2Vla2FibGUoKTsKLSAgICBpZiAoIXNlZWthYmxlUmFuZ2VzLT5jb250YWluKHRp bWUpKSB7Ci0gICAgICAgIGVjID0gSU5ERVhfU0laRV9FUlI7CisgICAgaWYgKCFzZWVrYWJsZVJh bmdlcy0+bGVuZ3RoKCkgfHwgdGltZSA9PSBub3cpIHsKKyAgICAgICAgbV9zZWVraW5nID0gZmFs c2U7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgCi0gICAgLy8gYXZvaWQgZ2VuZXJhdGlu ZyBldmVudHMgd2hlbiB0aGUgdGltZSB3b24ndCBhY3R1YWxseSBjaGFuZ2UKLSAgICBmbG9hdCBu b3cgPSBjdXJyZW50VGltZSgpOwotICAgIGlmICh0aW1lID09IG5vdykKLSAgICAgICAgcmV0dXJu OworICAgIHRpbWUgPSBzZWVrYWJsZVJhbmdlcy0+bmVhcmVzdCh0aW1lKTsKIAotICAgIC8vIDUK ICAgICBpZiAobV9wbGF5aW5nKSB7CiAgICAgICAgIGlmIChtX2xhc3RTZWVrVGltZSA8IG5vdykK ICAgICAgICAgICAgIGFkZFBsYXllZFJhbmdlKG1fbGFzdFNlZWtUaW1lLCBub3cpOwogICAgIH0K ICAgICBtX2xhc3RTZWVrVGltZSA9IHRpbWU7CisgICAgbV9zZW50RW5kRXZlbnQgPSBmYWxzZTsK IAotICAgIC8vIDYgLSBzZXQgdGhlIHNlZWtpbmcgZmxhZywgaXQgd2lsbCBiZSBjbGVhcmVkIHdo ZW4gdGhlIGVuZ2luZSB0ZWxscyBpcyB0aGUgdGltZSBoYXMgYWN0dWFsbHkgY2hhbmdlZAotICAg IG1fc2Vla2luZyA9IHRydWU7Ci0KLSAgICAvLyA3Ci0gICAgc2NoZWR1bGVUaW1ldXBkYXRlRXZl bnQoZmFsc2UpOworICAgIC8vIDkgLSBTZXQgdGhlIGN1cnJlbnQgcGxheWJhY2sgcG9zaXRpb24g dG8gdGhlIGdpdmVuIG5ldyBwbGF5YmFjayBwb3NpdGlvbgorICAgIG1fcGxheWVyLT5zZWVrKHRp bWUpOwogCi0gICAgLy8gOCAtIHRoaXMgaXMgY292ZXJlZCwgaWYgbmVjZXNzYXJ5LCB3aGVuIHRo ZSBlbmdpbmUgc2lnbmFscyBhIHJlYWR5c3RhdGUgY2hhbmdlCisgICAgLy8gMTAtMTUgYXJlIGhh bmRsZWQsIGlmIG5lY2Vzc2FyeSwgd2hlbiB0aGUgZW5naW5lIHNpZ25hbHMgYSByZWFkeXN0YXRl IGNoYW5nZS4KIAotICAgIC8vIDEwCi0gICAgbV9wbGF5ZXItPnNlZWsodGltZSk7Ci0gICAgbV9z ZW50RW5kRXZlbnQgPSBmYWxzZTsKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpmaW5pc2hT ZWVrKCkKSW5kZXg6IFdlYkNvcmUvaHRtbC9UaW1lUmFuZ2VzLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2h0bWwvVGltZVJhbmdlcy5jcHAJKHJldmlzaW9uIDYzMTA1KQorKysgV2ViQ29yZS9o dG1sL1RpbWVSYW5nZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsMyArMTE1LDIxIEBAIGJv b2wgVGltZVJhbmdlczo6Y29udGFpbihmbG9hdCB0aW1lKSBjb24KICAgICB9CiAgICAgcmV0dXJu IGZhbHNlOwogfQorCitmbG9hdCBUaW1lUmFuZ2VzOjpuZWFyZXN0KGZsb2F0IHRpbWUpIGNvbnN0 Cit7IAorICAgIEV4Y2VwdGlvbkNvZGUgdW51c2VkOworICAgIGZsb2F0IGNsb3Nlc3QgPSAwOwor ICAgIHVuc2lnbmVkIGNvdW50ID0gbGVuZ3RoKCk7CisgICAgZm9yICh1bnNpZ25lZCBuZHggPSAw OyBuZHggPCBjb3VudDsgbmR4KyspIHsKKyAgICAgICAgZmxvYXQgc3RhcnRUaW1lID0gc3RhcnQo bmR4LCB1bnVzZWQpOworICAgICAgICBmbG9hdCBlbmRUaW1lID0gZW5kKG5keCwgdW51c2VkKTsK KyAgICAgICAgaWYgKHRpbWUgPj0gc3RhcnRUaW1lICYmIHRpbWUgPD0gZW5kVGltZSkKKyAgICAg ICAgICAgIHJldHVybiB0aW1lOworICAgICAgICBpZiAoYWJzKHN0YXJ0VGltZSAtIHRpbWUpIDwg Y2xvc2VzdCkKKyAgICAgICAgICAgIGNsb3Nlc3QgPSBhYnMoc3RhcnRUaW1lIC0gdGltZSk7Cisg ICAgICAgIGlmIChhYnMoZW5kVGltZSAtIHRpbWUpIDwgY2xvc2VzdCkKKyAgICAgICAgICAgIGNs b3Nlc3QgPSBhYnMoZW5kVGltZSAtIHRpbWUpOworICAgIH0KKyAgICByZXR1cm4gY2xvc2VzdDsK K30KSW5kZXg6IFdlYkNvcmUvaHRtbC9UaW1lUmFuZ2VzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9odG1sL1RpbWVSYW5nZXMuaAkocmV2aXNpb24gNjMxMDUpCisrKyBXZWJDb3JlL2h0bWwvVGlt ZVJhbmdlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIGFkZChmbG9hdCBzdGFydCwgZmxvYXQgZW5kKTsKICAgICAKICAgICBib29sIGNvbnRhaW4o ZmxvYXQgdGltZSkgY29uc3Q7CisgICAgCisgICAgZmxvYXQgbmVhcmVzdChmbG9hdCB0aW1lKSBj b25zdDsKIAogcHJpdmF0ZToKICAgICBUaW1lUmFuZ2VzKCkgeyB9CkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtp dC5tbQkocmV2aXNpb24gNjMxMDUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9N ZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQkod29ya2luZyBjb3B5KQpAQCAtNjU5LDYgKzY1OSw3 IEBAIGZsb2F0IE1lZGlhUGxheWVyUHJpdmF0ZTo6Y3VycmVudFRpbWUoKSAKICAgICBpZiAoIW1l dGFEYXRhQXZhaWxhYmxlKCkpCiAgICAgICAgIHJldHVybiAwOwogICAgIFFUVGltZSB0aW1lID0g W21fcXRNb3ZpZS5nZXQoKSBjdXJyZW50VGltZV07CisKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 ZmxvYXQ+KHRpbWUudGltZVZhbHVlKSAvIHRpbWUudGltZVNjYWxlOwogfQogCkluZGV4OiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiA2MzI0NCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEyIEBACisyMDEwLTA3LTEzICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25A YXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFVwZGF0ZSBtZWRpYSBlbGVtZW50J3Mgc2Vla2luZyBsb2dpYworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIxNzgKKworICAgICAgICAqIGh0dHAv dGVzdHMvbWVkaWEvdmlkZW8tc2Vla2FibGUtc3RhbGwtZXhwZWN0ZWQudHh0OgorCiAyMDEwLTA3 LTEzICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMv bWVkaWEvdmlkZW8tc2Vla2FibGUtc3RhbGwtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tc2Vla2FibGUtc3RhbGwtZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiA2MzEwNSkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlk ZW8tc2Vla2FibGUtc3RhbGwtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC02LDYgKzYs NSBAQCBURVNUKHZpZGVvLnNlZWthYmxlLmxlbmd0aCA9PSAxKSBPSwogVEVTVCh2aWRlby5zZWVr YWJsZS5zdGFydCgwKSA9PSAwKSBPSwogVEVTVCh2aWRlby5zZWVrYWJsZS5lbmQoMCkgPiAwKSBP SwogVEVTVCh2aWRlby5zZWVrYWJsZS5lbmQoMCkgPCB2aWRlby5kdXJhdGlvbiAtIDEpIE9LCi1U RVNUKHZpZGVvLmN1cnJlbnRUaW1lID0gdmlkZW8uZHVyYXRpb24gLSAxKSBUSFJPV1MoRE9NRXhj ZXB0aW9uLklOREVYX1NJWkVfRVJSKSBPSwogRU5EIE9GIFRFU1QKIAo= 61416 2010-07-13 14:29:04 -0700 2010-07-13 15:20:44 -0700 proposed patch. patch_3.txt text/plain 7248 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MzI0NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDctMTMgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXBkYXRlIG1lZGlhIGVsZW1lbnQncyBzZWVraW5nIGxvZ2ljCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjE3OAorICAgICAgICA8cmRhcjovL3By b2JsZW0vODE4NTgxNz4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZWVrKTogV2hlbiBhc2tlZCB0byBz ZWVrIHRvIGFuIHVuYnVmZmVyZWQuIHNlZWsgdG8gdGhlIG5lYXJlc3QgdGltZSAKKyAgICAgICAg aW5zdGVhZCBvZiBnZW5lcmF0aW5nIGFuIGV4Y2VwdGlvbi4gUmUtb3JkZXIgdGhlIGxvZ2ljIHRv IG1hdGNoIHNwZWMgdGV4dC4KKworICAgICAgICAqIGh0bWwvVGltZVJhbmdlcy5jcHA6CisgICAg ICAgIChUaW1lUmFuZ2VzOjpuZWFyZXN0KTogTmV3LCByZXR1cm4gdGhlIHZhbHVlIGNsb3Nlc3Qg dG8gdGhlIHNwZWNpZmllZCB0aW1lLgorICAgICAgICAqIGh0bWwvVGltZVJhbmdlcy5oOgorCiAy MDEwLTA3LTEzICBBYXJvbiBCb29kbWFuICA8YWFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAJKHJldmlzaW9uIDYzMTA1KQorKysgV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMDA1LDQ5ICsxMDA1LDU1IEBAIGJvb2wgSFRNTE1lZGlhRWxl bWVudDo6c3VwcG9ydHNTYXZlKCkgY28KICAgICAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2Vl ayhmbG9hdCB0aW1lLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICAvLyA0LjguMTAuMTAuIFNl ZWtpbmcKLSAgICAvLyAxCisgICAgLy8gNC44LjkuOSBTZWVraW5nCisKKyAgICAvLyAxIC0gSWYg dGhlIG1lZGlhIGVsZW1lbnQncyByZWFkeVN0YXRlIGlzIEhBVkVfTk9USElORywgdGhlbiByYWlz ZSBhbiBJTlZBTElEX1NUQVRFX0VSUiBleGNlcHRpb24uCiAgICAgaWYgKG1fcmVhZHlTdGF0ZSA9 PSBIQVZFX05PVEhJTkcgfHwgIW1fcGxheWVyKSB7CiAgICAgICAgIGVjID0gSU5WQUxJRF9TVEFU RV9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyAyCi0gICAgdGltZSA9IG1p bih0aW1lLCBkdXJhdGlvbigpKTsKKyAgICAvLyBHZXQgdGhlIGN1cnJlbnQgdGltZSBiZWZvcmUg c2V0dGluZyBtX3NlZWtpbmcsIG1fbGFzdFNlZWtUaW1lIGlzIHJldHVybmVkIG9uY2UgaXQgaXMg c2V0LgorICAgIGZsb2F0IG5vdyA9IGN1cnJlbnRUaW1lKCk7CisKKyAgICAvLyAzIC0gU2V0IHRo ZSBzZWVraW5nIElETCBhdHRyaWJ1dGUgdG8gdHJ1ZS4KKyAgICAvLyBUaGUgZmxhZyB3aWxsIGJl IGNsZWFyZWQgd2hlbiB0aGUgZW5naW5lIHRlbGxzIGlzIHRoZSB0aW1lIGhhcyBhY3R1YWxseSBj aGFuZ2VkCisgICAgbV9zZWVraW5nID0gdHJ1ZTsKIAotICAgIC8vIDMKLSAgICB0aW1lID0gbWF4 KHRpbWUsIDAuMGYpOworICAgIC8vIDQgLSBRdWV1ZSBhIHRhc2sgdG8gZmlyZSBhIHNpbXBsZSBl dmVudCBuYW1lZCB0aW1ldXBkYXRlIGF0IHRoZSBlbGVtZW50LgorICAgIHNjaGVkdWxlVGltZXVw ZGF0ZUV2ZW50KGZhbHNlKTsKKworICAgIC8vIDYgLSBJZiB0aGUgbmV3IHBsYXliYWNrIHBvc2l0 aW9uIGlzIGxhdGVyIHRoYW4gdGhlIGVuZCBvZiB0aGUgbWVkaWEgcmVzb3VyY2UsIHRoZW4gbGV0 IGl0IGJlIHRoZSBlbmQgCisgICAgLy8gb2YgdGhlIG1lZGlhIHJlc291cmNlIGluc3RlYWQuCisg ICAgdGltZSA9IG1pbih0aW1lLCBkdXJhdGlvbigpKTsKIAotICAgIC8vIDQKKyAgICAvLyA3IC0g SWYgdGhlIG5ldyBwbGF5YmFjayBwb3NpdGlvbiBpcyBsZXNzIHRoYW4gdGhlIGVhcmxpZXN0IHBv c3NpYmxlIHBvc2l0aW9uLCBsZXQgaXQgYmUgdGhhdCBwb3NpdGlvbiBpbnN0ZWFkLgorICAgIGZs b2F0IGVhcmxpZXN0VGltZSA9IG1fcGxheWVyLT5zdGFydFRpbWUoKTsKKyAgICB0aW1lID0gbWF4 KHRpbWUsIGVhcmxpZXN0VGltZSk7CisKKyAgICAvLyA4IC0gSWYgdGhlIChwb3NzaWJseSBub3cg Y2hhbmdlZCkgbmV3IHBsYXliYWNrIHBvc2l0aW9uIGlzIG5vdCBpbiBvbmUgb2YgdGhlIHJhbmdl cyBnaXZlbiBpbiB0aGUgCisgICAgLy8gc2Vla2FibGUgYXR0cmlidXRlLCB0aGVuIGxldCBpdCBi ZSB0aGUgcG9zaXRpb24gaW4gb25lIG9mIHRoZSByYW5nZXMgZ2l2ZW4gaW4gdGhlIHNlZWthYmxl IGF0dHJpYnV0ZSAKKyAgICAvLyB0aGF0IGlzIHRoZSBuZWFyZXN0IHRvIHRoZSBuZXcgcGxheWJh Y2sgcG9zaXRpb24uIC4uLiBJZiB0aGVyZSBhcmUgbm8gcmFuZ2VzIGdpdmVuIGluIHRoZSBzZWVr YWJsZQorICAgIC8vIGF0dHJpYnV0ZSB0aGVuIHNldCB0aGUgc2Vla2luZyBJREwgYXR0cmlidXRl IHRvIGZhbHNlIGFuZCBhYm9ydCB0aGVzZSBzdGVwcy4KICAgICBSZWZQdHI8VGltZVJhbmdlcz4g c2Vla2FibGVSYW5nZXMgPSBzZWVrYWJsZSgpOwotICAgIGlmICghc2Vla2FibGVSYW5nZXMtPmNv bnRhaW4odGltZSkpIHsKLSAgICAgICAgZWMgPSBJTkRFWF9TSVpFX0VSUjsKKyAgICBpZiAoIXNl ZWthYmxlUmFuZ2VzLT5sZW5ndGgoKSB8fCB0aW1lID09IG5vdykgeworICAgICAgICBtX3NlZWtp bmcgPSBmYWxzZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICAKLSAgICAvLyBhdm9pZCBn ZW5lcmF0aW5nIGV2ZW50cyB3aGVuIHRoZSB0aW1lIHdvbid0IGFjdHVhbGx5IGNoYW5nZQotICAg IGZsb2F0IG5vdyA9IGN1cnJlbnRUaW1lKCk7Ci0gICAgaWYgKHRpbWUgPT0gbm93KQotICAgICAg ICByZXR1cm47CisgICAgdGltZSA9IHNlZWthYmxlUmFuZ2VzLT5uZWFyZXN0KHRpbWUpOwogCi0g ICAgLy8gNQogICAgIGlmIChtX3BsYXlpbmcpIHsKICAgICAgICAgaWYgKG1fbGFzdFNlZWtUaW1l IDwgbm93KQogICAgICAgICAgICAgYWRkUGxheWVkUmFuZ2UobV9sYXN0U2Vla1RpbWUsIG5vdyk7 CiAgICAgfQogICAgIG1fbGFzdFNlZWtUaW1lID0gdGltZTsKKyAgICBtX3NlbnRFbmRFdmVudCA9 IGZhbHNlOwogCi0gICAgLy8gNiAtIHNldCB0aGUgc2Vla2luZyBmbGFnLCBpdCB3aWxsIGJlIGNs ZWFyZWQgd2hlbiB0aGUgZW5naW5lIHRlbGxzIGlzIHRoZSB0aW1lIGhhcyBhY3R1YWxseSBjaGFu Z2VkCi0gICAgbV9zZWVraW5nID0gdHJ1ZTsKLQotICAgIC8vIDcKLSAgICBzY2hlZHVsZVRpbWV1 cGRhdGVFdmVudChmYWxzZSk7CisgICAgLy8gOSAtIFNldCB0aGUgY3VycmVudCBwbGF5YmFjayBw b3NpdGlvbiB0byB0aGUgZ2l2ZW4gbmV3IHBsYXliYWNrIHBvc2l0aW9uCisgICAgbV9wbGF5ZXIt PnNlZWsodGltZSk7CiAKLSAgICAvLyA4IC0gdGhpcyBpcyBjb3ZlcmVkLCBpZiBuZWNlc3Nhcnks IHdoZW4gdGhlIGVuZ2luZSBzaWduYWxzIGEgcmVhZHlzdGF0ZSBjaGFuZ2UKKyAgICAvLyAxMC0x NSBhcmUgaGFuZGxlZCwgaWYgbmVjZXNzYXJ5LCB3aGVuIHRoZSBlbmdpbmUgc2lnbmFscyBhIHJl YWR5c3RhdGUgY2hhbmdlLgogCi0gICAgLy8gMTAKLSAgICBtX3BsYXllci0+c2Vlayh0aW1lKTsK LSAgICBtX3NlbnRFbmRFdmVudCA9IGZhbHNlOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmZpbmlzaFNlZWsoKQpJbmRleDogV2ViQ29yZS9odG1sL1RpbWVSYW5nZXMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvaHRtbC9UaW1lUmFuZ2VzLmNwcAkocmV2aXNpb24gNjMxMDUpCisrKyBX ZWJDb3JlL2h0bWwvVGltZVJhbmdlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNSwzICsxMTUs MjEgQEAgYm9vbCBUaW1lUmFuZ2VzOjpjb250YWluKGZsb2F0IHRpbWUpIGNvbgogICAgIH0KICAg ICByZXR1cm4gZmFsc2U7CiB9CisKK2Zsb2F0IFRpbWVSYW5nZXM6Om5lYXJlc3QoZmxvYXQgdGlt ZSkgY29uc3QKK3sgCisgICAgRXhjZXB0aW9uQ29kZSB1bnVzZWQ7CisgICAgZmxvYXQgY2xvc2Vz dCA9IDA7CisgICAgdW5zaWduZWQgY291bnQgPSBsZW5ndGgoKTsKKyAgICBmb3IgKHVuc2lnbmVk IG5keCA9IDA7IG5keCA8IGNvdW50OyBuZHgrKykgeworICAgICAgICBmbG9hdCBzdGFydFRpbWUg PSBzdGFydChuZHgsIHVudXNlZCk7CisgICAgICAgIGZsb2F0IGVuZFRpbWUgPSBlbmQobmR4LCB1 bnVzZWQpOworICAgICAgICBpZiAodGltZSA+PSBzdGFydFRpbWUgJiYgdGltZSA8PSBlbmRUaW1l KQorICAgICAgICAgICAgcmV0dXJuIHRpbWU7CisgICAgICAgIGlmIChhYnMoc3RhcnRUaW1lIC0g dGltZSkgPCBjbG9zZXN0KQorICAgICAgICAgICAgY2xvc2VzdCA9IGFicyhzdGFydFRpbWUgLSB0 aW1lKTsKKyAgICAgICAgZWxzZSBpZiAoYWJzKGVuZFRpbWUgLSB0aW1lKSA8IGNsb3Nlc3QpCisg ICAgICAgICAgICBjbG9zZXN0ID0gYWJzKGVuZFRpbWUgLSB0aW1lKTsKKyAgICB9CisgICAgcmV0 dXJuIGNsb3Nlc3Q7Cit9CkluZGV4OiBXZWJDb3JlL2h0bWwvVGltZVJhbmdlcy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvaHRtbC9UaW1lUmFuZ2VzLmgJKHJldmlzaW9uIDYzMTA1KQorKysgV2Vi Q29yZS9odG1sL1RpbWVSYW5nZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNiArNTUsOCBAQCBw dWJsaWM6CiAgICAgdm9pZCBhZGQoZmxvYXQgc3RhcnQsIGZsb2F0IGVuZCk7CiAgICAgCiAgICAg Ym9vbCBjb250YWluKGZsb2F0IHRpbWUpIGNvbnN0OworICAgIAorICAgIGZsb2F0IG5lYXJlc3Qo ZmxvYXQgdGltZSkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgVGltZVJhbmdlcygpIHsgfQpJbmRl eDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5n ZUxvZwkocmV2aXNpb24gNjMyNDQpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNy0xMyAgRXJpYyBDYXJsc29uICA8ZXJpYy5j YXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVcGRhdGUgbWVkaWEgZWxlbWVudCdzIHNlZWtpbmcgbG9naWMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjE3OAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vODE4NTgxNz4KKworICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvdmlk ZW8tc2Vla2FibGUtc3RhbGwtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVk aWEvdmlkZW8tc2Vla2FibGUtc3RhbGwuaHRtbDogU2Vla2luZyB0byBhbiB1bmJ1ZmZlcmVkIHRp bWUgbm8gbG9uZ2VyCisgICAgICAgIGdlbmVyYXRlcyBhbiBleGNlcHRpb24uCisKIDIwMTAtMDct MTMgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9t ZWRpYS92aWRlby1zZWVrYWJsZS1zdGFsbC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1zZWVrYWJsZS1zdGFsbC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDYzMTA1KQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92aWRl by1zZWVrYWJsZS1zdGFsbC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTYsNiArNiw1 IEBAIFRFU1QodmlkZW8uc2Vla2FibGUubGVuZ3RoID09IDEpIE9LCiBURVNUKHZpZGVvLnNlZWth YmxlLnN0YXJ0KDApID09IDApIE9LCiBURVNUKHZpZGVvLnNlZWthYmxlLmVuZCgwKSA+IDApIE9L CiBURVNUKHZpZGVvLnNlZWthYmxlLmVuZCgwKSA8IHZpZGVvLmR1cmF0aW9uIC0gMSkgT0sKLVRF U1QodmlkZW8uY3VycmVudFRpbWUgPSB2aWRlby5kdXJhdGlvbiAtIDEpIFRIUk9XUyhET01FeGNl cHRpb24uSU5ERVhfU0laRV9FUlIpIE9LCiBFTkQgT0YgVEVTVAogCkluZGV4OiBMYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXNlZWthYmxlLXN0YWxsLmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1zZWVrYWJsZS1zdGFsbC5odG1s CShyZXZpc2lvbiA2MzEwNSkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8t c2Vla2FibGUtc3RhbGwuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtOCw3ICs4LDYgQEAgd2FpdEZv ckV2ZW50KCdjYW5wbGF5JywgZnVuY3Rpb24gKCkgewogICAgIHRlc3QoInZpZGVvLnNlZWthYmxl LnN0YXJ0KDApID09IDAiKTsKICAgICB0ZXN0KCJ2aWRlby5zZWVrYWJsZS5lbmQoMCkgPiAwIik7 CiAgICAgdGVzdCgidmlkZW8uc2Vla2FibGUuZW5kKDApIDwgdmlkZW8uZHVyYXRpb24gLSAxIik7 Ci0gICAgdGVzdEV4Y2VwdGlvbigidmlkZW8uY3VycmVudFRpbWUgPSB2aWRlby5kdXJhdGlvbiAt IDEiLCAiRE9NRXhjZXB0aW9uLklOREVYX1NJWkVfRVJSIik7CiAgICAgZW5kVGVzdCgpOwogfSAp OwogdmlkZW8uc3JjID0gImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9tZWRpYS92aWRlby1sb2FkLWFu ZC1zdGFsbC5jZ2k/bmFtZT0uLi8uLi8uLi9tZWRpYS9jb250ZW50L3Rlc3QubXA0JnN0YWxsQXQ9 MTAwMDAwIjsK