109409 2013-02-11 01:15:00 -0800 [EFL] Stop using smart pointers for Ecore_Timer 2013-02-11 04:46:41 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://docs.enlightenment.org/auto/ecore/group__Ecore__Timer__Group.html#ga501bb88fb0b5ad134b78f489c879099f P2 Normal --- 109407 1 cdumez cdumez benjamin bw80.lee cmarcelo d-r gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi ojan.autocc rakuco tmpsantos webkit.review.bot oldest_to_newest 829491 0 cdumez 2013-02-11 01:15:00 -0800 Using smart pointers (WTF::OwnPtr in this case) for Ecore_Timer is a bad idea because the timer handle becomes invalid as soon as the timer's callback returns ECORE_CALLBACK_CANCEL. ecore_timer_del() should NOT be called on an invalid timer handle. This is used in RunLoopEfl.cpp and may lead to crashes such as: STDOUT: <empty> STDERR: 1 0x7f6e7bdf094f STDERR: 2 0x7f6e7eb6b4a0 STDERR: 3 0x7f6e77aa1f80 ecore_timer_del STDERR: 4 0x7f6e7be23a83 WTF::deleteOwnedPtr(_Ecore_Timer*) STDERR: 5 0x7f6e7bcd4612 WTF::OwnPtr<_Ecore_Timer>::clear() STDERR: 6 0x7f6e7bcd43a0 WTF::OwnPtr<_Ecore_Timer>::operator=(std::nullptr_t) STDERR: 7 0x7f6e7bcd40d8 WebCore::RunLoop::TimerBase::timerFired(void*) STDERR: 8 0x7f6e77aa23de _ecore_timer_expired_call STDERR: 9 0x7f6e77aa25ab _ecore_timer_expired_timers_call STDERR: 10 0x7f6e77a9f4b1 STDERR: 11 0x7f6e77a9fb47 ecore_main_loop_begin STDERR: 12 0x7f6e7bcd3ea7 WebCore::RunLoop::run() STDERR: 13 0x7f6e7fa7036d WebProcessMainEfl STDERR: 14 0x400804 main STDERR: 15 0x7f6e7eb5676d __libc_start_main STDERR: 16 0x400729 STDERR: LEAK: 1 WebPage or crash log for WebKitTestRunner (pid 7660): STDOUT: <empty> STDERR: 6 0x7fa347f8bf28 WTF::OwnPtr<_Ecore_Timer>::operator=(std::nullptr_t) STDERR: 7 0x7fa347f8bc60 WebCore::RunLoop::TimerBase::timerFired(void*) STDERR: 8 0x7fa343d543de _ecore_timer_expired_call STDERR: 9 0x7fa343d545ab _ecore_timer_expired_timers_call STDERR: 10 0x7fa343d514b1 STDERR: 11 0x7fa343d51b47 ecore_main_loop_begin STDERR: 12 0x7fa347f8ba2f WebCore::RunLoop::run() STDERR: 13 0x7fa34bd254f5 WebProcessMainEfl STDERR: 14 0x400804 main STDERR: 15 0x7fa34ae0b76d __libc_start_main STDERR: 16 0x400729 829494 1 cdumez 2013-02-11 01:24:57 -0800 I'll upload a patch soon. 829559 2 187541 cdumez 2013-02-11 03:39:02 -0800 Created attachment 187541 Patch 829561 3 187542 cdumez 2013-02-11 03:41:19 -0800 Created attachment 187542 Patch Add extra assertion to make sure we don't leak memory. 829569 4 rakuco 2013-02-11 03:55:38 -0800 LGTM, good thing RunLoop is not in WK2 anymore :-) 829582 5 cdumez 2013-02-11 04:46:26 -0800 Committed r142454: <http://trac.webkit.org/changeset/142454> 187541 2013-02-11 03:39:02 -0800 2013-02-11 03:41:19 -0800 Patch 109409_ecore_timer_raw.patch text/plain 5081 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYWMzMDEyMS4uZTA1Y2RhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wMi0xMSAg Q2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAg W0VGTF0gU3RvcCB1c2luZyBzbWFydCBwb2ludGVycyBmb3IgRWNvcmVfVGltZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQwOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBzdXBwb3J0IGlu IE93blB0ciBmb3IgRUZMJ3MgRWNvcmVfVGltZXIuIEl0IGlzIGEgYmFkIGlkZWEgdG8gdXNlCisg ICAgICAgIE93blB0ciBmb3IgRWNvcmVfVGltZXIgYmVjYXVzZSB0aGUgdGltZXIgaGFuZGxlIG1h eSBiZWNvbWUgaW52YWxpZC4KKworICAgICAgICAqIHd0Zi9Pd25QdHJDb21tb24uaDoKKyAgICAg ICAgKFdURik6CisgICAgICAgICogd3RmL2VmbC9Pd25QdHJFZmwuY3BwOgorCiAyMDEzLTAyLTEx ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIEFT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OIHRvIGRldGVjdCBvdXQgb2YgYm91bmRzIGFj Y2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvT3duUHRyQ29tbW9uLmggYi9Tb3VyY2Uv V1RGL3d0Zi9Pd25QdHJDb21tb24uaAppbmRleCAyN2M3NzU0Li45YWM2MTNmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9Pd25QdHJDb21tb24uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Pd25Q dHJDb21tb24uaApAQCAtNDUsMTAgKzQ1LDggQEAgdHlwZWRlZiBzdHJ1Y3QgX0Vjb3JlX1BpcGUg RWNvcmVfUGlwZTsKIHR5cGVkZWYgc3RydWN0IF9FaW5hX0hhc2ggRWluYV9IYXNoOwogdHlwZWRl ZiBzdHJ1Y3QgX0VpbmFfTW9kdWxlIEVpbmFfTW9kdWxlOwogI2lmIFVTRShFTykKLXR5cGVkZWYg c3RydWN0IF9FbyBFY29yZV9UaW1lcjsKIHR5cGVkZWYgc3RydWN0IF9FbyBFdmFzX09iamVjdDsK ICNlbHNlCi10eXBlZGVmIHN0cnVjdCBfRWNvcmVfVGltZXIgRWNvcmVfVGltZXI7CiB0eXBlZGVm IHN0cnVjdCBfRXZhc19PYmplY3QgRXZhc19PYmplY3Q7CiAjZW5kaWYKICNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCkBAIC03OSw3ICs3Nyw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAg IFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEVjb3JlX0V2YXMqKTsKICAg ICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVPd25lZFB0cihFY29yZV9JTUZfQ29udGV4 dCopOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEVjb3JlX1Bp cGUqKTsKLSAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVPd25lZFB0cihFY29yZV9U aW1lciopOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEVpbmFf SGFzaCopOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEVpbmFf TW9kdWxlKik7CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVsZXRlT3duZWRQdHIoRXZh c19PYmplY3QqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2VmbC9Pd25QdHJFZmwuY3Bw IGIvU291cmNlL1dURi93dGYvZWZsL093blB0ckVmbC5jcHAKaW5kZXggNTljOGFkNS4uNGIyODlm OCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvZWZsL093blB0ckVmbC5jcHAKKysrIGIvU291 cmNlL1dURi93dGYvZWZsL093blB0ckVmbC5jcHAKQEAgLTYzLDEyICs2Myw2IEBAIHZvaWQgZGVs ZXRlT3duZWRQdHIoRWluYV9Nb2R1bGUqIHB0cikKICAgICAgICAgZWluYV9tb2R1bGVfZnJlZShw dHIpOyAvLyBJZiBtb2R1bGUgd2Fzbid0IHVubG9hZGVkLCBlaW5hX21vZHVsZV9mcmVlKCkgY2Fs bHMgZWluYV9tb2R1bGVfdW5sb2FkKCkuCiB9CiAKLXZvaWQgZGVsZXRlT3duZWRQdHIoRWNvcmVf VGltZXIqIHB0cikKLXsKLSAgICBpZiAocHRyKQotICAgICAgICBlY29yZV90aW1lcl9kZWwocHRy KTsKLX0KLQogdm9pZCBkZWxldGVPd25lZFB0cihFY29yZV9JTUZfQ29udGV4dCogcHRyKQogewog ICAgIGlmIChwdHIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRkZTkyNy4uNGIzZTQ5ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDI1IEBACisyMDEzLTAyLTExICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpA c2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBTdG9wIHVzaW5nIHNtYXJ0IHBvaW50 ZXJzIGZvciBFY29yZV9UaW1lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA5NDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU3RvcCB1c2luZyBhIHNtYXJ0IHBvaW50ZXIgZm9yIEVjb3JlX1RpbWVyIGlu IFJ1bkxvb3A6OlRpbWVyQmFzZS4gVGhpcworICAgICAgICBpcyBhIGJhZCBpZGVhIGJlY2F1c2Ug dGhlIHRpbWVyIGhhbmRsZSBiZWNvbWVzIGludmFsaWQgYXMgc29vbiBhcyB0aGUKKyAgICAgICAg dGltZXIgY2FsbGJhY2sgcmV0dXJucyBFQ09SRV9DQUxMQkFDS19DQU5DRUwuIFRoaXMgbWF5IGxl YWQgdG8gY3Jhc2hlcworICAgICAgICBvbiBkZXN0cnVjdGlvbiBiZWNhdXNlIE93blB0ciBjYWxs cyBlY29yZV90aW1lcl9kZWwoKSBvbiBhbiBpbnZhbGlkCisgICAgICAgIGhhbmRsZS4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIGFscmVhZHkgY292ZXJlZCBieSBleGl0aW5nIHRlc3RzLgorCisg ICAgICAgICogcGxhdGZvcm0vUnVuTG9vcC5oOgorICAgICAgICAoVGltZXJCYXNlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9lZmwvUnVuTG9vcEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSdW5M b29wOjpUaW1lckJhc2U6OnRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6UnVuTG9vcDo6 VGltZXJCYXNlOjpzdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpSdW5Mb29wOjpUaW1lckJhc2U6 OnN0b3ApOgorCiAyMDEzLTAyLTExICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgQWRkIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OIHRvIGRl dGVjdCBvdXQgb2YgYm91bmRzIGFjY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vUnVuTG9vcC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVuTG9vcC5oCmluZGV4 IGY5ZmY1NTEuLmIzZWQ1NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1 bkxvb3AuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW5Mb29wLmgKQEAgLTEwNSw3 ICsxMDUsNyBAQCBwdWJsaWM6CiAgICAgICAgIGdib29sZWFuIG1faXNSZXBlYXRpbmc7CiAjZWxp ZiBQTEFURk9STShFRkwpCiAgICAgICAgIHN0YXRpYyBib29sIHRpbWVyRmlyZWQodm9pZCogZGF0 YSk7Ci0gICAgICAgIE93blB0cjxFY29yZV9UaW1lcj4gbV90aW1lcjsKKyAgICAgICAgRWNvcmVf VGltZXIqIG1fdGltZXI7CiAgICAgICAgIGJvb2wgbV9pc1JlcGVhdGluZzsKICNlbmRpZgogICAg IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUnVuTG9vcEVmbC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUnVuTG9vcEVmbC5jcHAKaW5kZXggMzMz ZTI0ZS4uYTA4YzM5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1J1 bkxvb3BFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SdW5Mb29wRWZs LmNwcApAQCAtODYsNyArODYsOCBAQCB2b2lkIFJ1bkxvb3A6Ondha2VVcCgpCiB9CiAKIFJ1bkxv b3A6OlRpbWVyQmFzZTo6VGltZXJCYXNlKFJ1bkxvb3AqKQotICAgIDogbV9pc1JlcGVhdGluZyhm YWxzZSkKKyAgICA6IG1fdGltZXIoMCkKKyAgICAsIG1faXNSZXBlYXRpbmcoZmFsc2UpCiB7CiB9 CiAKQEAgLTEwMiw3ICsxMDMsNyBAQCBib29sIFJ1bkxvb3A6OlRpbWVyQmFzZTo6dGltZXJGaXJl ZCh2b2lkKiBkYXRhKQogICAgIHRpbWVyLT5maXJlZCgpOwogCiAgICAgaWYgKCF0aW1lci0+bV9p c1JlcGVhdGluZykgewotICAgICAgICB0aW1lci0+bV90aW1lciA9IG51bGxwdHI7CisgICAgICAg IHRpbWVyLT5tX3RpbWVyID0gMDsKICAgICAgICAgcmV0dXJuIEVDT1JFX0NBTExCQUNLX0NBTkNF TDsKICAgICB9CiAKQEAgLTExMSwxMyArMTEyLDE5IEBAIGJvb2wgUnVuTG9vcDo6VGltZXJCYXNl Ojp0aW1lckZpcmVkKHZvaWQqIGRhdGEpCiAKIHZvaWQgUnVuTG9vcDo6VGltZXJCYXNlOjpzdGFy dChkb3VibGUgbmV4dEZpcmVJbnRlcnZhbCwgYm9vbCByZXBlYXQpCiB7CisgICAgaWYgKGlzQWN0 aXZlKCkpCisgICAgICAgIHN0b3AoKTsKKwogICAgIG1faXNSZXBlYXRpbmcgPSByZXBlYXQ7Ci0g ICAgbV90aW1lciA9IGFkb3B0UHRyKGVjb3JlX3RpbWVyX2FkZChuZXh0RmlyZUludGVydmFsLCBy ZWludGVycHJldF9jYXN0PEVjb3JlX1Rhc2tfQ2I+KHRpbWVyRmlyZWQpLCB0aGlzKSk7CisgICAg bV90aW1lciA9IGVjb3JlX3RpbWVyX2FkZChuZXh0RmlyZUludGVydmFsLCByZWludGVycHJldF9j YXN0PEVjb3JlX1Rhc2tfQ2I+KHRpbWVyRmlyZWQpLCB0aGlzKTsKIH0KIAogdm9pZCBSdW5Mb29w OjpUaW1lckJhc2U6OnN0b3AoKQogewotICAgIG1fdGltZXIgPSBudWxscHRyOworICAgIGlmICht X3RpbWVyKSB7CisgICAgICAgIGVjb3JlX3RpbWVyX2RlbChtX3RpbWVyKTsKKyAgICAgICAgbV90 aW1lciA9IDA7CisgICAgfQogfQogCiBib29sIFJ1bkxvb3A6OlRpbWVyQmFzZTo6aXNBY3RpdmUo KSBjb25zdAo= 187542 2013-02-11 03:41:19 -0800 2013-02-11 04:46:41 -0800 Patch 109409_ecore_timer_raw.patch text/plain 5104 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYWMzMDEyMS4uZTA1Y2RhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wMi0xMSAg Q2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAg W0VGTF0gU3RvcCB1c2luZyBzbWFydCBwb2ludGVycyBmb3IgRWNvcmVfVGltZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQwOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBzdXBwb3J0IGlu IE93blB0ciBmb3IgRUZMJ3MgRWNvcmVfVGltZXIuIEl0IGlzIGEgYmFkIGlkZWEgdG8gdXNlCisg ICAgICAgIE93blB0ciBmb3IgRWNvcmVfVGltZXIgYmVjYXVzZSB0aGUgdGltZXIgaGFuZGxlIG1h eSBiZWNvbWUgaW52YWxpZC4KKworICAgICAgICAqIHd0Zi9Pd25QdHJDb21tb24uaDoKKyAgICAg ICAgKFdURik6CisgICAgICAgICogd3RmL2VmbC9Pd25QdHJFZmwuY3BwOgorCiAyMDEzLTAyLTEx ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIEFT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OIHRvIGRldGVjdCBvdXQgb2YgYm91bmRzIGFj Y2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvT3duUHRyQ29tbW9uLmggYi9Tb3VyY2Uv V1RGL3d0Zi9Pd25QdHJDb21tb24uaAppbmRleCAyN2M3NzU0Li45YWM2MTNmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9Pd25QdHJDb21tb24uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Pd25Q dHJDb21tb24uaApAQCAtNDUsMTAgKzQ1LDggQEAgdHlwZWRlZiBzdHJ1Y3QgX0Vjb3JlX1BpcGUg RWNvcmVfUGlwZTsKIHR5cGVkZWYgc3RydWN0IF9FaW5hX0hhc2ggRWluYV9IYXNoOwogdHlwZWRl ZiBzdHJ1Y3QgX0VpbmFfTW9kdWxlIEVpbmFfTW9kdWxlOwogI2lmIFVTRShFTykKLXR5cGVkZWYg c3RydWN0IF9FbyBFY29yZV9UaW1lcjsKIHR5cGVkZWYgc3RydWN0IF9FbyBFdmFzX09iamVjdDsK ICNlbHNlCi10eXBlZGVmIHN0cnVjdCBfRWNvcmVfVGltZXIgRWNvcmVfVGltZXI7CiB0eXBlZGVm IHN0cnVjdCBfRXZhc19PYmplY3QgRXZhc19PYmplY3Q7CiAjZW5kaWYKICNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCkBAIC03OSw3ICs3Nyw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAg IFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEVjb3JlX0V2YXMqKTsKICAg ICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVPd25lZFB0cihFY29yZV9JTUZfQ29udGV4 dCopOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEVjb3JlX1Bp cGUqKTsKLSAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVPd25lZFB0cihFY29yZV9U aW1lciopOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEVpbmFf SGFzaCopOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEVpbmFf TW9kdWxlKik7CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVsZXRlT3duZWRQdHIoRXZh c19PYmplY3QqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2VmbC9Pd25QdHJFZmwuY3Bw IGIvU291cmNlL1dURi93dGYvZWZsL093blB0ckVmbC5jcHAKaW5kZXggNTljOGFkNS4uNGIyODlm OCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvZWZsL093blB0ckVmbC5jcHAKKysrIGIvU291 cmNlL1dURi93dGYvZWZsL093blB0ckVmbC5jcHAKQEAgLTYzLDEyICs2Myw2IEBAIHZvaWQgZGVs ZXRlT3duZWRQdHIoRWluYV9Nb2R1bGUqIHB0cikKICAgICAgICAgZWluYV9tb2R1bGVfZnJlZShw dHIpOyAvLyBJZiBtb2R1bGUgd2Fzbid0IHVubG9hZGVkLCBlaW5hX21vZHVsZV9mcmVlKCkgY2Fs bHMgZWluYV9tb2R1bGVfdW5sb2FkKCkuCiB9CiAKLXZvaWQgZGVsZXRlT3duZWRQdHIoRWNvcmVf VGltZXIqIHB0cikKLXsKLSAgICBpZiAocHRyKQotICAgICAgICBlY29yZV90aW1lcl9kZWwocHRy KTsKLX0KLQogdm9pZCBkZWxldGVPd25lZFB0cihFY29yZV9JTUZfQ29udGV4dCogcHRyKQogewog ICAgIGlmIChwdHIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRkZTkyNy4uNGIzZTQ5ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDI1IEBACisyMDEzLTAyLTExICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpA c2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBTdG9wIHVzaW5nIHNtYXJ0IHBvaW50 ZXJzIGZvciBFY29yZV9UaW1lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA5NDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU3RvcCB1c2luZyBhIHNtYXJ0IHBvaW50ZXIgZm9yIEVjb3JlX1RpbWVyIGlu IFJ1bkxvb3A6OlRpbWVyQmFzZS4gVGhpcworICAgICAgICBpcyBhIGJhZCBpZGVhIGJlY2F1c2Ug dGhlIHRpbWVyIGhhbmRsZSBiZWNvbWVzIGludmFsaWQgYXMgc29vbiBhcyB0aGUKKyAgICAgICAg dGltZXIgY2FsbGJhY2sgcmV0dXJucyBFQ09SRV9DQUxMQkFDS19DQU5DRUwuIFRoaXMgbWF5IGxl YWQgdG8gY3Jhc2hlcworICAgICAgICBvbiBkZXN0cnVjdGlvbiBiZWNhdXNlIE93blB0ciBjYWxs cyBlY29yZV90aW1lcl9kZWwoKSBvbiBhbiBpbnZhbGlkCisgICAgICAgIGhhbmRsZS4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIGFscmVhZHkgY292ZXJlZCBieSBleGl0aW5nIHRlc3RzLgorCisg ICAgICAgICogcGxhdGZvcm0vUnVuTG9vcC5oOgorICAgICAgICAoVGltZXJCYXNlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9lZmwvUnVuTG9vcEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSdW5M b29wOjpUaW1lckJhc2U6OnRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6UnVuTG9vcDo6 VGltZXJCYXNlOjpzdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpSdW5Mb29wOjpUaW1lckJhc2U6 OnN0b3ApOgorCiAyMDEzLTAyLTExICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgQWRkIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OIHRvIGRl dGVjdCBvdXQgb2YgYm91bmRzIGFjY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vUnVuTG9vcC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVuTG9vcC5oCmluZGV4 IGY5ZmY1NTEuLmIzZWQ1NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1 bkxvb3AuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW5Mb29wLmgKQEAgLTEwNSw3 ICsxMDUsNyBAQCBwdWJsaWM6CiAgICAgICAgIGdib29sZWFuIG1faXNSZXBlYXRpbmc7CiAjZWxp ZiBQTEFURk9STShFRkwpCiAgICAgICAgIHN0YXRpYyBib29sIHRpbWVyRmlyZWQodm9pZCogZGF0 YSk7Ci0gICAgICAgIE93blB0cjxFY29yZV9UaW1lcj4gbV90aW1lcjsKKyAgICAgICAgRWNvcmVf VGltZXIqIG1fdGltZXI7CiAgICAgICAgIGJvb2wgbV9pc1JlcGVhdGluZzsKICNlbmRpZgogICAg IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUnVuTG9vcEVmbC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUnVuTG9vcEVmbC5jcHAKaW5kZXggMzMz ZTI0ZS4uYTM4MWIzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1J1 bkxvb3BFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SdW5Mb29wRWZs LmNwcApAQCAtODYsNyArODYsOCBAQCB2b2lkIFJ1bkxvb3A6Ondha2VVcCgpCiB9CiAKIFJ1bkxv b3A6OlRpbWVyQmFzZTo6VGltZXJCYXNlKFJ1bkxvb3AqKQotICAgIDogbV9pc1JlcGVhdGluZyhm YWxzZSkKKyAgICA6IG1fdGltZXIoMCkKKyAgICAsIG1faXNSZXBlYXRpbmcoZmFsc2UpCiB7CiB9 CiAKQEAgLTEwMiw3ICsxMDMsNyBAQCBib29sIFJ1bkxvb3A6OlRpbWVyQmFzZTo6dGltZXJGaXJl ZCh2b2lkKiBkYXRhKQogICAgIHRpbWVyLT5maXJlZCgpOwogCiAgICAgaWYgKCF0aW1lci0+bV9p c1JlcGVhdGluZykgewotICAgICAgICB0aW1lci0+bV90aW1lciA9IG51bGxwdHI7CisgICAgICAg IHRpbWVyLT5tX3RpbWVyID0gMDsKICAgICAgICAgcmV0dXJuIEVDT1JFX0NBTExCQUNLX0NBTkNF TDsKICAgICB9CiAKQEAgLTExMSwxMyArMTEyLDIwIEBAIGJvb2wgUnVuTG9vcDo6VGltZXJCYXNl Ojp0aW1lckZpcmVkKHZvaWQqIGRhdGEpCiAKIHZvaWQgUnVuTG9vcDo6VGltZXJCYXNlOjpzdGFy dChkb3VibGUgbmV4dEZpcmVJbnRlcnZhbCwgYm9vbCByZXBlYXQpCiB7CisgICAgaWYgKGlzQWN0 aXZlKCkpCisgICAgICAgIHN0b3AoKTsKKwogICAgIG1faXNSZXBlYXRpbmcgPSByZXBlYXQ7Ci0g ICAgbV90aW1lciA9IGFkb3B0UHRyKGVjb3JlX3RpbWVyX2FkZChuZXh0RmlyZUludGVydmFsLCBy ZWludGVycHJldF9jYXN0PEVjb3JlX1Rhc2tfQ2I+KHRpbWVyRmlyZWQpLCB0aGlzKSk7CisgICAg QVNTRVJUKCFtX3RpbWVyKTsKKyAgICBtX3RpbWVyID0gZWNvcmVfdGltZXJfYWRkKG5leHRGaXJl SW50ZXJ2YWwsIHJlaW50ZXJwcmV0X2Nhc3Q8RWNvcmVfVGFza19DYj4odGltZXJGaXJlZCksIHRo aXMpOwogfQogCiB2b2lkIFJ1bkxvb3A6OlRpbWVyQmFzZTo6c3RvcCgpCiB7Ci0gICAgbV90aW1l ciA9IG51bGxwdHI7CisgICAgaWYgKG1fdGltZXIpIHsKKyAgICAgICAgZWNvcmVfdGltZXJfZGVs KG1fdGltZXIpOworICAgICAgICBtX3RpbWVyID0gMDsKKyAgICB9CiB9CiAKIGJvb2wgUnVuTG9v cDo6VGltZXJCYXNlOjppc0FjdGl2ZSgpIGNvbnN0Cg==