137782 2014-10-16 10:56:31 -0700 [GLIB] Add API to GMainLoopSource to schedule sources after a delay in microseconds 2014-10-17 03:10:54 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned benjamin cmarcelo commit-queue gustavo pnormand zan oldest_to_newest 1042137 0 cgarcia 2014-10-16 10:56:31 -0700 In some cases when we have a double with the time in seconds, the conversion to milliseconds ends up truncating the value to 0, and the source scheduled immediately. 1042141 1 239953 cgarcia 2014-10-16 11:04:16 -0700 Created attachment 239953 Patch 1042144 2 239954 cgarcia 2014-10-16 11:20:18 -0700 Created attachment 239954 Re-submitted for EWS 1042146 3 commit-queue 2014-10-16 11:22:43 -0700 Attachment 239954 did not pass style-queue: ERROR: Source/WTF/wtf/gobject/GMainLoopSource.cpp:265: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WTF/wtf/gobject/GMainLoopSource.cpp:282: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1042326 4 239954 svillar 2014-10-17 01:15:58 -0700 Comment on attachment 239954 Re-submitted for EWS View in context: https://bugs.webkit.org/attachment.cgi?id=239954&action=review > Source/WTF/wtf/gobject/GMainLoopSource.cpp:295 > + }; Either one of these two is wrong, check the position of WTF::move and the one of the callback. > Source/WTF/wtf/gobject/GMainLoopSource.cpp:338 > + Since the only difference is the callback function, couldn't we use a template and avoid repetitions? 1042329 5 239954 cgarcia 2014-10-17 01:38:42 -0700 Comment on attachment 239954 Re-submitted for EWS View in context: https://bugs.webkit.org/attachment.cgi?id=239954&action=review >> Source/WTF/wtf/gobject/GMainLoopSource.cpp:295 >> + }; > > Either one of these two is wrong, check the position of WTF::move and the one of the callback. I don't understand what you mean. There are two WTF::move here one is for the destroy func and the other is for the bool callback. There's nothing wrong there. >> Source/WTF/wtf/gobject/GMainLoopSource.cpp:338 >> + > > Since the only difference is the callback function, couldn't we use a template and avoid repetitions? I guess, I find this more convenient to use, but in any case, that would be a different issue. 1042343 6 239954 svillar 2014-10-17 02:39:18 -0700 Comment on attachment 239954 Re-submitted for EWS View in context: https://bugs.webkit.org/attachment.cgi?id=239954&action=review >>> Source/WTF/wtf/gobject/GMainLoopSource.cpp:295 >>> + }; >> >> Either one of these two is wrong, check the position of WTF::move and the one of the callback. > > I don't understand what you mean. There are two WTF::move here one is for the destroy func and the other is for the bool callback. There's nothing wrong there. I was talking about the voidCallback and the boolCallback, but they're correctly placed anyway, just checked the Context struct. 1042351 7 cgarcia 2014-10-17 03:10:54 -0700 Committed r174818: <http://trac.webkit.org/changeset/174818> 239953 2014-10-16 11:04:16 -0700 2014-10-16 11:20:18 -0700 Patch wtf-main-loop-source-microseconds.diff text/plain 11022 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggMzRkOWI5ZC4uNDQ5NzM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxNC0xMC0xNiAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dM SUJdIEFkZCBBUEkgdG8gR01haW5Mb29wU291cmNlIHRvIHNjaGVkdWxlIHNvdXJjZXMgYWZ0ZXIg YSBkZWxheSBpbiBtaWNyb3NlY29uZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNzc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEluIHNvbWUgY2FzZXMgd2hlbiB3ZSBoYXZlIGEgZG91YmxlIHdpdGgg dGhlIHRpbWUgaW4gc2Vjb25kcywgdGhlCisgICAgICAgIGNvbnZlcnNpb24gdG8gbWlsbGlzZWNv bmRzIGVuZHMgdXAgdHJ1bmNhdGluZyB0aGUgdmFsdWUgdG8gMCwgYW5kCisgICAgICAgIHRoZSBz b3VyY2Ugc2NoZWR1bGVkIGltbWVkaWF0ZWx5LgorCisgICAgICAgICogd3RmL2dvYmplY3QvR01h aW5Mb29wU291cmNlLmNwcDoKKyAgICAgICAgKFdURjo6Y3JlYXRlTWljcm9zZWNvbmRzVGltZW91 dFNvdXJjZSk6IFVzZSBhIGN1c3RvbSB0aW1lb3V0CisgICAgICAgIHNvdXJjZSB0aGF0IGhhbmRs ZXMgdGhlIGludGVydmFsIGluIG1pY3Jvc2Vjb25kcyBpbnN0ZWFkIG9mIG1pbGxpc2Vjb25kcy4K KyAgICAgICAgKFdURjo6R01haW5Mb29wU291cmNlOjpzY2hlZHVsZUFmdGVyRGVsYXkpOiBVc2Ug TWljcm9zZWNvbmRzVGltZW91dFNvdXJjZS4KKyAgICAgICAgKFdURjo6R01haW5Mb29wU291cmNl OjpzY2hlZHVsZUFmdGVyRGVsYXlBbmREZWxldGVPbkRlc3Ryb3kpOiBEaXR0by4KKyAgICAgICAg KiB3dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaDoKKwogMjAxNC0xMC0xNCAgQnJlbnQgRnVs Z2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBVbnJldmlld2VkIGdh cmRlbmluZy4gSWdub3JlIFZpc3VhbCBTdHVkaW8gKi5zZGYgZmlsZXMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGQxMGU1NC4uMzY2ZjY3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTEwLTE2 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBb R0xJQl0gQWRkIEFQSSB0byBHTWFpbkxvb3BTb3VyY2UgdG8gc2NoZWR1bGUgc291cmNlcyBhZnRl ciBhIGRlbGF5IGluIG1pY3Jvc2Vjb25kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NzgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2hhcmVkVGltZXJHdGsuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6c2V0U2hhcmVkVGltZXJGaXJlSW50ZXJ2YWwpOiBVc2UgbWljcm9zZWNv bmRzIGluc3RlYWQgb2YKKyAgICAgICAgbWlsbGlzZWNvbmRzLgorCiAyMDE0LTEwLTE1ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBN b3ZlIHRvdWNoIGV2ZW50cyBoYW5kbGluZyBmcm9tIFBsYXRmb3JtIHRvIFdlYktpdDIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwppbmRleCBkYTZkMWI0Li44YjExNTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTQtMTAtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtHTElCXSBBZGQgQVBJIHRvIEdNYWluTG9vcFNvdXJjZSB0byBzY2hlZHVsZSBzb3Vy Y2VzIGFmdGVyIGEgZGVsYXkgaW4gbWljcm9zZWNvbmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc3ODIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJU cmVlSG9zdEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6OmxheWVy Rmx1c2hUaW1lckZpcmVkKTogVXNlIG1pY3Jvc2Vjb25kcworICAgICAgICBpbnN0ZWFkIG9mIG1p bGxpc2Vjb25kcy4KKwogMjAxNC0xMC0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gTW92ZSB0b3VjaCBldmVudHMgaGFuZGxpbmcg ZnJvbSBQbGF0Zm9ybSB0byBXZWJLaXQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9nb2Jq ZWN0L0dNYWluTG9vcFNvdXJjZS5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9v cFNvdXJjZS5jcHAKaW5kZXggZTVkNTkwZi4uMzAxZGQyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL2dv YmplY3QvR01haW5Mb29wU291cmNlLmNwcApAQCAtMjMzLDYgKzIzMyw2OSBAQCB2b2lkIEdNYWlu TG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVu Y3Rpb248Ym9vbCAoKQogICAgIHNjaGVkdWxlVGltZW91dFNvdXJjZShuYW1lLCByZWludGVycHJl dF9jYXN0PEdTb3VyY2VGdW5jPihib29sU291cmNlQ2FsbGJhY2spLCBwcmlvcml0eSwgY29udGV4 dCk7CiB9CiAKK3N0cnVjdCBNaWNyb3NlY29uZHNUaW1lb3V0U291cmNlIHsKKyAgICBHU291cmNl IHNvdXJjZTsKKyAgICB1aW50NjRfdCBkZWxheTsKK307CisKK3N0YXRpYyBHU291cmNlRnVuY3Mg bWljcm9zZWNvbmRzVGltZW91dFNvdXJjZUZ1bmN0aW9ucyA9IHsKKyAgICBudWxscHRyLCAvLyBw cmVwYXJlCisgICAgbnVsbHB0ciwgLy8gY2hlY2sKKyAgICAvLyBkaXNwYXRjaAorICAgIFtdKEdT b3VyY2UqIHNvdXJjZSwgR1NvdXJjZUZ1bmMgY2FsbGJhY2ssIGdwb2ludGVyIHVzZXJEYXRhKSAt PiBnYm9vbGVhbgorICAgIHsKKyAgICAgICAgYm9vbCByZXBlYXQgPSBjYWxsYmFjayh1c2VyRGF0 YSk7CisgICAgICAgIGlmIChyZXBlYXQpCisgICAgICAgICAgICBnX3NvdXJjZV9zZXRfcmVhZHlf dGltZShzb3VyY2UsIGdfc291cmNlX2dldF90aW1lKHNvdXJjZSkgKyByZWludGVycHJldF9jYXN0 PE1pY3Jvc2Vjb25kc1RpbWVvdXRTb3VyY2UqPihzb3VyY2UpLT5kZWxheSk7CisgICAgICAgIHJl dHVybiByZXBlYXQ7CisgICAgfSwKKyAgICBudWxscHRyLCAvLyBmaW5hbGl6ZQorICAgIG51bGxw dHIsIC8vIGNsb3N1cmVfY2FsbGJhY2sKKyAgICBudWxscHRyIC8vIGNsb3N1cmVfbWFyc2hhbGwK K307CisKK3N0YXRpYyBHU291cmNlKiBjcmVhdGVNaWNyb3NlY29uZHNUaW1lb3V0U291cmNlKHVp bnQ2NF90IGRlbGF5KQoreworICAgIEdTb3VyY2UqIHNvdXJjZSA9IGdfc291cmNlX25ldygmbWlj cm9zZWNvbmRzVGltZW91dFNvdXJjZUZ1bmN0aW9ucywgc2l6ZW9mKE1pY3Jvc2Vjb25kc1RpbWVv dXRTb3VyY2UpKTsKKyAgICByZWludGVycHJldF9jYXN0PE1pY3Jvc2Vjb25kc1RpbWVvdXRTb3Vy Y2UqPihzb3VyY2UpLT5kZWxheSA9IGRlbGF5OworICAgIGdfc291cmNlX3NldF9yZWFkeV90aW1l KHNvdXJjZSwgZ19nZXRfbW9ub3RvbmljX3RpbWUoKSArIGRlbGF5KTsKKyAgICByZXR1cm4gc291 cmNlOworfQorCit2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0 IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZnVuY3Rpb24sIHN0ZDo6Y2hyb25v OjptaWNyb3NlY29uZHMgZGVsYXksIGludCBwcmlvcml0eSwgc3RkOjpmdW5jdGlvbjx2b2lkICgp PiBkZXN0cm95RnVuY3Rpb24sIEdNYWluQ29udGV4dCogY29udGV4dCkKK3sKKyAgICBjYW5jZWwo KTsKKworICAgIEFTU0VSVCghbV9jb250ZXh0LnNvdXJjZSk7CisgICAgbV9jb250ZXh0ID0gewor ICAgICAgICBhZG9wdEdSZWYoY3JlYXRlTWljcm9zZWNvbmRzVGltZW91dFNvdXJjZShkZWxheS5j b3VudCgpKSksCisgICAgICAgIG51bGxwdHIsIC8vIGNhbmNlbGxhYmxlCisgICAgICAgIG51bGxw dHIsIC8vIHNvY2tldENhbmNlbGxhYmxlCisgICAgICAgIFdURjo6bW92ZShmdW5jdGlvbiksCisg ICAgICAgIG51bGxwdHIsIC8vIGJvb2xDYWxsYmFjaworICAgICAgICBudWxscHRyLCAvLyBzb2Nr ZXRDYWxsYmFjaworICAgICAgICBXVEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKQorICAgIH07Cisg ICAgc2NoZWR1bGVUaW1lb3V0U291cmNlKG5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1 bmM+KHZvaWRTb3VyY2VDYWxsYmFjayksIHByaW9yaXR5LCBjb250ZXh0KTsKK30KKwordm9pZCBH TWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6 OmZ1bmN0aW9uPGJvb2wgKCk+IGZ1bmN0aW9uLCBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGRl bGF5LCBpbnQgcHJpb3JpdHksIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZGVzdHJveUZ1bmN0aW9u LCBHTWFpbkNvbnRleHQqIGNvbnRleHQpCit7CisgICAgY2FuY2VsKCk7CisKKyAgICBBU1NFUlQo IW1fY29udGV4dC5zb3VyY2UpOworICAgIG1fY29udGV4dCA9IHsKKyAgICAgICAgYWRvcHRHUmVm KGNyZWF0ZU1pY3Jvc2Vjb25kc1RpbWVvdXRTb3VyY2UoZGVsYXkuY291bnQoKSkpLAorICAgICAg ICBudWxscHRyLCAvLyBjYW5jZWxsYWJsZQorICAgICAgICBudWxscHRyLCAvLyBzb2NrZXRDYW5j ZWxsYWJsZQorICAgICAgICBudWxscHRyLCAvLyB2b2lkQ2FsbGJhY2sKKyAgICAgICAgV1RGOjpt b3ZlKGZ1bmN0aW9uKSwKKyAgICAgICAgbnVsbHB0ciwgLy8gc29ja2V0Q2FsbGJhY2sKKyAgICAg ICAgV1RGOjptb3ZlKGRlc3Ryb3lGdW5jdGlvbikKKyAgICB9OworICAgIHNjaGVkdWxlVGltZW91 dFNvdXJjZShuYW1lLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPihib29sU291cmNlQ2Fs bGJhY2spLCBwcmlvcml0eSwgY29udGV4dCk7Cit9CisKIHZvaWQgR01haW5Mb29wU291cmNlOjpz Y2hlZHVsZUFuZERlbGV0ZU9uRGVzdHJveShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6OmZ1bmN0aW9u PHZvaWQoKT4gZnVuY3Rpb24sIGludCBwcmlvcml0eSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRl c3Ryb3lGdW5jdGlvbiwgR01haW5Db250ZXh0KiBjb250ZXh0KQogewogICAgIGNyZWF0ZSgpLnNj aGVkdWxlKG5hbWUsIGZ1bmN0aW9uLCBwcmlvcml0eSwgZGVzdHJveUZ1bmN0aW9uLCBjb250ZXh0 KTsKQEAgLTI2Myw2ICszMjYsMTYgQEAgdm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlQWZ0 ZXJEZWxheUFuZERlbGV0ZU9uRGVzdHJveShjb25zdCBjaGFyKiBuYW1lLCBzdGQKICAgICBjcmVh dGUoKS5zY2hlZHVsZUFmdGVyRGVsYXkobmFtZSwgZnVuY3Rpb24sIGRlbGF5LCBwcmlvcml0eSwg ZGVzdHJveUZ1bmN0aW9uLCBjb250ZXh0KTsKIH0KIAordm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNj aGVkdWxlQWZ0ZXJEZWxheUFuZERlbGV0ZU9uRGVzdHJveShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQoKT4gZnVuY3Rpb24sIHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMgZGVs YXksIGludCBwcmlvcml0eSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ryb3lGdW5jdGlvbiwg R01haW5Db250ZXh0KiBjb250ZXh0KQoreworICAgIGNyZWF0ZSgpLnNjaGVkdWxlQWZ0ZXJEZWxh eShuYW1lLCBmdW5jdGlvbiwgZGVsYXksIHByaW9yaXR5LCBkZXN0cm95RnVuY3Rpb24sIGNvbnRl eHQpOworfQorCit2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5QW5kRGVs ZXRlT25EZXN0cm95KGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCgpPiBmdW5j dGlvbiwgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBkZWxheSwgaW50IHByaW9yaXR5LCBzdGQ6 OmZ1bmN0aW9uPHZvaWQoKT4gZGVzdHJveUZ1bmN0aW9uLCBHTWFpbkNvbnRleHQqIGNvbnRleHQp Cit7CisgICAgY3JlYXRlKCkuc2NoZWR1bGVBZnRlckRlbGF5KG5hbWUsIGZ1bmN0aW9uLCBkZWxh eSwgcHJpb3JpdHksIGRlc3Ryb3lGdW5jdGlvbiwgY29udGV4dCk7Cit9CisKIGJvb2wgR01haW5M b29wU291cmNlOjpwcmVwYXJlVm9pZENhbGxiYWNrKENvbnRleHQmIGNvbnRleHQpCiB7CiAgICAg aWYgKCFtX2NvbnRleHQuc291cmNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvZ29iamVj dC9HTWFpbkxvb3BTb3VyY2UuaCBiL1NvdXJjZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291 cmNlLmgKaW5kZXggMzZkZDQ1OS4uMDk3ZmRhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYv Z29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dN YWluTG9vcFNvdXJjZS5oCkBAIC01Niw2ICs1Niw4IEBAIHB1YmxpYzoKICAgICBXVEZfRVhQT1JU X1BSSVZBVEUgdmlydHVhbCB2b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFyKiBuYW1l LCBzdGQ6OmZ1bmN0aW9uPGJvb2woKT4sIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMsIGludCBw cmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ry b3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKICAgICBXVEZf RVhQT1JUX1BSSVZBVEUgdmlydHVhbCB2b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFy KiBuYW1lLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4sIHN0ZDo6Y2hyb25vOjpzZWNvbmRzLCBpbnQg cHJpb3JpdHkgPSBHX1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBkZXN0 cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAgICAgV1RG X0VYUE9SVF9QUklWQVRFIHZpcnR1YWwgdm9pZCBzY2hlZHVsZUFmdGVyRGVsYXkoY29uc3QgY2hh ciogbmFtZSwgc3RkOjpmdW5jdGlvbjxib29sKCk+LCBzdGQ6OmNocm9ubzo6c2Vjb25kcywgaW50 IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGVz dHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOworICAgIFdU Rl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNo YXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiwgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25k cywgaW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQo KT4gZGVzdHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOwor ICAgIFdURl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVBZnRlckRlbGF5KGNv bnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCgpPiwgc3RkOjpjaHJvbm86Om1pY3Jv c2Vjb25kcywgaW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9u PHZvaWQoKT4gZGVzdHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxw dHIpOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgY2FuY2VsKCk7CiAKICAg ICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBzY2hlZHVsZShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6 OmZ1bmN0aW9uPGJvb2woR0lPQ29uZGl0aW9uKT4sIEdTb2NrZXQqLCBHSU9Db25kaXRpb24sIHN0 ZDo6ZnVuY3Rpb248dm9pZCgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRl eHQqID0gbnVsbHB0cik7CkBAIC02Niw2ICs2OCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9p ZCBzY2hlZHVsZUFmdGVyRGVsYXlBbmREZWxldGVPbkRlc3Ryb3koY29uc3QgY2hhciogbmFtZSwg c3RkOjpmdW5jdGlvbjxib29sKCk+LCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzLCBpbnQgcHJp b3JpdHkgPSBHX1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBkZXN0cm95 RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAgICAgc3RhdGlj IHZvaWQgc2NoZWR1bGVBZnRlckRlbGF5QW5kRGVsZXRlT25EZXN0cm95KGNvbnN0IGNoYXIqIG5h bWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiwgc3RkOjpjaHJvbm86OnNlY29uZHMsIGludCBwcmlv cml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ryb3lG dW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKICAgICBzdGF0aWMg dm9pZCBzY2hlZHVsZUFmdGVyRGVsYXlBbmREZWxldGVPbkRlc3Ryb3koY29uc3QgY2hhciogbmFt ZSwgc3RkOjpmdW5jdGlvbjxib29sKCk+LCBzdGQ6OmNocm9ubzo6c2Vjb25kcywgaW50IHByaW9y aXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGVzdHJveUZ1 bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOworICAgIHN0YXRpYyB2 b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheUFuZERlbGV0ZU9uRGVzdHJveShjb25zdCBjaGFyKiBuYW1l LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4sIHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMsIGludCBw cmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ry b3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKKyAgICBzdGF0 aWMgdm9pZCBzY2hlZHVsZUFmdGVyRGVsYXlBbmREZWxldGVPbkRlc3Ryb3koY29uc3QgY2hhciog bmFtZSwgc3RkOjpmdW5jdGlvbjxib29sKCk+LCBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzLCBp bnQgcHJpb3JpdHkgPSBHX1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBk ZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAKIHBy b3RlY3RlZDoKICAgICBlbnVtIFN0YXR1cyB7IFJlYWR5LCBTY2hlZHVsZWQsIERpc3BhdGNoaW5n IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2hhcmVkVGltZXJH dGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1NoYXJlZFRpbWVyR3RrLmNwcApp bmRleCBlYzkwZmQ0Li5iZGMzYzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvU2hhcmVkVGltZXJHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9TaGFyZWRUaW1lckd0ay5jcHAKQEAgLTQ4LDcgKzQ4LDcgQEAgdm9pZCBzZXRTaGFyZWRUaW1l ckZpcmVJbnRlcnZhbChkb3VibGUgaW50ZXJ2YWwpCiAgICAgQVNTRVJUKHNoYXJlZFRpbWVyRmly ZWRGdW5jdGlvbik7CiAKICAgICBnU2hhcmVkVGltZXIuc2NoZWR1bGVBZnRlckRlbGF5KCJbV2Vi S2l0XSBzaGFyZWRUaW1lclRpbWVvdXRDYWxsYmFjayIsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPihz aGFyZWRUaW1lckZpcmVkRnVuY3Rpb24pLAotICAgICAgICBzdGQ6OmNocm9ubzo6ZHVyYXRpb25f Y2FzdDxzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzPihzdGQ6OmNocm9ubzo6ZHVyYXRpb248ZG91 YmxlPihpbnRlcnZhbCkpLCBHREtfUFJJT1JJVFlfUkVEUkFXKTsKKyAgICAgICAgc3RkOjpjaHJv bm86OmR1cmF0aW9uX2Nhc3Q8c3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcz4oc3RkOjpjaHJvbm86 OmR1cmF0aW9uPGRvdWJsZT4oaW50ZXJ2YWwpKSwgR0RLX1BSSU9SSVRZX1JFRFJBVyk7CiB9CiAK IHZvaWQgc3RvcFNoYXJlZFRpbWVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwCmluZGV4IDVlOTRiMDgu LmJmYzc5NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9n dGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmNwcApAQCAtMjU5LDcgKzI1OSw3IEBAIHZvaWQg TGF5ZXJUcmVlSG9zdEd0azo6bGF5ZXJGbHVzaFRpbWVyRmlyZWQoKQogICAgICAgICBjb25zdCBk b3VibGUgdGFyZ2V0RlBTID0gNjA7CiAgICAgICAgIGRvdWJsZSBuZXh0Rmx1c2ggPSBzdGQ6Om1h eCgoMSAvIHRhcmdldEZQUykgLSAoY3VycmVudFRpbWUoKSAtIG1fbGFzdEZsdXNoVGltZSksIDAu MCk7CiAgICAgICAgIG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2suc2NoZWR1bGVBZnRlckRlbGF5 KCJbV2ViS2l0XSBsYXllckZsdXNoVGltZXIiLCBzdGQ6OmJpbmQoJkxheWVyVHJlZUhvc3RHdGs6 OmxheWVyRmx1c2hUaW1lckZpcmVkLCB0aGlzKSwKLSAgICAgICAgICAgIHN0ZDo6Y2hyb25vOjpk dXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM+KHN0ZDo6Y2hyb25vOjpkdXJh dGlvbjxkb3VibGU+KG5leHRGbHVzaCkpLCBHREtfUFJJT1JJVFlfRVZFTlRTKTsKKyAgICAgICAg ICAgIHN0ZDo6Y2hyb25vOjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHM+ KHN0ZDo6Y2hyb25vOjpkdXJhdGlvbjxkb3VibGU+KG5leHRGbHVzaCkpLCBHREtfUFJJT1JJVFlf RVZFTlRTKTsKICAgICB9CiB9CiAK 239954 2014-10-16 11:20:18 -0700 2014-10-17 02:39:18 -0700 Re-submitted for EWS wtf-main-loop-source-microseconds.diff text/plain 11022 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggMzRkOWI5ZC4uNDQ5NzM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxNC0xMC0xNiAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dM SUJdIEFkZCBBUEkgdG8gR01haW5Mb29wU291cmNlIHRvIHNjaGVkdWxlIHNvdXJjZXMgYWZ0ZXIg YSBkZWxheSBpbiBtaWNyb3NlY29uZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNzc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEluIHNvbWUgY2FzZXMgd2hlbiB3ZSBoYXZlIGEgZG91YmxlIHdpdGgg dGhlIHRpbWUgaW4gc2Vjb25kcywgdGhlCisgICAgICAgIGNvbnZlcnNpb24gdG8gbWlsbGlzZWNv bmRzIGVuZHMgdXAgdHJ1bmNhdGluZyB0aGUgdmFsdWUgdG8gMCwgYW5kCisgICAgICAgIHRoZSBz b3VyY2Ugc2NoZWR1bGVkIGltbWVkaWF0ZWx5LgorCisgICAgICAgICogd3RmL2dvYmplY3QvR01h aW5Mb29wU291cmNlLmNwcDoKKyAgICAgICAgKFdURjo6Y3JlYXRlTWljcm9zZWNvbmRzVGltZW91 dFNvdXJjZSk6IFVzZSBhIGN1c3RvbSB0aW1lb3V0CisgICAgICAgIHNvdXJjZSB0aGF0IGhhbmRs ZXMgdGhlIGludGVydmFsIGluIG1pY3Jvc2Vjb25kcyBpbnN0ZWFkIG9mIG1pbGxpc2Vjb25kcy4K KyAgICAgICAgKFdURjo6R01haW5Mb29wU291cmNlOjpzY2hlZHVsZUFmdGVyRGVsYXkpOiBVc2Ug TWljcm9zZWNvbmRzVGltZW91dFNvdXJjZS4KKyAgICAgICAgKFdURjo6R01haW5Mb29wU291cmNl OjpzY2hlZHVsZUFmdGVyRGVsYXlBbmREZWxldGVPbkRlc3Ryb3kpOiBEaXR0by4KKyAgICAgICAg KiB3dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaDoKKwogMjAxNC0xMC0xNCAgQnJlbnQgRnVs Z2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBVbnJldmlld2VkIGdh cmRlbmluZy4gSWdub3JlIFZpc3VhbCBTdHVkaW8gKi5zZGYgZmlsZXMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGQxMGU1NC4uMzY2ZjY3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTEwLTE2 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBb R0xJQl0gQWRkIEFQSSB0byBHTWFpbkxvb3BTb3VyY2UgdG8gc2NoZWR1bGUgc291cmNlcyBhZnRl ciBhIGRlbGF5IGluIG1pY3Jvc2Vjb25kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NzgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2hhcmVkVGltZXJHdGsuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6c2V0U2hhcmVkVGltZXJGaXJlSW50ZXJ2YWwpOiBVc2UgbWljcm9zZWNv bmRzIGluc3RlYWQgb2YKKyAgICAgICAgbWlsbGlzZWNvbmRzLgorCiAyMDE0LTEwLTE1ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBN b3ZlIHRvdWNoIGV2ZW50cyBoYW5kbGluZyBmcm9tIFBsYXRmb3JtIHRvIFdlYktpdDIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwppbmRleCBkYTZkMWI0Li44YjExNTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTQtMTAtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtHTElCXSBBZGQgQVBJIHRvIEdNYWluTG9vcFNvdXJjZSB0byBzY2hlZHVsZSBzb3Vy Y2VzIGFmdGVyIGEgZGVsYXkgaW4gbWljcm9zZWNvbmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc3ODIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJU cmVlSG9zdEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6OmxheWVy Rmx1c2hUaW1lckZpcmVkKTogVXNlIG1pY3Jvc2Vjb25kcworICAgICAgICBpbnN0ZWFkIG9mIG1p bGxpc2Vjb25kcy4KKwogMjAxNC0xMC0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gTW92ZSB0b3VjaCBldmVudHMgaGFuZGxpbmcg ZnJvbSBQbGF0Zm9ybSB0byBXZWJLaXQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9nb2Jq ZWN0L0dNYWluTG9vcFNvdXJjZS5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dNYWluTG9v cFNvdXJjZS5jcHAKaW5kZXggZTVkNTkwZi4uMzAxZGQyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL2dv YmplY3QvR01haW5Mb29wU291cmNlLmNwcApAQCAtMjMzLDYgKzIzMyw2OSBAQCB2b2lkIEdNYWlu TG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVu Y3Rpb248Ym9vbCAoKQogICAgIHNjaGVkdWxlVGltZW91dFNvdXJjZShuYW1lLCByZWludGVycHJl dF9jYXN0PEdTb3VyY2VGdW5jPihib29sU291cmNlQ2FsbGJhY2spLCBwcmlvcml0eSwgY29udGV4 dCk7CiB9CiAKK3N0cnVjdCBNaWNyb3NlY29uZHNUaW1lb3V0U291cmNlIHsKKyAgICBHU291cmNl IHNvdXJjZTsKKyAgICB1aW50NjRfdCBkZWxheTsKK307CisKK3N0YXRpYyBHU291cmNlRnVuY3Mg bWljcm9zZWNvbmRzVGltZW91dFNvdXJjZUZ1bmN0aW9ucyA9IHsKKyAgICBudWxscHRyLCAvLyBw cmVwYXJlCisgICAgbnVsbHB0ciwgLy8gY2hlY2sKKyAgICAvLyBkaXNwYXRjaAorICAgIFtdKEdT b3VyY2UqIHNvdXJjZSwgR1NvdXJjZUZ1bmMgY2FsbGJhY2ssIGdwb2ludGVyIHVzZXJEYXRhKSAt PiBnYm9vbGVhbgorICAgIHsKKyAgICAgICAgYm9vbCByZXBlYXQgPSBjYWxsYmFjayh1c2VyRGF0 YSk7CisgICAgICAgIGlmIChyZXBlYXQpCisgICAgICAgICAgICBnX3NvdXJjZV9zZXRfcmVhZHlf dGltZShzb3VyY2UsIGdfc291cmNlX2dldF90aW1lKHNvdXJjZSkgKyByZWludGVycHJldF9jYXN0 PE1pY3Jvc2Vjb25kc1RpbWVvdXRTb3VyY2UqPihzb3VyY2UpLT5kZWxheSk7CisgICAgICAgIHJl dHVybiByZXBlYXQ7CisgICAgfSwKKyAgICBudWxscHRyLCAvLyBmaW5hbGl6ZQorICAgIG51bGxw dHIsIC8vIGNsb3N1cmVfY2FsbGJhY2sKKyAgICBudWxscHRyIC8vIGNsb3N1cmVfbWFyc2hhbGwK K307CisKK3N0YXRpYyBHU291cmNlKiBjcmVhdGVNaWNyb3NlY29uZHNUaW1lb3V0U291cmNlKHVp bnQ2NF90IGRlbGF5KQoreworICAgIEdTb3VyY2UqIHNvdXJjZSA9IGdfc291cmNlX25ldygmbWlj cm9zZWNvbmRzVGltZW91dFNvdXJjZUZ1bmN0aW9ucywgc2l6ZW9mKE1pY3Jvc2Vjb25kc1RpbWVv dXRTb3VyY2UpKTsKKyAgICByZWludGVycHJldF9jYXN0PE1pY3Jvc2Vjb25kc1RpbWVvdXRTb3Vy Y2UqPihzb3VyY2UpLT5kZWxheSA9IGRlbGF5OworICAgIGdfc291cmNlX3NldF9yZWFkeV90aW1l KHNvdXJjZSwgZ19nZXRfbW9ub3RvbmljX3RpbWUoKSArIGRlbGF5KTsKKyAgICByZXR1cm4gc291 cmNlOworfQorCit2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0 IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZnVuY3Rpb24sIHN0ZDo6Y2hyb25v OjptaWNyb3NlY29uZHMgZGVsYXksIGludCBwcmlvcml0eSwgc3RkOjpmdW5jdGlvbjx2b2lkICgp PiBkZXN0cm95RnVuY3Rpb24sIEdNYWluQ29udGV4dCogY29udGV4dCkKK3sKKyAgICBjYW5jZWwo KTsKKworICAgIEFTU0VSVCghbV9jb250ZXh0LnNvdXJjZSk7CisgICAgbV9jb250ZXh0ID0gewor ICAgICAgICBhZG9wdEdSZWYoY3JlYXRlTWljcm9zZWNvbmRzVGltZW91dFNvdXJjZShkZWxheS5j b3VudCgpKSksCisgICAgICAgIG51bGxwdHIsIC8vIGNhbmNlbGxhYmxlCisgICAgICAgIG51bGxw dHIsIC8vIHNvY2tldENhbmNlbGxhYmxlCisgICAgICAgIFdURjo6bW92ZShmdW5jdGlvbiksCisg ICAgICAgIG51bGxwdHIsIC8vIGJvb2xDYWxsYmFjaworICAgICAgICBudWxscHRyLCAvLyBzb2Nr ZXRDYWxsYmFjaworICAgICAgICBXVEY6Om1vdmUoZGVzdHJveUZ1bmN0aW9uKQorICAgIH07Cisg ICAgc2NoZWR1bGVUaW1lb3V0U291cmNlKG5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1 bmM+KHZvaWRTb3VyY2VDYWxsYmFjayksIHByaW9yaXR5LCBjb250ZXh0KTsKK30KKwordm9pZCBH TWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6 OmZ1bmN0aW9uPGJvb2wgKCk+IGZ1bmN0aW9uLCBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzIGRl bGF5LCBpbnQgcHJpb3JpdHksIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZGVzdHJveUZ1bmN0aW9u LCBHTWFpbkNvbnRleHQqIGNvbnRleHQpCit7CisgICAgY2FuY2VsKCk7CisKKyAgICBBU1NFUlQo IW1fY29udGV4dC5zb3VyY2UpOworICAgIG1fY29udGV4dCA9IHsKKyAgICAgICAgYWRvcHRHUmVm KGNyZWF0ZU1pY3Jvc2Vjb25kc1RpbWVvdXRTb3VyY2UoZGVsYXkuY291bnQoKSkpLAorICAgICAg ICBudWxscHRyLCAvLyBjYW5jZWxsYWJsZQorICAgICAgICBudWxscHRyLCAvLyBzb2NrZXRDYW5j ZWxsYWJsZQorICAgICAgICBudWxscHRyLCAvLyB2b2lkQ2FsbGJhY2sKKyAgICAgICAgV1RGOjpt b3ZlKGZ1bmN0aW9uKSwKKyAgICAgICAgbnVsbHB0ciwgLy8gc29ja2V0Q2FsbGJhY2sKKyAgICAg ICAgV1RGOjptb3ZlKGRlc3Ryb3lGdW5jdGlvbikKKyAgICB9OworICAgIHNjaGVkdWxlVGltZW91 dFNvdXJjZShuYW1lLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPihib29sU291cmNlQ2Fs bGJhY2spLCBwcmlvcml0eSwgY29udGV4dCk7Cit9CisKIHZvaWQgR01haW5Mb29wU291cmNlOjpz Y2hlZHVsZUFuZERlbGV0ZU9uRGVzdHJveShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6OmZ1bmN0aW9u PHZvaWQoKT4gZnVuY3Rpb24sIGludCBwcmlvcml0eSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRl c3Ryb3lGdW5jdGlvbiwgR01haW5Db250ZXh0KiBjb250ZXh0KQogewogICAgIGNyZWF0ZSgpLnNj aGVkdWxlKG5hbWUsIGZ1bmN0aW9uLCBwcmlvcml0eSwgZGVzdHJveUZ1bmN0aW9uLCBjb250ZXh0 KTsKQEAgLTI2Myw2ICszMjYsMTYgQEAgdm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNjaGVkdWxlQWZ0 ZXJEZWxheUFuZERlbGV0ZU9uRGVzdHJveShjb25zdCBjaGFyKiBuYW1lLCBzdGQKICAgICBjcmVh dGUoKS5zY2hlZHVsZUFmdGVyRGVsYXkobmFtZSwgZnVuY3Rpb24sIGRlbGF5LCBwcmlvcml0eSwg ZGVzdHJveUZ1bmN0aW9uLCBjb250ZXh0KTsKIH0KIAordm9pZCBHTWFpbkxvb3BTb3VyY2U6OnNj aGVkdWxlQWZ0ZXJEZWxheUFuZERlbGV0ZU9uRGVzdHJveShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQoKT4gZnVuY3Rpb24sIHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMgZGVs YXksIGludCBwcmlvcml0eSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ryb3lGdW5jdGlvbiwg R01haW5Db250ZXh0KiBjb250ZXh0KQoreworICAgIGNyZWF0ZSgpLnNjaGVkdWxlQWZ0ZXJEZWxh eShuYW1lLCBmdW5jdGlvbiwgZGVsYXksIHByaW9yaXR5LCBkZXN0cm95RnVuY3Rpb24sIGNvbnRl eHQpOworfQorCit2b2lkIEdNYWluTG9vcFNvdXJjZTo6c2NoZWR1bGVBZnRlckRlbGF5QW5kRGVs ZXRlT25EZXN0cm95KGNvbnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCgpPiBmdW5j dGlvbiwgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBkZWxheSwgaW50IHByaW9yaXR5LCBzdGQ6 OmZ1bmN0aW9uPHZvaWQoKT4gZGVzdHJveUZ1bmN0aW9uLCBHTWFpbkNvbnRleHQqIGNvbnRleHQp Cit7CisgICAgY3JlYXRlKCkuc2NoZWR1bGVBZnRlckRlbGF5KG5hbWUsIGZ1bmN0aW9uLCBkZWxh eSwgcHJpb3JpdHksIGRlc3Ryb3lGdW5jdGlvbiwgY29udGV4dCk7Cit9CisKIGJvb2wgR01haW5M b29wU291cmNlOjpwcmVwYXJlVm9pZENhbGxiYWNrKENvbnRleHQmIGNvbnRleHQpCiB7CiAgICAg aWYgKCFtX2NvbnRleHQuc291cmNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvZ29iamVj dC9HTWFpbkxvb3BTb3VyY2UuaCBiL1NvdXJjZS9XVEYvd3RmL2dvYmplY3QvR01haW5Mb29wU291 cmNlLmgKaW5kZXggMzZkZDQ1OS4uMDk3ZmRhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYv Z29iamVjdC9HTWFpbkxvb3BTb3VyY2UuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9nb2JqZWN0L0dN YWluTG9vcFNvdXJjZS5oCkBAIC01Niw2ICs1Niw4IEBAIHB1YmxpYzoKICAgICBXVEZfRVhQT1JU X1BSSVZBVEUgdmlydHVhbCB2b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFyKiBuYW1l LCBzdGQ6OmZ1bmN0aW9uPGJvb2woKT4sIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMsIGludCBw cmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ry b3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKICAgICBXVEZf RVhQT1JUX1BSSVZBVEUgdmlydHVhbCB2b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheShjb25zdCBjaGFy KiBuYW1lLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4sIHN0ZDo6Y2hyb25vOjpzZWNvbmRzLCBpbnQg cHJpb3JpdHkgPSBHX1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBkZXN0 cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAgICAgV1RG X0VYUE9SVF9QUklWQVRFIHZpcnR1YWwgdm9pZCBzY2hlZHVsZUFmdGVyRGVsYXkoY29uc3QgY2hh ciogbmFtZSwgc3RkOjpmdW5jdGlvbjxib29sKCk+LCBzdGQ6OmNocm9ubzo6c2Vjb25kcywgaW50 IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGVz dHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOworICAgIFdU Rl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVBZnRlckRlbGF5KGNvbnN0IGNo YXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiwgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25k cywgaW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQo KT4gZGVzdHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOwor ICAgIFdURl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVBZnRlckRlbGF5KGNv bnN0IGNoYXIqIG5hbWUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCgpPiwgc3RkOjpjaHJvbm86Om1pY3Jv c2Vjb25kcywgaW50IHByaW9yaXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9u PHZvaWQoKT4gZGVzdHJveUZ1bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxw dHIpOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2aXJ0dWFsIHZvaWQgY2FuY2VsKCk7CiAKICAg ICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBzY2hlZHVsZShjb25zdCBjaGFyKiBuYW1lLCBzdGQ6 OmZ1bmN0aW9uPGJvb2woR0lPQ29uZGl0aW9uKT4sIEdTb2NrZXQqLCBHSU9Db25kaXRpb24sIHN0 ZDo6ZnVuY3Rpb248dm9pZCgpPiBkZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRl eHQqID0gbnVsbHB0cik7CkBAIC02Niw2ICs2OCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9p ZCBzY2hlZHVsZUFmdGVyRGVsYXlBbmREZWxldGVPbkRlc3Ryb3koY29uc3QgY2hhciogbmFtZSwg c3RkOjpmdW5jdGlvbjxib29sKCk+LCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzLCBpbnQgcHJp b3JpdHkgPSBHX1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBkZXN0cm95 RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAgICAgc3RhdGlj IHZvaWQgc2NoZWR1bGVBZnRlckRlbGF5QW5kRGVsZXRlT25EZXN0cm95KGNvbnN0IGNoYXIqIG5h bWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiwgc3RkOjpjaHJvbm86OnNlY29uZHMsIGludCBwcmlv cml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ryb3lG dW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKICAgICBzdGF0aWMg dm9pZCBzY2hlZHVsZUFmdGVyRGVsYXlBbmREZWxldGVPbkRlc3Ryb3koY29uc3QgY2hhciogbmFt ZSwgc3RkOjpmdW5jdGlvbjxib29sKCk+LCBzdGQ6OmNocm9ubzo6c2Vjb25kcywgaW50IHByaW9y aXR5ID0gR19QUklPUklUWV9ERUZBVUxULCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZGVzdHJveUZ1 bmN0aW9uID0gbnVsbHB0ciwgR01haW5Db250ZXh0KiA9IG51bGxwdHIpOworICAgIHN0YXRpYyB2 b2lkIHNjaGVkdWxlQWZ0ZXJEZWxheUFuZERlbGV0ZU9uRGVzdHJveShjb25zdCBjaGFyKiBuYW1l LCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4sIHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMsIGludCBw cmlvcml0eSA9IEdfUFJJT1JJVFlfREVGQVVMVCwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGRlc3Ry b3lGdW5jdGlvbiA9IG51bGxwdHIsIEdNYWluQ29udGV4dCogPSBudWxscHRyKTsKKyAgICBzdGF0 aWMgdm9pZCBzY2hlZHVsZUFmdGVyRGVsYXlBbmREZWxldGVPbkRlc3Ryb3koY29uc3QgY2hhciog bmFtZSwgc3RkOjpmdW5jdGlvbjxib29sKCk+LCBzdGQ6OmNocm9ubzo6bWljcm9zZWNvbmRzLCBp bnQgcHJpb3JpdHkgPSBHX1BSSU9SSVRZX0RFRkFVTFQsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBk ZXN0cm95RnVuY3Rpb24gPSBudWxscHRyLCBHTWFpbkNvbnRleHQqID0gbnVsbHB0cik7CiAKIHBy b3RlY3RlZDoKICAgICBlbnVtIFN0YXR1cyB7IFJlYWR5LCBTY2hlZHVsZWQsIERpc3BhdGNoaW5n IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2hhcmVkVGltZXJH dGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1NoYXJlZFRpbWVyR3RrLmNwcApp bmRleCBlYzkwZmQ0Li5iZGMzYzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvU2hhcmVkVGltZXJHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9TaGFyZWRUaW1lckd0ay5jcHAKQEAgLTQ4LDcgKzQ4LDcgQEAgdm9pZCBzZXRTaGFyZWRUaW1l ckZpcmVJbnRlcnZhbChkb3VibGUgaW50ZXJ2YWwpCiAgICAgQVNTRVJUKHNoYXJlZFRpbWVyRmly ZWRGdW5jdGlvbik7CiAKICAgICBnU2hhcmVkVGltZXIuc2NoZWR1bGVBZnRlckRlbGF5KCJbV2Vi S2l0XSBzaGFyZWRUaW1lclRpbWVvdXRDYWxsYmFjayIsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPihz aGFyZWRUaW1lckZpcmVkRnVuY3Rpb24pLAotICAgICAgICBzdGQ6OmNocm9ubzo6ZHVyYXRpb25f Y2FzdDxzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzPihzdGQ6OmNocm9ubzo6ZHVyYXRpb248ZG91 YmxlPihpbnRlcnZhbCkpLCBHREtfUFJJT1JJVFlfUkVEUkFXKTsKKyAgICAgICAgc3RkOjpjaHJv bm86OmR1cmF0aW9uX2Nhc3Q8c3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcz4oc3RkOjpjaHJvbm86 OmR1cmF0aW9uPGRvdWJsZT4oaW50ZXJ2YWwpKSwgR0RLX1BSSU9SSVRZX1JFRFJBVyk7CiB9CiAK IHZvaWQgc3RvcFNoYXJlZFRpbWVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwCmluZGV4IDVlOTRiMDgu LmJmYzc5NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9n dGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmNwcApAQCAtMjU5LDcgKzI1OSw3IEBAIHZvaWQg TGF5ZXJUcmVlSG9zdEd0azo6bGF5ZXJGbHVzaFRpbWVyRmlyZWQoKQogICAgICAgICBjb25zdCBk b3VibGUgdGFyZ2V0RlBTID0gNjA7CiAgICAgICAgIGRvdWJsZSBuZXh0Rmx1c2ggPSBzdGQ6Om1h eCgoMSAvIHRhcmdldEZQUykgLSAoY3VycmVudFRpbWUoKSAtIG1fbGFzdEZsdXNoVGltZSksIDAu MCk7CiAgICAgICAgIG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2suc2NoZWR1bGVBZnRlckRlbGF5 KCJbV2ViS2l0XSBsYXllckZsdXNoVGltZXIiLCBzdGQ6OmJpbmQoJkxheWVyVHJlZUhvc3RHdGs6 OmxheWVyRmx1c2hUaW1lckZpcmVkLCB0aGlzKSwKLSAgICAgICAgICAgIHN0ZDo6Y2hyb25vOjpk dXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHM+KHN0ZDo6Y2hyb25vOjpkdXJh dGlvbjxkb3VibGU+KG5leHRGbHVzaCkpLCBHREtfUFJJT1JJVFlfRVZFTlRTKTsKKyAgICAgICAg ICAgIHN0ZDo6Y2hyb25vOjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHM+ KHN0ZDo6Y2hyb25vOjpkdXJhdGlvbjxkb3VibGU+KG5leHRGbHVzaCkpLCBHREtfUFJJT1JJVFlf RVZFTlRTKTsKICAgICB9CiB9CiAK