37993 2010-04-22 10:29:33 -0700 Assertion failure in AnimationBase::updateStateMachine() coming out of paused state 2010-07-22 07:15:40 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 42821 1 cmarrin cmarrin joepeck ossy oldest_to_newest 215943 0 cmarrin 2010-04-22 10:29:33 -0700 This is rare and hard to reproduce, but if you go into pause state when in the AnimationStateStartWaitStyleAvailable, the state of m_pauseTime is incorrect, leading to an assert when coming out of pause state. 254437 1 cmarrin 2010-07-21 11:44:10 -0700 It's actually easy to reproduce, but you have to use the "pause API" (a feature available in LayoutTests) to get it to happen. You simply run a debug build, start a transition and then pause and unpause. The assert is usually hit. I will try to post a test. 254535 2 cmarrin 2010-07-21 14:49:30 -0700 It's actually easy to reproduce, but you have to use the "pause API" (a feature available in LayoutTests) to get it to happen. You simply run a debug build, start a transition and then pause and unpause. The assert is usually hit. I will try to post a test. 254536 3 62236 cmarrin 2010-07-21 14:51:03 -0700 Created attachment 62236 Patch 254542 4 62236 simon.fraser 2010-07-21 14:56:02 -0700 Comment on attachment 62236 Patch > Index: WebCore/ChangeLog > =================================================================== > + https://bugs.webkit.org/show_bug.cgi?id=37993 The bug title should be on the line above the url ("webkit-patch upload" will do this for you). r=me 254573 5 cmarrin 2010-07-21 16:16:59 -0700 Patch landed in http://trac.webkit.org/changeset/63862 254752 6 ossy 2010-07-22 06:12:25 -0700 After this patch animations/play-state.html is flakey on Qt bot: http://build.webkit.org/results/Qt%20Linux%20Release/r63884%20%2815890%29/animations/play-state-pretty-diff.html Could you check what the problem is? 62236 2010-07-21 14:51:03 -0700 2010-07-21 14:56:02 -0700 Patch 37993.patch text/plain 10685 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzg1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTAtMDctMjEgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzk5MworICAgICAgICBBZGRl ZCBsb2dpYyB0byBwcm9wZXJseSBoYW5kbGUgcGF1c2luZyBhbmQgcmVzdW1pbmcgd2hlbiBpbiB0 aGUgCisgICAgICAgIEFuaW1hdGlvblN0YXRlU3RhcnRXYWl0U3R5bGVBdmFpbGFibGUgc3RhdGUu IFRoaXMgd2FzIGNhdXNpbmcgYW4KKyAgICAgICAgYXNzZXJ0IHdoZW4gZ29pbmcgb3V0IG9mIHRo ZSBwYXVzZSBzdGF0ZSBiZWNhdXNlIHRoZSBwYXVzZWQgZmxhZworICAgICAgICB3YXMgbm90IHNl dC4KKyAgICAgICAgCisgICAgICAgIFRoZSBmaXggaXMgYSBzdHJhaWdodGZvcndhcmQgaW1wbGVt ZW50YXRpb24sIGdvaW5nIGludG8gYSBuZXcKKyAgICAgICAgQW5pbWF0aW9uU3RhdGVQYXVzZWRX YWl0U3R5bGVBdmFpbGFibGUgc3RhdGUgYW5kIHNldHRpbmcgdGhlIHBhdXNlZAorICAgICAgICBm bGFnIChhY3R1YWxseSBzZXR0aW5nIHRoZSBtX3BhdXNlVGltZSB2YXJpYWJsZSB0byBzb21ldGhp bmcgb3RoZXIKKyAgICAgICAgdGhhbiAtMSkuIEFsc28gYWRkZWQgaGFuZGxpbmcgb2YgdGhlIG5l dyBzdGF0ZSwgYm90aCB3aGVuIHRoZSAKKyAgICAgICAgInN0eWxlIGF2YWlsYWJsZSIgY2FsbGJh Y2sgY29tZXMgaW4gd2hpbGUgaW4gdGhpcyBzdGF0ZSBhbmQgd2hlbgorICAgICAgICB1bnBhdXNp bmcgd2hpbGUgaW4gdGhpcyBzdGF0ZS4gCisgICAgICAgIAorICAgICAgICBGb3Igbm93IGEgTGF5 b3V0VGVzdCBpcyBub3QgcG9zc2libGUgc2luY2UgdGhlcmUncyBubyB3YXkgdG8gZ28gaW4KKyAg ICAgICAgYW5kIG91dCBvZiB0aGUgcGF1c2Ugc3RhdGUuIEkndmUgb3BlbmVkIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mjc5MAorICAgICAgICB0byB0cmFjayB0aGlz LgorCisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpBbmltYXRpb25CYXNlOjp1cGRhdGVTdGF0ZU1hY2hpbmUpOgorICAgICAgICAq IHBhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1h dGlvbkJhc2U6Oik6CisKIDIwMTAtMDctMjEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpJbmRleDog V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCShyZXZpc2lvbiA2Mzg0NikK KysrIFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTk2NCwyOCArOTY0LDMzIEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6dXBkYXRlU3RhdGVN YWNoaW5lKEEKICAgICAgICAgY2FzZSBBbmltYXRpb25TdGF0ZVN0YXJ0V2FpdFN0eWxlQXZhaWxh YmxlOgogICAgICAgICAgICAgQVNTRVJUKGlucHV0ID09IEFuaW1hdGlvblN0YXRlSW5wdXRTdHls ZUF2YWlsYWJsZSB8fCBpbnB1dCA9PSBBbmltYXRpb25TdGF0ZUlucHV0UGxheVN0YXRlUGF1c2Vk KTsKIAotICAgICAgICAgICAgLy8gU3RhcnQgdGltZXIgaGFzIGZpcmVkLCB0ZWxsIHRoZSBhbmlt YXRpb24gdG8gc3RhcnQgYW5kIHdhaXQgZm9yIGl0IHRvIHJlc3BvbmQgd2l0aCBzdGFydCB0aW1l Ci0gICAgICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlvblN0YXRlU3RhcnRXYWl0UmVzcG9u c2U7CisgICAgICAgICAgICBpZiAoaW5wdXQgPT0gQW5pbWF0aW9uU3RhdGVJbnB1dFN0eWxlQXZh aWxhYmxlKSB7CisgICAgICAgICAgICAgICAgLy8gU3RhcnQgdGltZXIgaGFzIGZpcmVkLCB0ZWxs IHRoZSBhbmltYXRpb24gdG8gc3RhcnQgYW5kIHdhaXQgZm9yIGl0IHRvIHJlc3BvbmQgd2l0aCBz dGFydCB0aW1lCisgICAgICAgICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZVN0 YXJ0V2FpdFJlc3BvbnNlOwogCi0gICAgICAgICAgICBvdmVycmlkZUFuaW1hdGlvbnMoKTsKKyAg ICAgICAgICAgICAgICBvdmVycmlkZUFuaW1hdGlvbnMoKTsKIAotICAgICAgICAgICAgLy8gU3Rh cnQgdGhlIGFuaW1hdGlvbgotICAgICAgICAgICAgaWYgKG92ZXJyaWRkZW4oKSkgewotICAgICAg ICAgICAgICAgIC8vIFdlIHdvbid0IHRyeSB0byBzdGFydCBhY2NlbGVyYXRlZCBhbmltYXRpb25z IGlmIHdlIGFyZSBvdmVycmlkZGVuIGFuZAotICAgICAgICAgICAgICAgIC8vIGp1c3QgbW92ZSBv biB0byB0aGUgbmV4dCBzdGF0ZS4KLSAgICAgICAgICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1h dGlvblN0YXRlU3RhcnRXYWl0UmVzcG9uc2U7Ci0gICAgICAgICAgICAgICAgbV9pc0FjY2VsZXJh dGVkID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgdXBkYXRlU3RhdGVNYWNoaW5lKEFuaW1hdGlv blN0YXRlSW5wdXRTdGFydFRpbWVTZXQsIGJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSgpKTsKLSAg ICAgICAgICAgIH0KLSAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIGRvdWJsZSB0 aW1lT2Zmc2V0ID0gMDsKLSAgICAgICAgICAgICAgICAvLyBJZiB0aGUgdmFsdWUgZm9yICdhbmlt YXRpb24tZGVsYXknIGlzIG5lZ2F0aXZlIHRoZW4gdGhlIGFuaW1hdGlvbiBhcHBlYXJzIHRvIGhh dmUgc3RhcnRlZCBpbiB0aGUgcGFzdC4KLSAgICAgICAgICAgICAgICBpZiAobV9hbmltYXRpb24t PmRlbGF5KCkgPCAwKQotICAgICAgICAgICAgICAgICAgICB0aW1lT2Zmc2V0ID0gLW1fYW5pbWF0 aW9uLT5kZWxheSgpOwotICAgICAgICAgICAgICAgIGJvb2wgc3RhcnRlZCA9IHN0YXJ0QW5pbWF0 aW9uKHRpbWVPZmZzZXQpOworICAgICAgICAgICAgICAgIC8vIFN0YXJ0IHRoZSBhbmltYXRpb24K KyAgICAgICAgICAgICAgICBpZiAob3ZlcnJpZGRlbigpKSB7CisgICAgICAgICAgICAgICAgICAg IC8vIFdlIHdvbid0IHRyeSB0byBzdGFydCBhY2NlbGVyYXRlZCBhbmltYXRpb25zIGlmIHdlIGFy ZSBvdmVycmlkZGVuIGFuZAorICAgICAgICAgICAgICAgICAgICAvLyBqdXN0IG1vdmUgb24gdG8g dGhlIG5leHQgc3RhdGUuCisgICAgICAgICAgICAgICAgICAgIG1fYW5pbVN0YXRlID0gQW5pbWF0 aW9uU3RhdGVTdGFydFdhaXRSZXNwb25zZTsKKyAgICAgICAgICAgICAgICAgICAgbV9pc0FjY2Vs ZXJhdGVkID0gZmFsc2U7CisgICAgICAgICAgICAgICAgICAgIHVwZGF0ZVN0YXRlTWFjaGluZShB bmltYXRpb25TdGF0ZUlucHV0U3RhcnRUaW1lU2V0LCBiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUo KSk7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgZG91Ymxl IHRpbWVPZmZzZXQgPSAwOworICAgICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgdmFsdWUgZm9y ICdhbmltYXRpb24tZGVsYXknIGlzIG5lZ2F0aXZlIHRoZW4gdGhlIGFuaW1hdGlvbiBhcHBlYXJz IHRvIGhhdmUgc3RhcnRlZCBpbiB0aGUgcGFzdC4KKyAgICAgICAgICAgICAgICAgICAgaWYgKG1f YW5pbWF0aW9uLT5kZWxheSgpIDwgMCkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVPZmZz ZXQgPSAtbV9hbmltYXRpb24tPmRlbGF5KCk7CisgICAgICAgICAgICAgICAgICAgIGJvb2wgc3Rh cnRlZCA9IHN0YXJ0QW5pbWF0aW9uKHRpbWVPZmZzZXQpOwogCi0gICAgICAgICAgICAgICAgbV9j b21wQW5pbS0+YW5pbWF0aW9uQ29udHJvbGxlcigpLT5hZGRUb1N0YXJ0VGltZVJlc3BvbnNlV2Fp dExpc3QodGhpcywgc3RhcnRlZCk7Ci0gICAgICAgICAgICAgICAgbV9pc0FjY2VsZXJhdGVkID0g c3RhcnRlZDsKKyAgICAgICAgICAgICAgICAgICAgbV9jb21wQW5pbS0+YW5pbWF0aW9uQ29udHJv bGxlcigpLT5hZGRUb1N0YXJ0VGltZVJlc3BvbnNlV2FpdExpc3QodGhpcywgc3RhcnRlZCk7Cisg ICAgICAgICAgICAgICAgICAgIG1faXNBY2NlbGVyYXRlZCA9IHN0YXJ0ZWQ7CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAvLyBXZSdyZSB3 YWl0aW5nIGZvciB0aGUgc3R5bGUgdG8gYmUgYXZhaWxhYmxlIGFuZCB3ZSBnb3QgYSBwYXVzZS4g UGF1c2UgYW5kIHdhaXQKKyAgICAgICAgICAgICAgICBtX3BhdXNlVGltZSA9IGJlZ2luQW5pbWF0 aW9uVXBkYXRlVGltZSgpOworICAgICAgICAgICAgICAgIG1fYW5pbVN0YXRlID0gQW5pbWF0aW9u U3RhdGVQYXVzZWRXYWl0U3R5bGVBdmFpbGFibGU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgY2FzZSBBbmltYXRpb25TdGF0ZVN0YXJ0V2FpdFJlc3BvbnNlOgpA QCAtMTA3NSwxNyArMTA4MCw1MSBAQCB2b2lkIEFuaW1hdGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFj aGluZShBCiAgICAgICAgICAgICB1cGRhdGVTdGF0ZU1hY2hpbmUoQW5pbWF0aW9uU3RhdGVJbnB1 dFN0YXJ0QW5pbWF0aW9uLCAwKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEFu aW1hdGlvblN0YXRlUGF1c2VkV2FpdFJlc3BvbnNlOgorICAgICAgICBjYXNlIEFuaW1hdGlvblN0 YXRlUGF1c2VkV2FpdFN0eWxlQXZhaWxhYmxlOgogICAgICAgICBjYXNlIEFuaW1hdGlvblN0YXRl UGF1c2VkUnVuOgogICAgICAgICAgICAgLy8gV2UgdHJlYXQgdGhlc2UgdHdvIGNhc2VzIHRoZSBz YW1lLiBUaGUgb25seSBkaWZmZXJlbmNlIGlzIHRoYXQsIHdoZW4gd2UgYXJlIGluCiAgICAgICAg ICAgICAvLyBBbmltYXRpb25TdGF0ZVBhdXNlZFdhaXRSZXNwb25zZSwgd2UgZG9uJ3QgeWV0IGhh dmUgYSB2YWxpZCBzdGFydFRpbWUsIHNvIHdlIHNlbmQgMCB0byBzdGFydEFuaW1hdGlvbi4KICAg ICAgICAgICAgIC8vIFdoZW4gdGhlIEFuaW1hdGlvblN0YXRlSW5wdXRTdGFydFRpbWVTZXQgY29t ZXMgaW4gYW5kIHdlIHdlcmUgaW4gQW5pbWF0aW9uU3RhdGVQYXVzZWRSdW4sIHdlIHdpbGwgbm90 aWNlCiAgICAgICAgICAgICAvLyB0aGF0IHdlIGhhdmUgYWxyZWFkeSBzZXQgdGhlIHN0YXJ0VGlt ZSBhbmQgd2lsbCBpZ25vcmUgaXQuCi0gICAgICAgICAgICBBU1NFUlQoaW5wdXQgPT0gQW5pbWF0 aW9uU3RhdGVJbnB1dFBsYXlTdGF0ZVJ1bm5pbmcgfHwgaW5wdXQgPT0gQW5pbWF0aW9uU3RhdGVJ bnB1dFN0YXJ0VGltZVNldCk7CisgICAgICAgICAgICBBU1NFUlQoaW5wdXQgPT0gQW5pbWF0aW9u U3RhdGVJbnB1dFBsYXlTdGF0ZVJ1bm5pbmcgfHwgaW5wdXQgPT0gQW5pbWF0aW9uU3RhdGVJbnB1 dFN0YXJ0VGltZVNldCB8fCBpbnB1dCA9PSBBbmltYXRpb25TdGF0ZUlucHV0U3R5bGVBdmFpbGFi bGUpOwogICAgICAgICAgICAgQVNTRVJUKHBhdXNlZCgpKTsKICAgICAgICAgICAgIAotICAgICAg ICAgICAgLy8gSWYgd2UgYXJlIHBhdXNlZCwgYnV0IHdlIGdldCB0aGUgY2FsbGJhY2sgdGhhdCBu b3RpZmllcyB1cyB0aGF0IGFuIGFjY2VsZXJhdGVkIGFuaW1hdGlvbiBzdGFydGVkLAotICAgICAg ICAgICAgLy8gdGhlbiB3ZSBpZ25vcmUgdGhlIHN0YXJ0IHRpbWUgYW5kIGp1c3QgbW92ZSBpbnRv IHRoZSBwYXVzZWQtcnVuIHN0YXRlLgotICAgICAgICAgICAgaWYgKG1fYW5pbVN0YXRlID09IEFu aW1hdGlvblN0YXRlUGF1c2VkV2FpdFJlc3BvbnNlICYmIGlucHV0ID09IEFuaW1hdGlvblN0YXRl SW5wdXRTdGFydFRpbWVTZXQpIHsKKyAgICAgICAgICAgIGlmIChpbnB1dCA9PSBBbmltYXRpb25T dGF0ZUlucHV0UGxheVN0YXRlUnVubmluZykgeworICAgICAgICAgICAgICAgIC8vIFVwZGF0ZSB0 aGUgdGltZXMKKyAgICAgICAgICAgICAgICBpZiAobV9hbmltU3RhdGUgPT0gQW5pbWF0aW9uU3Rh dGVQYXVzZWRSdW4pCisgICAgICAgICAgICAgICAgICAgIG1fc3RhcnRUaW1lICs9IGJlZ2luQW5p bWF0aW9uVXBkYXRlVGltZSgpIC0gbV9wYXVzZVRpbWU7CisgICAgICAgICAgICAgICAgZWxzZQor ICAgICAgICAgICAgICAgICAgICBtX3N0YXJ0VGltZSA9IDA7CisgICAgICAgICAgICAgICAgbV9w YXVzZVRpbWUgPSAtMTsKKworICAgICAgICAgICAgICAgIGlmIChtX2FuaW1TdGF0ZSA9PSBBbmlt YXRpb25TdGF0ZVBhdXNlZFdhaXRTdHlsZUF2YWlsYWJsZSkKKyAgICAgICAgICAgICAgICAgICAg bV9hbmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZVN0YXJ0V2FpdFN0eWxlQXZhaWxhYmxlOworICAg ICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICAvLyBXZSB3ZXJlIGVpdGhl ciBydW5uaW5nIG9yIHdhaXRpbmcgZm9yIGEgYmVnaW4gdGltZSByZXNwb25zZSBmcm9tIHRoZSBh bmltYXRpb24uCisgICAgICAgICAgICAgICAgICAgIC8vIEVpdGhlciB3YXkgd2UgbmVlZCB0byBy ZXN0YXJ0IHRoZSBhbmltYXRpb24gKHBvc3NpYmx5IHdpdGggYW4gb2Zmc2V0IGlmIHdlCisgICAg ICAgICAgICAgICAgICAgIC8vIGhhZCBhbHJlYWR5IGJlZW4gcnVubmluZykgYW5kIHdhaXQgZm9y IGl0IHRvIHN0YXJ0LgorICAgICAgICAgICAgICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlv blN0YXRlU3RhcnRXYWl0UmVzcG9uc2U7CisKKyAgICAgICAgICAgICAgICAgICAgLy8gU3RhcnQg dGhlIGFuaW1hdGlvbgorICAgICAgICAgICAgICAgICAgICBpZiAob3ZlcnJpZGRlbigpKSB7Cisg ICAgICAgICAgICAgICAgICAgICAgICAvLyBXZSB3b24ndCB0cnkgdG8gc3RhcnQgYWNjZWxlcmF0 ZWQgYW5pbWF0aW9ucyBpZiB3ZSBhcmUgb3ZlcnJpZGRlbiBhbmQKKyAgICAgICAgICAgICAgICAg ICAgICAgIC8vIGp1c3QgbW92ZSBvbiB0byB0aGUgbmV4dCBzdGF0ZS4KKyAgICAgICAgICAgICAg ICAgICAgICAgIHVwZGF0ZVN0YXRlTWFjaGluZShBbmltYXRpb25TdGF0ZUlucHV0U3RhcnRUaW1l U2V0LCBiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKSk7CisgICAgICAgICAgICAgICAgICAgICAg ICBtX2lzQWNjZWxlcmF0ZWQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICB9IGVsc2Ugewor ICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBzdGFydGVkID0gc3RhcnRBbmltYXRpb24oYmVn aW5BbmltYXRpb25VcGRhdGVUaW1lKCkgLSBtX3N0YXJ0VGltZSk7CisgICAgICAgICAgICAgICAg ICAgICAgICBtX2NvbXBBbmltLT5hbmltYXRpb25Db250cm9sbGVyKCktPmFkZFRvU3RhcnRUaW1l UmVzcG9uc2VXYWl0TGlzdCh0aGlzLCBzdGFydGVkKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IG1faXNBY2NlbGVyYXRlZCA9ICFzdGFydGVkOworICAgICAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAg ICAgICAgICAgCisgICAgICAgICAgICBpZiAoaW5wdXQgPT0gQW5pbWF0aW9uU3RhdGVJbnB1dFN0 YXJ0VGltZVNldCkgeworICAgICAgICAgICAgICAgIEFTU0VSVChtX2FuaW1TdGF0ZSA9PSBBbmlt YXRpb25TdGF0ZVBhdXNlZFdhaXRSZXNwb25zZSk7CisgICAgICAgICAgICAgICAgCisgICAgICAg ICAgICAgICAgLy8gV2UgYXJlIHBhdXNlZCBidXQgd2UgZ290IHRoZSBjYWxsYmFjayB0aGF0IG5v dGlmaWVzIHVzIHRoYXQgYW4gYWNjZWxlcmF0ZWQgYW5pbWF0aW9uIHN0YXJ0ZWQuCisgICAgICAg ICAgICAgICAgLy8gV2UgaWdub3JlIHRoZSBzdGFydCB0aW1lIGFuZCBqdXN0IG1vdmUgaW50byB0 aGUgcGF1c2VkLXJ1biBzdGF0ZS4KICAgICAgICAgICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1h dGlvblN0YXRlUGF1c2VkUnVuOwogICAgICAgICAgICAgICAgIEFTU0VSVChtX3N0YXJ0VGltZSA9 PSAwKTsKICAgICAgICAgICAgICAgICBtX3N0YXJ0VGltZSA9IHBhcmFtOwpAQCAtMTA5MywyNyAr MTEzMiwxMSBAQCB2b2lkIEFuaW1hdGlvbkJhc2U6OnVwZGF0ZVN0YXRlTWFjaGluZShBCiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAg ICAgIC8vIFVwZGF0ZSB0aGUgdGltZXMKLSAgICAgICAgICAgIGlmIChtX2FuaW1TdGF0ZSA9PSBB bmltYXRpb25TdGF0ZVBhdXNlZFJ1bikKLSAgICAgICAgICAgICAgICBtX3N0YXJ0VGltZSArPSBi ZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKSAtIG1fcGF1c2VUaW1lOwotICAgICAgICAgICAgZWxz ZQotICAgICAgICAgICAgICAgIG1fc3RhcnRUaW1lID0gMDsKLSAgICAgICAgICAgIG1fcGF1c2VU aW1lID0gLTE7Ci0KLSAgICAgICAgICAgIC8vIFdlIHdlcmUgd2FpdGluZyBmb3IgYSBiZWdpbiB0 aW1lIHJlc3BvbnNlIGZyb20gdGhlIGFuaW1hdGlvbiwgZ28gYmFjayBhbmQgd2FpdCBhZ2Fpbgot ICAgICAgICAgICAgbV9hbmltU3RhdGUgPSBBbmltYXRpb25TdGF0ZVN0YXJ0V2FpdFJlc3BvbnNl OwotCi0gICAgICAgICAgICAvLyBTdGFydCB0aGUgYW5pbWF0aW9uCi0gICAgICAgICAgICBpZiAo b3ZlcnJpZGRlbigpKSB7Ci0gICAgICAgICAgICAgICAgLy8gV2Ugd29uJ3QgdHJ5IHRvIHN0YXJ0 IGFjY2VsZXJhdGVkIGFuaW1hdGlvbnMgaWYgd2UgYXJlIG92ZXJyaWRkZW4gYW5kCi0gICAgICAg ICAgICAgICAgLy8ganVzdCBtb3ZlIG9uIHRvIHRoZSBuZXh0IHN0YXRlLgotICAgICAgICAgICAg ICAgIHVwZGF0ZVN0YXRlTWFjaGluZShBbmltYXRpb25TdGF0ZUlucHV0U3RhcnRUaW1lU2V0LCBi ZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKSk7Ci0gICAgICAgICAgICAgICAgbV9pc0FjY2VsZXJh dGVkID0gZmFsc2U7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGJvb2wg c3RhcnRlZCA9IHN0YXJ0QW5pbWF0aW9uKGJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSgpIC0gbV9z dGFydFRpbWUpOwotICAgICAgICAgICAgICAgIG1fY29tcEFuaW0tPmFuaW1hdGlvbkNvbnRyb2xs ZXIoKS0+YWRkVG9TdGFydFRpbWVSZXNwb25zZVdhaXRMaXN0KHRoaXMsIHN0YXJ0ZWQpOwotICAg ICAgICAgICAgICAgIG1faXNBY2NlbGVyYXRlZCA9IHN0YXJ0ZWQ7Ci0gICAgICAgICAgICB9Cisg ICAgICAgICAgICBBU1NFUlQobV9hbmltU3RhdGUgPT0gQW5pbWF0aW9uU3RhdGVQYXVzZWRXYWl0 U3R5bGVBdmFpbGFibGUpOworICAgICAgICAgICAgLy8gV2UgYXJlIHBhdXNlZCBidXQgd2UgZ290 IHRoZSBjYWxsYmFjayB0aGF0IG5vdGlmaWVzIHVzIHRoYXQgc3R5bGUgaGFzIGJlZW4gdXBkYXRl ZC4KKyAgICAgICAgICAgIC8vIFdlIG1vdmUgdG8gdGhlIEFuaW1hdGlvblN0YXRlUGF1c2VkV2Fp dFJlc3BvbnNlIHN0YXRlCisgICAgICAgICAgICBtX2FuaW1TdGF0ZSA9IEFuaW1hdGlvblN0YXRl UGF1c2VkV2FpdFJlc3BvbnNlOworICAgICAgICAgICAgb3ZlcnJpZGVBbmltYXRpb25zKCk7CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBbmltYXRpb25TdGF0ZUZpbGxpbmdGb3J3 YXJkczoKICAgICAgICAgY2FzZSBBbmltYXRpb25TdGF0ZURvbmU6CkluZGV4OiBXZWJDb3JlL3Bh Z2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2Uv YW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaAkocmV2aXNpb24gNjM4NDYpCisrKyBXZWJDb3JlL3Bh Z2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjksNiArNjks NyBAQCBwdWJsaWM6CiAgICAgICAgIEFuaW1hdGlvblN0YXRlTG9vcGluZywgICAgICAgICAgICAg IC8vIHJlc3BvbnNlIHJlY2VpdmVkLCBhbmltYXRpb24gcnVubmluZywgbG9vcCB0aW1lciBydW5u aW5nLCB3YWl0aW5nIGZvciBmaXJlCiAgICAgICAgIEFuaW1hdGlvblN0YXRlRW5kaW5nLCAgICAg ICAgICAgICAgIC8vIHJlY2VpdmVkLCBhbmltYXRpb24gcnVubmluZywgZW5kIHRpbWVyIHJ1bm5p bmcsIHdhaXRpbmcgZm9yIGZpcmUKICAgICAgICAgQW5pbWF0aW9uU3RhdGVQYXVzZWRXYWl0VGlt ZXIsICAgICAgLy8gaW4gcGF1c2UgbW9kZSB3aGVuIGFuaW1hdGlvbiBzdGFydGVkCisgICAgICAg IEFuaW1hdGlvblN0YXRlUGF1c2VkV2FpdFN0eWxlQXZhaWxhYmxlLCAvLyBpbiBwYXVzZSBtb2Rl IHdoZW4gd2FpdGluZyBmb3Igc3R5bGUgc2V0dXAKICAgICAgICAgQW5pbWF0aW9uU3RhdGVQYXVz ZWRXYWl0UmVzcG9uc2UsICAgLy8gYW5pbWF0aW9uIHBhdXNlZCB3aGVuIGluIFNUQVJUSU5HIHN0 YXRlCiAgICAgICAgIEFuaW1hdGlvblN0YXRlUGF1c2VkUnVuLCAgICAgICAgICAgIC8vIGFuaW1h dGlvbiBwYXVzZWQgd2hlbiBpbiBMT09QSU5HIG9yIEVORElORyBzdGF0ZQogICAgICAgICBBbmlt YXRpb25TdGF0ZURvbmUsICAgICAgICAgICAgICAgICAvLyBlbmQgdGltZXIgZmlyZWQsIGFuaW1h dGlvbiBmaW5pc2hlZCBhbmQgcmVtb3ZlZAo=