101015 2012-11-01 22:29:44 -0700 [EFL][WK2] Use MutexLocker instead of lock()/unlock(). 2012-11-02 06:01:11 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98978 1 bw80.lee bw80.lee gyuyoung.kim levin+threading lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 756888 0 bw80.lee 2012-11-01 22:29:44 -0700 Using MutexLocker will be better than using lock()/unlock() explicitly. 756927 1 171990 bw80.lee 2012-11-02 00:06:18 -0700 Created attachment 171990 Patch 756935 2 171990 bw80.lee 2012-11-02 00:18:37 -0700 Comment on attachment 171990 Patch Only performWork() and performTimerWork() should be changed. The locking scope of dispatchAfterDelay is discussing in Bug 98978. 756947 3 171997 bw80.lee 2012-11-02 00:33:36 -0700 Created attachment 171997 Patch 757030 4 171997 kenneth 2012-11-02 02:57:17 -0700 Comment on attachment 171997 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171997&action=review > Source/WebKit2/Platform/efl/WorkQueueEfl.cpp:80 > + { > + MutexLocker locker(m_workItemQueueLock); > + if (m_workItemQueue.isEmpty()) > + return; > + > + m_workItemQueue.swap(workItemQueue); > + } Why do you need to lock if the queue is empty? 757036 5 bw80.lee 2012-11-02 03:02:38 -0700 (In reply to comment #4) > (From update of attachment 171997 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=171997&action=review > > > Source/WebKit2/Platform/efl/WorkQueueEfl.cpp:80 > > + { > > + MutexLocker locker(m_workItemQueueLock); > > + if (m_workItemQueue.isEmpty()) > > + return; > > + > > + m_workItemQueue.swap(workItemQueue); > > + } > > Why do you need to lock if the queue is empty? Because m_workItemQueue is the shared resource that can be accessed on multiple thread at one time. I think protecting all the access to the shared resource will be safe. 757037 6 bw80.lee 2012-11-02 03:03:34 -0700 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 171997 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=171997&action=review > > > > > Source/WebKit2/Platform/efl/WorkQueueEfl.cpp:80 > > > + { > > > + MutexLocker locker(m_workItemQueueLock); > > > + if (m_workItemQueue.isEmpty()) > > > + return; > > > + > > > + m_workItemQueue.swap(workItemQueue); > > > + } > > > > Why do you need to lock if the queue is empty? > > Because m_workItemQueue is the shared resource that can be accessed on multiple thread at one time. > > I think protecting all the access to the shared resource will be safe. (And the lock will be released when the function returns.) 757133 7 171997 webkit.review.bot 2012-11-02 06:01:05 -0700 Comment on attachment 171997 Patch Clearing flags on attachment: 171997 Committed r133289: <http://trac.webkit.org/changeset/133289> 757134 8 webkit.review.bot 2012-11-02 06:01:11 -0700 All reviewed patches have been landed. Closing bug. 171990 2012-11-02 00:06:18 -0700 2012-11-02 00:33:29 -0700 Patch bug-101015-20121102160438.patch text/plain 4216 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDA0ODZiY2NjMDczMGU4 MWZhNDY2YTM2NDA5ODM1YzBhYmM1MGZmOC4uYzQzY2E4YjFhNDNjMjRhNjc4YTVhM2RjZTQ5Njgz NDgyODVlOWExMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTAxICBCeXVu Z3dvbyBMZWUgIDxidzgwLmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFVz ZSBNdXRleExvY2tlciBpbnN0ZWFkIG9mIGxvY2soKS91bmxvY2soKS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTAxNQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgbG9jaygpL3VubG9j aygpLCB1c2UgTXV0ZXhMb2NrZXIgaW4gV29ya1F1ZXVlOjpwZXJmb3JtV29yaygpCisgICAgICAg IGFuZCBXb3JrUXVldWU6OnBlcmZvcm1UaW1lcldvcmsoKS4KKworICAgICAgICBUaGUgbG9ja2lu ZyBzY29wZSB3aWxsIGJlIG1vcmUgY2xlYXIgYW5kIHNpbXBsZSB3aXRoIHVzaW5nIE11dGV4TG9j a2VyLgorCisgICAgICAgICogUGxhdGZvcm0vZWZsL1dvcmtRdWV1ZUVmbC5jcHA6CisgICAgICAg IChXb3JrUXVldWU6OnBlcmZvcm1Xb3JrKToKKyAgICAgICAgKFdvcmtRdWV1ZTo6aW5zZXJ0VGlt ZXJXb3JrSXRlbSk6CisgICAgICAgIChXb3JrUXVldWU6OnBlcmZvcm1UaW1lcldvcmspOgorICAg ICAgICAoV29ya1F1ZXVlOjpkaXNwYXRjaEFmdGVyRGVsYXkpOgorCiAyMDEyLTExLTAxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmb3JtYXQgdGhl IGFubm90YXRpb25TdHlsZSBpbml0aWFsaXplciB0byBhcHBlYXNlIHVwZGF0ZS13ZWJraXQtbG9j YWxpemFibGUtc3RyaW5ncy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2Vm bC9Xb3JrUXVldWVFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vZWZsL1dvcmtRdWV1 ZUVmbC5jcHAKaW5kZXggNmM1MDViNDFjN2M3MDIxYzAyNDE1ZmEwODE5NGUyY2NkODBiNWQ1OC4u MmQ4YmU5NzRlYTllMWE2YjI5MTlmMDJhY2NiZWY2ODkwY2M0NDg2NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vZWZsL1dvcmtRdWV1ZUVmbC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvUGxhdGZvcm0vZWZsL1dvcmtRdWV1ZUVmbC5jcHAKQEAgLTY4LDE4ICs2OCwyMCBAQCB2 b2lkIFdvcmtRdWV1ZTo6cGxhdGZvcm1JbnZhbGlkYXRlKCkKIAogdm9pZCBXb3JrUXVldWU6OnBl cmZvcm1Xb3JrKCkKIHsKLSAgICBtX3dvcmtJdGVtUXVldWVMb2NrLmxvY2soKTsKLQotICAgIHdo aWxlICghbV93b3JrSXRlbVF1ZXVlLmlzRW1wdHkoKSkgeworICAgIHdoaWxlICh0cnVlKSB7CiAg ICAgICAgIFZlY3RvcjxGdW5jdGlvbjx2b2lkKCk+ID4gd29ya0l0ZW1RdWV1ZTsKLSAgICAgICAg bV93b3JrSXRlbVF1ZXVlLnN3YXAod29ya0l0ZW1RdWV1ZSk7CiAKLSAgICAgICAgbV93b3JrSXRl bVF1ZXVlTG9jay51bmxvY2soKTsKKyAgICAgICAgeworICAgICAgICAgICAgTXV0ZXhMb2NrZXIg bG9ja2VyKG1fd29ya0l0ZW1RdWV1ZUxvY2spOworICAgICAgICAgICAgaWYgKG1fd29ya0l0ZW1R dWV1ZS5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBt X3dvcmtJdGVtUXVldWUuc3dhcCh3b3JrSXRlbVF1ZXVlKTsKKyAgICAgICAgfQorCiAgICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgd29ya0l0ZW1RdWV1ZS5zaXplKCk7ICsraSkKICAgICAg ICAgICAgIHdvcmtJdGVtUXVldWVbaV0oKTsKLSAgICAgICAgbV93b3JrSXRlbVF1ZXVlTG9jay5s b2NrKCk7CiAgICAgfQotICAgIG1fd29ya0l0ZW1RdWV1ZUxvY2sudW5sb2NrKCk7CiB9CiAKIHZv aWQgV29ya1F1ZXVlOjpwZXJmb3JtRmlsZURlc2NyaXB0b3JXb3JrKCkKQEAgLTEyMyw2ICsxMjUs NyBAQCB2b2lkIFdvcmtRdWV1ZTo6aW5zZXJ0VGltZXJXb3JrSXRlbShQYXNzT3duUHRyPFRpbWVy V29ya0l0ZW0+IGl0ZW0pCiAgICAgaWYgKCFpdGVtKQogICAgICAgICByZXR1cm47CiAKKyAgICBN dXRleExvY2tlciBsb2NrZXIobV90aW1lcldvcmtJdGVtc0xvY2spOwogICAgIHNpemVfdCBwb3Np dGlvbiA9IDA7CiAKICAgICAvLyBtX3RpbWVyV29ya0l0ZW1zIHNob3VsZCBiZSBvcmRlcmVkIGJ5 IGV4cGlyZSB0aW1lLgpAQCAtMTM1LDE5ICsxMzgsMTkgQEAgdm9pZCBXb3JrUXVldWU6Omluc2Vy dFRpbWVyV29ya0l0ZW0oUGFzc093blB0cjxUaW1lcldvcmtJdGVtPiBpdGVtKQogCiB2b2lkIFdv cmtRdWV1ZTo6cGVyZm9ybVRpbWVyV29yaygpCiB7Ci0gICAgLy8gUHJvdGVjdHMgbV90aW1lcldv cmtJdGVtcy4KLSAgICBtX3RpbWVyV29ya0l0ZW1zTG9jay5sb2NrKCk7CisgICAgVmVjdG9yPE93 blB0cjxUaW1lcldvcmtJdGVtPiA+IHRpbWVyV29ya0l0ZW1zOwogCi0gICAgaWYgKG1fdGltZXJX b3JrSXRlbXMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1fdGltZXJXb3JrSXRlbXNMb2NrLnVubG9j aygpOwotICAgICAgICByZXR1cm47CisgICAgeworICAgICAgICAvLyBQcm90ZWN0cyBtX3RpbWVy V29ya0l0ZW1zLgorICAgICAgICBNdXRleExvY2tlciBsb2NrZXIobV90aW1lcldvcmtJdGVtc0xv Y2spOworICAgICAgICBpZiAobV90aW1lcldvcmtJdGVtcy5pc0VtcHR5KCkpCisgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgLy8gQ29waWVzIGFsbCB0aGUgdGltZXIgd29yayBpdGVtcyBp biBtX3RpbWVyV29ya0l0ZW1zIHRvIGxvY2FsIHZlY3Rvci4KKyAgICAgICAgbV90aW1lcldvcmtJ dGVtcy5zd2FwKHRpbWVyV29ya0l0ZW1zKTsKICAgICB9CiAKICAgICBkb3VibGUgY3VycmVudCA9 IGN1cnJlbnRUaW1lKCk7Ci0gICAgVmVjdG9yPE93blB0cjxUaW1lcldvcmtJdGVtPiA+IHRpbWVy V29ya0l0ZW1zOwotCi0gICAgLy8gQ29waWVzIGFsbCB0aGUgdGltZXIgd29yayBpdGVtcyBpbiBt X3RpbWVyV29ya0l0ZW1zIHRvIGxvY2FsIHZlY3Rvci4KLSAgICBtX3RpbWVyV29ya0l0ZW1zLnN3 YXAodGltZXJXb3JrSXRlbXMpOwogCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0aW1lcldv cmtJdGVtcy5zaXplKCk7ICsraSkgewogICAgICAgICBpZiAoIXRpbWVyV29ya0l0ZW1zW2ldLT5l eHBpcmVkKGN1cnJlbnQpKSB7CkBAIC0xNTgsMTQgKzE2MSw4IEBAIHZvaWQgV29ya1F1ZXVlOjpw ZXJmb3JtVGltZXJXb3JrKCkKICAgICAgICAgfQogCiAgICAgICAgIC8vIElmIGEgdGltZXIgd29y ayBpdGVtIGV4cGlyZWQsIGRpc3BhdGNoIHRoZSBmdW5jdGlvbiBvZiB0aGUgd29yayBpdGVtLgot ICAgICAgICAvLyBCZWZvcmUgZGlzcGF0Y2hpbmcsIG1fdGltZXJXb3JrSXRlbXNMb2NrIHNob3Vs ZCB1bmxvY2sgZm9yIHByZXZlbnRpbmcgZGVhZGxvY2ssCi0gICAgICAgIC8vIGJlY2F1c2UgaXQg Y2FuIGJlIGFjY2Vzc2VkIGluc2lkZSB0aGUgZnVuY3Rpb24gb2YgdGhlIHRpbWVyIHdvcmsgaXRl bSBkaXNwYXRjaGVkLgotICAgICAgICBtX3RpbWVyV29ya0l0ZW1zTG9jay51bmxvY2soKTsKICAg ICAgICAgdGltZXJXb3JrSXRlbXNbaV0tPmRpc3BhdGNoKCk7Ci0gICAgICAgIG1fdGltZXJXb3Jr SXRlbXNMb2NrLmxvY2soKTsKICAgICB9Ci0KLSAgICBtX3RpbWVyV29ya0l0ZW1zTG9jay51bmxv Y2soKTsKIH0KIAogdm9pZCBXb3JrUXVldWU6OnNlbmRNZXNzYWdlVG9UaHJlYWQoY29uc3QgY2hh ciogbWVzc2FnZSkKQEAgLTIyMiw3ICsyMTksNiBAQCB2b2lkIFdvcmtRdWV1ZTo6ZGlzcGF0Y2hB ZnRlckRlbGF5KGNvbnN0IEZ1bmN0aW9uPHZvaWQoKT4mIGZ1bmN0aW9uLCBkb3VibGUgZGVsYQog ICAgIGlmIChkZWxheSA8IDApCiAgICAgICAgIHJldHVybjsKIAotICAgIE11dGV4TG9ja2VyIGxv Y2tlcihtX3RpbWVyV29ya0l0ZW1zTG9jayk7CiAgICAgT3duUHRyPFRpbWVyV29ya0l0ZW0+IHRp bWVyV29ya0l0ZW0gPSBUaW1lcldvcmtJdGVtOjpjcmVhdGUoZnVuY3Rpb24sIGN1cnJlbnRUaW1l KCkgKyBkZWxheSk7CiAgICAgaWYgKCF0aW1lcldvcmtJdGVtKQogICAgICAgICByZXR1cm47Cg== 171997 2012-11-02 00:33:36 -0700 2012-11-02 06:01:04 -0700 Patch bug-101015-20121102163156.patch text/plain 3904 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDA0ODZiY2NjMDczMGU4 MWZhNDY2YTM2NDA5ODM1YzBhYmM1MGZmOC4uZjE4MjQ4ZDc0M2VmMTcxZmQ4MjY4ODU5NmQ3YmU1 M2MwYjA4ZGZmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTAyICBCeXVu Z3dvbyBMZWUgIDxidzgwLmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFVz ZSBNdXRleExvY2tlciBpbnN0ZWFkIG9mIGxvY2soKS91bmxvY2soKS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTAxNQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgbG9jaygpL3VubG9j aygpLCB1c2UgTXV0ZXhMb2NrZXIgaW4gV29ya1F1ZXVlOjpwZXJmb3JtV29yaygpCisgICAgICAg IGFuZCBXb3JrUXVldWU6OnBlcmZvcm1UaW1lcldvcmsoKS4KKworICAgICAgICBUaGUgbG9ja2lu ZyBzY29wZSB3aWxsIGJlIG1vcmUgY2xlYXIgYW5kIHNpbXBsZSB3aXRoIHVzaW5nIE11dGV4TG9j a2VyLgorCisgICAgICAgICogUGxhdGZvcm0vZWZsL1dvcmtRdWV1ZUVmbC5jcHA6CisgICAgICAg IChXb3JrUXVldWU6OnBlcmZvcm1Xb3JrKToKKyAgICAgICAgKFdvcmtRdWV1ZTo6aW5zZXJ0VGlt ZXJXb3JrSXRlbSk6CisgICAgICAgIChXb3JrUXVldWU6OnBlcmZvcm1UaW1lcldvcmspOgorICAg ICAgICAoV29ya1F1ZXVlOjpkaXNwYXRjaEFmdGVyRGVsYXkpOgorCiAyMDEyLTExLTAxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmb3JtYXQgdGhl IGFubm90YXRpb25TdHlsZSBpbml0aWFsaXplciB0byBhcHBlYXNlIHVwZGF0ZS13ZWJraXQtbG9j YWxpemFibGUtc3RyaW5ncy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL2Vm bC9Xb3JrUXVldWVFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vZWZsL1dvcmtRdWV1 ZUVmbC5jcHAKaW5kZXggNmM1MDViNDFjN2M3MDIxYzAyNDE1ZmEwODE5NGUyY2NkODBiNWQ1OC4u ZGFiNjA5ZTNmZjkwYmU5NjcyMmUxOTg2YTdjMTEzMDVlN2ViNzIxMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vZWZsL1dvcmtRdWV1ZUVmbC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvUGxhdGZvcm0vZWZsL1dvcmtRdWV1ZUVmbC5jcHAKQEAgLTY4LDE4ICs2OCwyMCBAQCB2 b2lkIFdvcmtRdWV1ZTo6cGxhdGZvcm1JbnZhbGlkYXRlKCkKIAogdm9pZCBXb3JrUXVldWU6OnBl cmZvcm1Xb3JrKCkKIHsKLSAgICBtX3dvcmtJdGVtUXVldWVMb2NrLmxvY2soKTsKLQotICAgIHdo aWxlICghbV93b3JrSXRlbVF1ZXVlLmlzRW1wdHkoKSkgeworICAgIHdoaWxlICh0cnVlKSB7CiAg ICAgICAgIFZlY3RvcjxGdW5jdGlvbjx2b2lkKCk+ID4gd29ya0l0ZW1RdWV1ZTsKLSAgICAgICAg bV93b3JrSXRlbVF1ZXVlLnN3YXAod29ya0l0ZW1RdWV1ZSk7CiAKLSAgICAgICAgbV93b3JrSXRl bVF1ZXVlTG9jay51bmxvY2soKTsKKyAgICAgICAgeworICAgICAgICAgICAgTXV0ZXhMb2NrZXIg bG9ja2VyKG1fd29ya0l0ZW1RdWV1ZUxvY2spOworICAgICAgICAgICAgaWYgKG1fd29ya0l0ZW1R dWV1ZS5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBt X3dvcmtJdGVtUXVldWUuc3dhcCh3b3JrSXRlbVF1ZXVlKTsKKyAgICAgICAgfQorCiAgICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgd29ya0l0ZW1RdWV1ZS5zaXplKCk7ICsraSkKICAgICAg ICAgICAgIHdvcmtJdGVtUXVldWVbaV0oKTsKLSAgICAgICAgbV93b3JrSXRlbVF1ZXVlTG9jay5s b2NrKCk7CiAgICAgfQotICAgIG1fd29ya0l0ZW1RdWV1ZUxvY2sudW5sb2NrKCk7CiB9CiAKIHZv aWQgV29ya1F1ZXVlOjpwZXJmb3JtRmlsZURlc2NyaXB0b3JXb3JrKCkKQEAgLTEzNSwyMiArMTM3 LDIzIEBAIHZvaWQgV29ya1F1ZXVlOjppbnNlcnRUaW1lcldvcmtJdGVtKFBhc3NPd25QdHI8VGlt ZXJXb3JrSXRlbT4gaXRlbSkKIAogdm9pZCBXb3JrUXVldWU6OnBlcmZvcm1UaW1lcldvcmsoKQog ewotICAgIC8vIFByb3RlY3RzIG1fdGltZXJXb3JrSXRlbXMuCi0gICAgbV90aW1lcldvcmtJdGVt c0xvY2subG9jaygpOworICAgIFZlY3RvcjxPd25QdHI8VGltZXJXb3JrSXRlbT4gPiB0aW1lcldv cmtJdGVtczsKIAotICAgIGlmIChtX3RpbWVyV29ya0l0ZW1zLmlzRW1wdHkoKSkgewotICAgICAg ICBtX3RpbWVyV29ya0l0ZW1zTG9jay51bmxvY2soKTsKLSAgICAgICAgcmV0dXJuOworICAgIHsK KyAgICAgICAgLy8gUHJvdGVjdHMgbV90aW1lcldvcmtJdGVtcy4KKyAgICAgICAgTXV0ZXhMb2Nr ZXIgbG9ja2VyKG1fdGltZXJXb3JrSXRlbXNMb2NrKTsKKyAgICAgICAgaWYgKG1fdGltZXJXb3Jr SXRlbXMuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIC8vIENvcGll cyBhbGwgdGhlIHRpbWVyIHdvcmsgaXRlbXMgaW4gbV90aW1lcldvcmtJdGVtcyB0byBsb2NhbCB2 ZWN0b3IuCisgICAgICAgIG1fdGltZXJXb3JrSXRlbXMuc3dhcCh0aW1lcldvcmtJdGVtcyk7CiAg ICAgfQogCiAgICAgZG91YmxlIGN1cnJlbnQgPSBjdXJyZW50VGltZSgpOwotICAgIFZlY3RvcjxP d25QdHI8VGltZXJXb3JrSXRlbT4gPiB0aW1lcldvcmtJdGVtczsKLQotICAgIC8vIENvcGllcyBh bGwgdGhlIHRpbWVyIHdvcmsgaXRlbXMgaW4gbV90aW1lcldvcmtJdGVtcyB0byBsb2NhbCB2ZWN0 b3IuCi0gICAgbV90aW1lcldvcmtJdGVtcy5zd2FwKHRpbWVyV29ya0l0ZW1zKTsKIAogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgdGltZXJXb3JrSXRlbXMuc2l6ZSgpOyArK2kpIHsKICAgICAg ICAgaWYgKCF0aW1lcldvcmtJdGVtc1tpXS0+ZXhwaXJlZChjdXJyZW50KSkgeworICAgICAgICAg ICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fdGltZXJXb3JrSXRlbXNMb2NrKTsKICAgICAgICAgICAg IC8vIElmIGEgdGltZXIgd29yayBpdGVtIGRvZXMgbm90IGV4cGlyZWQsIGtlZXAgaXQgdG8gdGhl IG1fdGltZXJXb3JrSXRlbXMuCiAgICAgICAgICAgICAvLyBtX3RpbWVyV29ya0l0ZW1zIHNob3Vs ZCBiZSBvcmRlcmVkIGJ5IGV4cGlyZSB0aW1lLgogICAgICAgICAgICAgaW5zZXJ0VGltZXJXb3Jr SXRlbSh0aW1lcldvcmtJdGVtc1tpXS5yZWxlYXNlKCkpOwpAQCAtMTU4LDE0ICsxNjEsOCBAQCB2 b2lkIFdvcmtRdWV1ZTo6cGVyZm9ybVRpbWVyV29yaygpCiAgICAgICAgIH0KIAogICAgICAgICAv LyBJZiBhIHRpbWVyIHdvcmsgaXRlbSBleHBpcmVkLCBkaXNwYXRjaCB0aGUgZnVuY3Rpb24gb2Yg dGhlIHdvcmsgaXRlbS4KLSAgICAgICAgLy8gQmVmb3JlIGRpc3BhdGNoaW5nLCBtX3RpbWVyV29y a0l0ZW1zTG9jayBzaG91bGQgdW5sb2NrIGZvciBwcmV2ZW50aW5nIGRlYWRsb2NrLAotICAgICAg ICAvLyBiZWNhdXNlIGl0IGNhbiBiZSBhY2Nlc3NlZCBpbnNpZGUgdGhlIGZ1bmN0aW9uIG9mIHRo ZSB0aW1lciB3b3JrIGl0ZW0gZGlzcGF0Y2hlZC4KLSAgICAgICAgbV90aW1lcldvcmtJdGVtc0xv Y2sudW5sb2NrKCk7CiAgICAgICAgIHRpbWVyV29ya0l0ZW1zW2ldLT5kaXNwYXRjaCgpOwotICAg ICAgICBtX3RpbWVyV29ya0l0ZW1zTG9jay5sb2NrKCk7CiAgICAgfQotCi0gICAgbV90aW1lcldv cmtJdGVtc0xvY2sudW5sb2NrKCk7CiB9CiAKIHZvaWQgV29ya1F1ZXVlOjpzZW5kTWVzc2FnZVRv VGhyZWFkKGNvbnN0IGNoYXIqIG1lc3NhZ2UpCg==