127370 2014-01-21 14:43:21 -0800 [WK2][iOS] callOnMainThread() from main thread sometimes results in ASSERTs. 2014-01-27 13:12:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble benjamin cmarcelo commit-queue eric.carlson glenn joepeck psolanki oldest_to_newest 970435 0 jer.noble 2014-01-21 14:43:21 -0800 [WK2] callOnMainThread() from main thread sometimes results in ASSERTs. 970437 1 221791 jer.noble 2014-01-21 14:51:15 -0800 Created attachment 221791 Patch 970439 2 jer.noble 2014-01-21 14:54:53 -0800 Too many commas in the ChangeLog. Will fix. 970476 3 221791 jer.noble 2014-01-21 16:26:11 -0800 Comment on attachment 221791 Patch ap, after talking to JoePeck about this patch on IRC, I think the new direction is to add a less ambiguous "callOnWebThread()" method. 970481 4 221808 jer.noble 2014-01-21 16:49:30 -0800 Created attachment 221808 Patch 970482 5 commit-queue 2014-01-21 16:50:23 -0800 Attachment 221808 did not pass style-queue: ERROR: Source/WTF/wtf/MainThread.h:61: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WTF/wtf/MainThread.h:69: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 970591 6 221808 ap 2014-01-21 23:22:20 -0800 Comment on attachment 221808 Patch The new patch crashes right and left on EWS, see <http://webkit-queues.appspot.com/results/5607835786280960>. Crashes are flaky, so EWS can't decide what to report. 970781 7 jer.noble 2014-01-22 11:10:27 -0800 It looks like the behavior of WebThreadRun() is subtly different than callOnMainThread(). Specifically, if WebThreadRun() is called from the web thread, the task is run synchronously. In callOnMainThread(), if the current thread is the main (or web) thread, the task is run in the next run-loop. 971260 8 psolanki 2014-01-23 12:00:12 -0800 I think we should make sure that callOnMainThread always calls on the WebThread for iOS. The fact that it dispatched on the main (UI) thread sometimes is a bug. 971273 9 222013 psolanki 2014-01-23 12:13:40 -0800 Created attachment 222013 potential patch Something like this may do the trick. Needs testing though. 971387 10 222013 joepeck 2014-01-23 16:27:45 -0800 Comment on attachment 222013 potential patch View in context: https://bugs.webkit.org/attachment.cgi?id=222013&action=review > Source/WTF/wtf/mac/MainThreadMac.mm:80 > mainThreadEstablishedAsPthreadMain = false; > mainThreadPthread = pthread_self(); > mainThreadNSThread = [[NSThread currentThread] retain]; > + mainThreadRunLoop = CFRunLoopGetCurrent(); This is inside of !USE(WEB_THREAD). I think you will want to always initialize this variable, regardless of USE(WEB_THREAD) or not. Which means, on iOS which has USE(WEB_THREAD), mainThreadRunLoop in the UIProcess, NetworkProcess, and WebProcess will be uninitialized until initializeWebThreadPlatform is called. On the WebProcess, that is probably pretty early on. In the UIProcess / NetworkProcess I don't know if that is ever called. I suspect it may not be called at all. In that case, having an uninitialized mainThreadRunLoop and calling callOnMainThread would trigger CFRunLoopAddTimer(NULL, ...). There are UIProcess/NetworkProcess calls to "callOnMainThread": shell> cd Source/WebKit2; ack callOnMainThread NetworkProcess/NetworkResourceLoadScheduler.cpp 170: callOnMainThread(NetworkResourceLoadScheduler::removeScheduledLoaders, this); UIProcess/API/mac/WKPrintingView.mm 400: callOnMainThread(prepareDataForPrintingOnSecondaryThread, self); Next, on iOS, we would want to verify that those NetworkProcess/UIProcess calls would be okay to happen on either the MainThread or WebThread. Since the "mainThreadRunLoop" could spontaneous change from MainThread to WebThread in the UIProcess if the UIProcess lazily initializes a WebThread (e.g. makes a WebKit1 WebView). 971397 11 222043 psolanki 2014-01-23 16:55:32 -0800 Created attachment 222043 Patch 971398 12 222043 joepeck 2014-01-23 17:01:20 -0800 Comment on attachment 222043 Patch This looks good to me. Does Benjamin Poulain or another person more familiar with the WebKit2 wanna check this as well? 971464 13 222043 psolanki 2014-01-23 19:08:48 -0800 Comment on attachment 222043 Patch Withdrawing this patch. There's more subtlety here. 972514 14 psolanki 2014-01-27 12:35:39 -0800 Joe and I discussed this and we think the first patch <https://bug-127370-attachments.webkit.org/attachment.cgi?id=221791> that Jer had is the right approach. callOnMainThread() always scheduled work on the web thread on iOS. That changed recently when we made changes to the definition of isMainThread() as part of upstreaming iOS code (r153950 made for bug 119644). We should use isWebThread() in this function. isWebThread() is defined to be the main thread on non-iOS code. And will do the right thing on iOS. 972515 15 221791 jer.noble 2014-01-27 12:38:10 -0800 Comment on attachment 221791 Patch Un-obsoleting attachment #221791. 972530 16 221791 commit-queue 2014-01-27 13:12:15 -0800 Comment on attachment 221791 Patch Clearing flags on attachment: 221791 Committed r162862: <http://trac.webkit.org/changeset/162862> 972531 17 commit-queue 2014-01-27 13:12:19 -0800 All reviewed patches have been landed. Closing bug. 221791 2014-01-21 14:51:15 -0800 2014-01-27 13:12:15 -0800 Patch bug-127370-20140121145114.patch text/plain 1740 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ0MmFmNWM2MDVkODQzZDJmMjgxNjA0 NTk4OTk4MWRkZmMzYmYxZjMuLmU5NjNmNmI1YmE5MzBkNmU3OTJkNTBlOTRiMWRjN2Q1ODJiZTVh NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTQtMDEtMjEgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gY2FsbE9uTWFpblRocmVhZCgpIGZyb20gbWFp biB0aHJlYWQgc29tZXRpbWVzIHJlc3VsdHMgaW4gQVNTRVJUcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzM3MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gV0VCX1RIUkVBRCBpcyBlbmFibGVk LCBhbmQgY2FsbE9uTWFpblRocmVhZCgpIGlzIGNhbGxlZCBmcm9tIHRoZSBtYWluCisgICAgICAg IHRocmVhZCwgaWYgdGhlIHdlYiB0aHJlYWQgaXMgbG9ja2VkLCBhIHRpbWVyIGlzIHNldCBhbmQg dGhlIHBhc3NlZC1pbiBmdW5jdGlvbgorICAgICAgICBpcyBjYWxsZWQgb24gdGhlIG5leHQgcnVu LWxvb3AuIEhvd2V2ZXIsIGJ5IHRoYXQgdGltZSB0aGUgd2ViIHRocmVhZCBtYXkgaGF2ZQorICAg ICAgICBiZWVuIHVubG9ja2VkLCBhbmQgaXNNYWluVGhyZWFkKCkgd2lsbCBubyBsb25nZXIgcmV0 dXJuIHRydWUsIHJlc3VsdGluZyBpbgorICAgICAgICBhbiBhc3NlcnQuCisKKyAgICAgICAgSW5z dGVhZCwgc2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRocmVhZCgpIHNob3VsZCBjaGVj ayBpc1dlYlRocmVhZCgpLAorICAgICAgICB3aGljaCBpcyBlcXVpdmFsZW50IHRvIGlzTWFpblRo cmVhZCgpIHdoZW4gdGhlIFdFQl9USFJFQUQgaXMgZGlzYWJsZWQsIGJ1dAorICAgICAgICB3aWxs IGRvIHRoZSBjb3JyZWN0IHRoaW5nIHdoZW4gV0VCX1RIUkVBRCBpcyBlbmFibGVkLgorCisgICAg ICAgICogd3RmL21hYy9NYWluVGhyZWFkTWFjLm1tOgorICAgICAgICAoV1RGOjpzY2hlZHVsZURp c3BhdGNoRnVuY3Rpb25zT25NYWluVGhyZWFkKToKKwogMjAxNC0wMS0yMCAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBhbiB1bnVzZWQgbWVt YmVyIHZhcmlhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVhZE1h Yy5tbSBiL1NvdXJjZS9XVEYvd3RmL21hYy9NYWluVGhyZWFkTWFjLm1tCmluZGV4IDM3OTRkOTM2 YWEyNzRkMzQ3MDdmYWYwNWVkZjBlYzYzNjNkNjkyMDIuLmU0ZDkxZjM4M2VhOTI0NmMyYmJjMjNk MjFlOWNlMWNiMzFhZjA4ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL21hYy9NYWluVGhy ZWFkTWFjLm1tCisrKyBiL1NvdXJjZS9XVEYvd3RmL21hYy9NYWluVGhyZWFkTWFjLm1tCkBAIC0x MjQsNyArMTI0LDcgQEAgdm9pZCBzY2hlZHVsZURpc3BhdGNoRnVuY3Rpb25zT25NYWluVGhyZWFk KCkKIHsKICAgICBBU1NFUlQoc3RhdGljTWFpblRocmVhZENhbGxlcik7CiAKLSAgICBpZiAoaXNN YWluVGhyZWFkKCkpIHsKKyAgICBpZiAoaXNXZWJUaHJlYWQoKSkgewogICAgICAgICBwb3N0VGlt ZXIoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K 221808 2014-01-21 16:49:30 -0800 2014-01-23 16:55:28 -0800 Patch bug-127370-20140121164930.patch text/plain 9600 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ0MmFmNWM2MDVkODQzZDJmMjgxNjA0 NTk4OTk4MWRkZmMzYmYxZjMuLjNhMzRjZDBkOWM1YjFjZDVlNTUzOTczMDdkNjU4MDYzNDA3NDIz MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTQtMDEtMjEgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gY2FsbE9uTWFpblRocmVhZCgpIGZyb20gbWFp biB0aHJlYWQgc29tZXRpbWVzIHJlc3VsdHMgaW4gQVNTRVJUcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzM3MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gV0VCX1RIUkVBRCBpcyBlbmFibGVk LCBhbmQgY2FsbE9uTWFpblRocmVhZCgpIGlzIGNhbGxlZCBmcm9tIHRoZSBtYWluCisgICAgICAg IHRocmVhZCwgaWYgdGhlIHdlYiB0aHJlYWQgaXMgbG9ja2VkLCBhIHRpbWVyIGlzIHNldCBhbmQg dGhlIHBhc3NlZC1pbiBmdW5jdGlvbgorICAgICAgICBpcyBjYWxsZWQgb24gdGhlIG5leHQgcnVu LWxvb3AuIEhvd2V2ZXIsIGJ5IHRoYXQgdGltZSB0aGUgd2ViIHRocmVhZCBtYXkgaGF2ZQorICAg ICAgICBiZWVuIHVubG9ja2VkLCBhbmQgaXNNYWluVGhyZWFkKCkgd2lsbCBubyBsb25nZXIgcmV0 dXJuIHRydWUsIHJlc3VsdGluZyBpbgorICAgICAgICBhbiBhc3NlcnQuCisKKyAgICAgICAgSW5z dGVhZCwgYWRkIGEgbmV3IG1ldGhvZCBjYWxsT25XZWJUaHJlYWQoKSB3aGljaCB3aWxsIGhhdmUg dGhlIHNhbWUgYmVoYXZpb3IKKyAgICAgICAgYXMgY2FsbE9uTWFpblRocmVhZCB3aGVuIFdFQl9U SFJFQUQgaXMgZGlzYWJsZWQsIGJ1dCB3aWxsIGRpc3BhdGNoIGRpcmVjdGx5IHRvCisgICAgICAg IHRoZSB3ZWIgdGhyZWFkIHdoZW4gV0VCX1RIUkVBRCBpcyBlbmFibGVkLgorCisgICAgICAgICog d3RmL01haW5UaHJlYWQuaDoKKyAgICAgICAgKFdURjo6Y2FsbE9uV2ViVGhyZWFkKToKKyAgICAg ICAgKiB3dGYvbWFjL01haW5UaHJlYWRNYWMubW06CisgICAgICAgIChXVEY6OmNhbGxPbldlYlRo cmVhZCk6CisKIDIwMTQtMDEtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgYW4gdW51c2VkIG1lbWJlciB2YXJpYWJsZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDViMzNkMDc3M2MwNzliN2E5YjIwOWYxZjcyM2ZkYzdmMWNiNWMwM2EuLjk5MWFjOTBlMjE5 N2QzNjliOWJkMjgzN2I3OWVhNWNjMzRjNDA0OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBA QAorMjAxNC0wMS0yMSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAgICAg ICBbV0syXVtpT1NdIGNhbGxPbk1haW5UaHJlYWQoKSBmcm9tIG1haW4gdGhyZWFkIHNvbWV0aW1l cyByZXN1bHRzIGluIEFTU0VSVHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjczNzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZG9wdCB0aGUgbmV3IGNhbGxPbldlYlRocmVhZCgpIEFQSS4gQ2FsbCB0 aGlzIG1ldGhvZCBpbnN0ZWFkIG9mIGNhbGxPbk1haW5UaHJlYWQKKyAgICAgICAgYW5kIGRpc3Bh dGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCkpLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246On5N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpzY2hlZHVsZU1haW5UaHJlYWROb3RpZmljYXRpb24p OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpkaXNw YXRjaE5vdGlmaWNhdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnNlZWtUb1RpbWUp OgorICAgICAgICAoLVtXZWJDb3JlQVZGTW92aWVPYnNlcnZlciBsZWdpYmxlT3V0cHV0OmRpZE91 dHB1dEF0dHJpYnV0ZWRTdHJpbmdzOm5hdGl2ZVNhbXBsZUJ1ZmZlcnM6Zm9ySXRlbVRpbWU6XSk6 CisgICAgICAgICgtW1dlYkNvcmVBVkZNb3ZpZU9ic2VydmVyIG91dHB1dFNlcXVlbmNlV2FzRmx1 c2hlZDpdKToKKyAgICAgICAgKC1bV2ViQ29yZUFWRkxvYWRlckRlbGVnYXRlIHJlc291cmNlTG9h ZGVyOnNob3VsZFdhaXRGb3JMb2FkaW5nT2ZSZXF1ZXN0ZWRSZXNvdXJjZTpdKToKKyAgICAgICAg KC1bV2ViQ29yZUFWRkxvYWRlckRlbGVnYXRlIHJlc291cmNlTG9hZGVyOnNob3VsZFdhaXRGb3JS ZXNwb25zZVRvQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6XSk6CisgICAgICAgICgtW1dlYkNvcmVB VkZMb2FkZXJEZWxlZ2F0ZSByZXNvdXJjZUxvYWRlcjpkaWRDYW5jZWxMb2FkaW5nUmVxdWVzdDpd KToKKwogMjAxNC0wMS0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIEdpdmUgZWFjaCBwYWdlIGEgVXNlckNvbnRlbnRDb250cm9sbGVyCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL3d0Zi9NYWluVGhyZWFkLmggYi9Tb3VyY2UvV1RGL3d0Zi9NYWluVGhy ZWFkLmgKaW5kZXggZjMzZDcxZjMwMWY0MDY4NGFjODE4YWZjMDMzMjQwMmMxZDczMTEwOS4uZTM3 ZTA3NmRmNWQ4NjZmZTU3ZWJmYzQwNWMyMWZkYjY4N2NkOGQyYSAxMDA2NDQKLS0tIGEvU291cmNl L1dURi93dGYvTWFpblRocmVhZC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01haW5UaHJlYWQuaApA QCAtNTgsMTAgKzU4LDE4IEBAIFdURl9FWFBPUlRfUFJJVkFURSBib29sIGlzVUlUaHJlYWQoKTsK IFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGluaXRpYWxpemVXZWJUaHJlYWQoKTsKIFdURl9FWFBP UlRfUFJJVkFURSB2b2lkIGluaXRpYWxpemVBcHBsaWNhdGlvblVJVGhyZWFkSWRlbnRpZmllcigp OwogV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgaW5pdGlhbGl6ZVdlYlRocmVhZElkZW50aWZpZXIo KTsKK1dURl9FWFBPUlRfUFJJVkFURSB2b2lkIGNhbGxPbldlYlRocmVhZChzdGQ6OmZ1bmN0aW9u PHZvaWQgKCk+KTsKKyNpZiBDT01QSUxFUl9TVVBQT1JUUyhCTE9DS1MpCitXVEZfRVhQT1JUX1BS SVZBVEUgdm9pZCBjYWxsT25XZWJUaHJlYWQodm9pZCAoXikoKSk7CisjZW5kaWYKIHZvaWQgaW5p dGlhbGl6ZVdlYlRocmVhZFBsYXRmb3JtKCk7CiAjZWxzZQogaW5saW5lIGJvb2wgaXNXZWJUaHJl YWQoKSB7IHJldHVybiBpc01haW5UaHJlYWQoKTsgfQogaW5saW5lIGJvb2wgaXNVSVRocmVhZCgp IHsgcmV0dXJuIGlzTWFpblRocmVhZCgpOyB9CitpbmxpbmUgdm9pZCBjYWxsT25XZWJUaHJlYWQo c3RkOjpmdW5jdGlvbjx2b2lkICgpPiBmdW5jdGlvbikgeyBjYWxsT25NYWluVGhyZWFkKGZ1bmN0 aW9uKTsgfQorI2lmIENPTVBJTEVSX1NVUFBPUlRTKEJMT0NLUykKK2lubGluZSB2b2lkIGNhbGxP bldlYlRocmVhZCh2b2lkICheYmxvY2spKCkpIHsgY2FsbE9uTWFpblRocmVhZChibG9jayk7IH0K KyNlbmRpZgogI2VuZGlmIC8vIFVTRShXRUJfVEhSRUFEKQogCiB2b2lkIGluaXRpYWxpemVHQ1Ro cmVhZHMoKTsKQEAgLTEwMCw2ICsxMDgsNyBAQCB1c2luZyBXVEY6OmlzTWFpblRocmVhZE9yR0NU aHJlYWQ7CiB1c2luZyBXVEY6OmNhbkFjY2Vzc1RocmVhZExvY2FsRGF0YUZvclRocmVhZDsKIHVz aW5nIFdURjo6aXNVSVRocmVhZDsKIHVzaW5nIFdURjo6aXNXZWJUaHJlYWQ7Cit1c2luZyBXVEY6 OmNhbGxPbldlYlRocmVhZDsKICNpZiBVU0UoV0VCX1RIUkVBRCkKIHVzaW5nIFdURjo6aW5pdGlh bGl6ZVdlYlRocmVhZDsKIHVzaW5nIFdURjo6aW5pdGlhbGl6ZUFwcGxpY2F0aW9uVUlUaHJlYWRJ ZGVudGlmaWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvbWFjL01haW5UaHJlYWRNYWMu bW0gYi9Tb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVhZE1hYy5tbQppbmRleCAzNzk0ZDkzNmFh Mjc0ZDM0NzA3ZmFmMDVlZGYwZWM2MzYzZDY5MjAyLi4wYTRlYzFiYjFiM2EyZGU5Y2IyNzAwMzNh YzQ3YjcxNzBiYTgxM2NjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVh ZE1hYy5tbQorKysgYi9Tb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVhZE1hYy5tbQpAQCAtMTg3 LDYgKzE4NywyMyBAQCBib29sIGNhbkFjY2Vzc1RocmVhZExvY2FsRGF0YUZvclRocmVhZChUaHJl YWRJZGVudGlmaWVyIHRocmVhZElkKQogCiAgICAgcmV0dXJuIGZhbHNlOwogfQorCit2b2lkIGNh bGxPbldlYlRocmVhZChzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGZ1bmN0aW9uKQoreworICAgIGNh bGxPbldlYlRocmVhZCheeyBmdW5jdGlvbigpOyB9KTsKK30KKwordm9pZCBjYWxsT25XZWJUaHJl YWQodm9pZCAoXmJsb2NrKSgpKQoreworI2lmIFBMQVRGT1JNKElPUykKKyAgICBpZiAoV2ViQ29y ZVdlYlRocmVhZElzRW5hYmxlZCAmJiBXZWJDb3JlV2ViVGhyZWFkSXNFbmFibGVkKCkpIHsKKyAg ICAgICAgV2ViQ29yZVdlYlRocmVhZFJ1bihibG9jayk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisjZW5kaWYKKworICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCks IGJsb2NrKTsKK30KICNlbHNlCiBib29sIGlzTWFpblRocmVhZCgpCiB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwCmluZGV4IGM0 MDdkMGU1ZjNiYzU0ZjkzODNjNmQ5NWJlZWIwMTg1NDBjMWYxYTcuLjE0NTM3MmUyMDk3ZTMxNDBh ZTRmY2NjNzVlNmY5NDhhMGZmZGE4ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwCkBAIC04Niw3ICs4Niw2IEBAIE1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6fk1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bigpCiB7CiAgICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjp+ TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uKCVwKSIsIHRoaXMpOwogICAgIHNldElnbm9y ZUxvYWRTdGF0ZUNoYW5nZXModHJ1ZSk7Ci0gICAgY2FuY2VsQ2FsbE9uTWFpblRocmVhZChtYWlu VGhyZWFkQ2FsbGJhY2ssIHRoaXMpOwogfQogCiBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b246Ok1lZGlhUmVuZGVyaW5nTW9kZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmN1 cnJlbnRSZW5kZXJpbmdNb2RlKCkgY29uc3QKQEAgLTc5Nyw3ICs3OTYsMTQgQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnNjaGVkdWxlTWFpblRocmVhZE5vdGlmaWNhdGlv bihOb3RpZmljYXRpb24KICAgICBib29sIGRlbGF5RGlzcGF0Y2ggPSBtX2RlbGF5Q2FsbGJhY2tz IHx8ICFpc01haW5UaHJlYWQoKTsKICAgICBpZiAoZGVsYXlEaXNwYXRjaCAmJiAhbV9tYWluVGhy ZWFkQ2FsbFBlbmRpbmcpIHsKICAgICAgICAgbV9tYWluVGhyZWFkQ2FsbFBlbmRpbmcgPSB0cnVl OwotICAgICAgICBjYWxsT25NYWluVGhyZWFkKG1haW5UaHJlYWRDYWxsYmFjaywgdGhpcyk7Cisg ICAgICAgIFdlYWtQdHI8TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uPiB3ZWFrVGhpcyA9 IGNyZWF0ZVdlYWtQdHIoKTsKKyAgICAgICAgY2FsbE9uV2ViVGhyZWFkKFt3ZWFrVGhpc10oKSB7 CisgICAgICAgICAgICBpZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAgICAgIHJldHVybjsKKwor ICAgICAgICAgICAgd2Vha1RoaXMuZ2V0KCktPmNsZWFyTWFpblRocmVhZFBlbmRpbmdGbGFnKCk7 CisgICAgICAgICAgICB3ZWFrVGhpcy5nZXQoKS0+ZGlzcGF0Y2hOb3RpZmljYXRpb24oKTsKKyAg ICAgICAgfSk7CiAgICAgfQogCiAgICAgbV9xdWV1ZU11dGV4LnVubG9jaygpOwpAQCAtODI3LDgg KzgzMywxNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6ZGlzcGF0Y2hO b3RpZmljYXRpb24oKQogICAgICAgICAgICAgbV9xdWV1ZWROb3RpZmljYXRpb25zLnJlbW92ZSgw KTsKICAgICAgICAgfQogICAgICAgICAKLSAgICAgICAgaWYgKCFtX3F1ZXVlZE5vdGlmaWNhdGlv bnMuaXNFbXB0eSgpICYmICFtX21haW5UaHJlYWRDYWxsUGVuZGluZykKLSAgICAgICAgICAgIGNh bGxPbk1haW5UaHJlYWQobWFpblRocmVhZENhbGxiYWNrLCB0aGlzKTsKKyAgICAgICAgaWYgKCFt X3F1ZXVlZE5vdGlmaWNhdGlvbnMuaXNFbXB0eSgpICYmICFtX21haW5UaHJlYWRDYWxsUGVuZGlu ZykgeworICAgICAgICAgICAgV2Vha1B0cjxNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24+ IHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cigpOworICAgICAgICAgICAgY2FsbE9uV2ViVGhyZWFk KFt3ZWFrVGhpc10oKSB7CisgICAgICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAgICAgd2Vha1RoaXMuZ2V0KCktPmNs ZWFyTWFpblRocmVhZFBlbmRpbmdGbGFnKCk7CisgICAgICAgICAgICAgICAgd2Vha1RoaXMuZ2V0 KCktPmRpc3BhdGNoTm90aWZpY2F0aW9uKCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQog CiAgICAgICAgIGlmICghbm90aWZpY2F0aW9uLmlzVmFsaWQoKSkKICAgICAgICAgICAgIHJldHVy bjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4IGRmYzhiNmM0NDU2OGQ5NGZlNDc5NmMyMTMz MTQwZDllNmJiN2JiNTkuLjk3YTcxZjAwOTZmMzZlMGIwYmY5NjMyNjhkNGRlOTVjY2Y4NTVjMzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAtNjkzLDcgKzY5Myw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6c2Vla1RvVGltZShkb3VibGUgdGltZSwgZG91 YmxlIG5lZ2F0aXZlCiAgICAgX19ibG9jayBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cigp OwogCiAgICAgW21fYXZQbGF5ZXJJdGVtLmdldCgpIHNlZWtUb1RpbWU6Y21UaW1lIHRvbGVyYW5j ZUJlZm9yZTpjbUJlZm9yZSB0b2xlcmFuY2VBZnRlcjpjbUFmdGVyIGNvbXBsZXRpb25IYW5kbGVy Ol4oQk9PTCBmaW5pc2hlZCkgewotICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRf bWFpbl9xdWV1ZSgpLCBeeworICAgICAgICBjYWxsT25XZWJUaHJlYWQoXnsKICAgICAgICAgICAg IGF1dG8gX3RoaXMgPSB3ZWFrVGhpcy5nZXQoKTsKICAgICAgICAgICAgIGlmICghX3RoaXMpCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjAyNiw3ICsyMDI2LDcgQEAgTlNBcnJheSogaXRl bUtWT1Byb3BlcnRpZXMoKQogICAgIGlmICghbV9jYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwog Ci0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKKyAgICBj YWxsT25XZWJUaHJlYWQoXnsKICAgICAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICBtX2NhbGxiYWNrLT5wcm9jZXNzQ3VlKHN0cmluZ3MsIENNVGltZUdl dFNlY29uZHMoaXRlbVRpbWUpKTsKQEAgLTIwNDAsNyArMjA0MCw3IEBAIE5TQXJyYXkqIGl0ZW1L Vk9Qcm9wZXJ0aWVzKCkKICAgICBpZiAoIW1fY2FsbGJhY2spCiAgICAgICAgIHJldHVybjsKICAg ICAKLSAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeeworICAg IGNhbGxPbldlYlRocmVhZCheewogICAgICAgICBpZiAoIW1fY2FsbGJhY2spCiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIG1fY2FsbGJhY2stPmZsdXNoQ3VlcygpOwpAQCAtMjA2OCw3ICsy MDY4LDcgQEAgTlNBcnJheSogaXRlbUtWT1Byb3BlcnRpZXMoKQogICAgIGlmICghbV9jYWxsYmFj aykKICAgICAgICAgcmV0dXJuIE5POwogCi0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0 X21haW5fcXVldWUoKSwgXnsKKyAgICBjYWxsT25XZWJUaHJlYWQoXnsKICAgICAgICAgaWYgKCFt X2NhbGxiYWNrKSB7CiAgICAgICAgICAgICBbbG9hZGluZ1JlcXVlc3QgZmluaXNoTG9hZGluZ1dp dGhFcnJvcjpuaWxdOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjA4Nyw3ICsyMDg3LDcgQEAg TlNBcnJheSogaXRlbUtWT1Byb3BlcnRpZXMoKQogICAgIGlmICghbV9jYWxsYmFjaykKICAgICAg ICAgcmV0dXJuIE5POwogCi0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVl dWUoKSwgXnsKKyAgICBjYWxsT25XZWJUaHJlYWQoXnsKICAgICAgICAgaWYgKCFtX2NhbGxiYWNr KSB7CiAgICAgICAgICAgICBbW2NoYWxsZW5nZSBzZW5kZXJdIGNhbmNlbEF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlOmNoYWxsZW5nZV07CiAgICAgICAgICAgICByZXR1cm47CkBAIC0yMTA2LDcgKzIx MDYsNyBAQCBOU0FycmF5KiBpdGVtS1ZPUHJvcGVydGllcygpCiAgICAgaWYgKCFtX2NhbGxiYWNr KQogICAgICAgICByZXR1cm47CiAKLSAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFp bl9xdWV1ZSgpLCBeeworICAgIGNhbGxPbldlYlRocmVhZCheewogICAgICAgICBpZiAobV9jYWxs YmFjaykKICAgICAgICAgICAgIG1fY2FsbGJhY2stPmRpZENhbmNlbExvYWRpbmdSZXF1ZXN0KGxv YWRpbmdSZXF1ZXN0KTsKICAgICB9KTsK 222013 2014-01-23 12:13:40 -0800 2014-01-23 16:55:30 -0800 potential patch 127370.patch text/plain 1585 psolanki ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL21hYy9NYWluVGhyZWFkTWFjLm1tIGIvU291cmNl L1dURi93dGYvbWFjL01haW5UaHJlYWRNYWMubW0KaW5kZXggMzc5NGQ5My4uNDMzZDljNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dURi93dGYvbWFjL01haW5UaHJlYWRNYWMubW0KKysrIGIvU291cmNl L1dURi93dGYvbWFjL01haW5UaHJlYWRNYWMubW0KQEAgLTYxLDYgKzYxLDcgQEAgc3RhdGljIGJv b2wgaXNUaW1lclBvc3RlZDsgLy8gVGhpcyBpcyBvbmx5IGFjY2Vzc2VkIG9uIHRoZSAnbWFpbicg dGhyZWFkLgogc3RhdGljIGJvb2wgbWFpblRocmVhZEVzdGFibGlzaGVkQXNQdGhyZWFkTWFpbjsK IHN0YXRpYyBwdGhyZWFkX3QgbWFpblRocmVhZFB0aHJlYWQ7CiBzdGF0aWMgTlNUaHJlYWQqIG1h aW5UaHJlYWROU1RocmVhZDsKK3N0YXRpYyBDRlJ1bkxvb3BSZWYgbWFpblRocmVhZFJ1bkxvb3A7 CiAKICNpZiBVU0UoV0VCX1RIUkVBRCkKIHN0YXRpYyBUaHJlYWRJZGVudGlmaWVyIHNBcHBsaWNh dGlvblVJVGhyZWFkSWRlbnRpZmllcjsKQEAgLTc2LDYgKzc3LDcgQEAgdm9pZCBpbml0aWFsaXpl TWFpblRocmVhZFBsYXRmb3JtKCkKICAgICBtYWluVGhyZWFkRXN0YWJsaXNoZWRBc1B0aHJlYWRN YWluID0gZmFsc2U7CiAgICAgbWFpblRocmVhZFB0aHJlYWQgPSBwdGhyZWFkX3NlbGYoKTsKICAg ICBtYWluVGhyZWFkTlNUaHJlYWQgPSBbW05TVGhyZWFkIGN1cnJlbnRUaHJlYWRdIHJldGFpbl07 CisgICAgbWFpblRocmVhZFJ1bkxvb3AgPSBDRlJ1bkxvb3BHZXRDdXJyZW50KCk7CiAjZWxzZQog ICAgIG1haW5UaHJlYWRFc3RhYmxpc2hlZEFzUHRocmVhZE1haW4gPSB0cnVlOwogICAgIEFTU0VS VCghbWFpblRocmVhZFB0aHJlYWQpOwpAQCAtMTE3LDcgKzExOSw3IEBAIHN0YXRpYyB2b2lkIHBv c3RUaW1lcigpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlzVGltZXJQb3N0ZWQgPSB0cnVlOwot ICAgIENGUnVuTG9vcEFkZFRpbWVyKENGUnVuTG9vcEdldEN1cnJlbnQoKSwgQ0ZSdW5Mb29wVGlt ZXJDcmVhdGUoMCwgMCwgMCwgMCwgMCwgdGltZXJGaXJlZCwgMCksIGtDRlJ1bkxvb3BDb21tb25N b2Rlcyk7CisgICAgQ0ZSdW5Mb29wQWRkVGltZXIobWFpblRocmVhZFJ1bkxvb3AsIENGUnVuTG9v cFRpbWVyQ3JlYXRlKDAsIDAsIDAsIDAsIDAsIHRpbWVyRmlyZWQsIDApLCBrQ0ZSdW5Mb29wQ29t bW9uTW9kZXMpOwogfQogCiB2b2lkIHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJl YWQoKQpAQCAtMTc0LDYgKzE3Niw3IEBAIHZvaWQgaW5pdGlhbGl6ZVdlYlRocmVhZFBsYXRmb3Jt KCkKICAgICBtYWluVGhyZWFkRXN0YWJsaXNoZWRBc1B0aHJlYWRNYWluID0gZmFsc2U7CiAgICAg bWFpblRocmVhZFB0aHJlYWQgPSBwdGhyZWFkX3NlbGYoKTsKICAgICBtYWluVGhyZWFkTlNUaHJl YWQgPSBbW05TVGhyZWFkIGN1cnJlbnRUaHJlYWRdIHJldGFpbl07CisgICAgbWFpblRocmVhZFJ1 bkxvb3AgPSBDRlJ1bkxvb3BHZXRDdXJyZW50KCk7CiB9CiAKIGJvb2wgY2FuQWNjZXNzVGhyZWFk TG9jYWxEYXRhRm9yVGhyZWFkKFRocmVhZElkZW50aWZpZXIgdGhyZWFkSWQpCg== 222043 2014-01-23 16:55:32 -0800 2014-01-23 19:08:44 -0800 Patch bug-127370-20140123165532.patch text/plain 2863 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNjMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGNlMDAxZDE3ZDY1N2I5ZjczYzkwZDdh NWEyYjhjOWE4MTE4M2IxYWMuLmU4MzYxYWJkMDEwODQwYzU4YmRmN2IyMTdjMjNjZmVhODk3OTQ5 OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTQtMDEtMjMgIFByYXRpayBTb2xhbmtpICA8cHNv bGFua2lAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdW2lPU10gY2FsbE9uTWFpblRocmVhZCgp IGZyb20gbWFpbiB0aHJlYWQgc29tZXRpbWVzIHJlc3VsdHMgaW4gQVNTRVJUcy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzM3MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgY2FsbE9uTWFpblRo cmVhZCgpIGFsd2F5cyBpbnZva2UgdGhlIG1ldGhvZCBvbiB0aGUgd2ViIHRocmVhZC4gQ3VycmVu dGx5LCBpdCB3b3VsZAorICAgICAgICBpbnZva2Ugb24gdGhlIGN1cnJlbnQgcnVuIGxvb3Agd2hp Y2ggY291bGQgYmUgdGhlIFVJIHRocmVhZC4gT24gaU9TLCB3ZSB3YW50IGl0IHRvIGludm9rZSBv bgorICAgICAgICB3ZWIgdGhyZWFkLgorCisgICAgICAgICogd3RmL21hYy9NYWluVGhyZWFkTWFj Lm1tOgorICAgICAgICAoV1RGOjppbml0aWFsaXplTWFpblRocmVhZFJ1bkxvb3ApOgorICAgICAg ICAoV1RGOjppbml0aWFsaXplTWFpblRocmVhZFBsYXRmb3JtKToKKyAgICAgICAgKFdURjo6cG9z dFRpbWVyKToKKyAgICAgICAgKFdURjo6aW5pdGlhbGl6ZVdlYlRocmVhZFBsYXRmb3JtKToKKwog MjAxNC0wMS0yMiAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAg ICBbV2luXSBVcGRhdGUgcHJvamVjdCBhbmQgc29sdXRpb24gZmlsZXMgZm9yIDY0LWJpdCBidWls ZHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9tYWMvTWFpblRocmVhZE1hYy5tbSBiL1Nv dXJjZS9XVEYvd3RmL21hYy9NYWluVGhyZWFkTWFjLm1tCmluZGV4IDM3OTRkOTM2YWEyNzRkMzQ3 MDdmYWYwNWVkZjBlYzYzNjNkNjkyMDIuLjE4MDM2MmZkNTNmM2E4ZWJjYWNlNjMxMGI3NDhkMmE5 YmQ1NDQ0NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL21hYy9NYWluVGhyZWFkTWFjLm1t CisrKyBiL1NvdXJjZS9XVEYvd3RmL21hYy9NYWluVGhyZWFkTWFjLm1tCkBAIC02MSwxMiArNjEs MjEgQEAgc3RhdGljIGJvb2wgaXNUaW1lclBvc3RlZDsgLy8gVGhpcyBpcyBvbmx5IGFjY2Vzc2Vk IG9uIHRoZSAnbWFpbicgdGhyZWFkLgogc3RhdGljIGJvb2wgbWFpblRocmVhZEVzdGFibGlzaGVk QXNQdGhyZWFkTWFpbjsKIHN0YXRpYyBwdGhyZWFkX3QgbWFpblRocmVhZFB0aHJlYWQ7CiBzdGF0 aWMgTlNUaHJlYWQqIG1haW5UaHJlYWROU1RocmVhZDsKK3N0YXRpYyBDRlJ1bkxvb3BSZWYgbWFp blRocmVhZFJ1bkxvb3A7CiAKICNpZiBVU0UoV0VCX1RIUkVBRCkKIHN0YXRpYyBUaHJlYWRJZGVu dGlmaWVyIHNBcHBsaWNhdGlvblVJVGhyZWFkSWRlbnRpZmllcjsKIHN0YXRpYyBUaHJlYWRJZGVu dGlmaWVyIHNXZWJUaHJlYWRJZGVudGlmaWVyOwogI2VuZGlmCiAKK3N0YXRpYyB2b2lkIGluaXRp YWxpemVNYWluVGhyZWFkUnVuTG9vcCgpCit7CisgICAgaWYgKG1haW5UaHJlYWRSdW5Mb29wKQor ICAgICAgICBDRlJlbGVhc2UobWFpblRocmVhZFJ1bkxvb3ApOworICAgIG1haW5UaHJlYWRSdW5M b29wID0gQ0ZSdW5Mb29wR2V0Q3VycmVudCgpOworICAgIENGUmV0YWluKG1haW5UaHJlYWRSdW5M b29wKTsKK30KKwogdm9pZCBpbml0aWFsaXplTWFpblRocmVhZFBsYXRmb3JtKCkKIHsKICAgICBB U1NFUlQoIXN0YXRpY01haW5UaHJlYWRDYWxsZXIpOwpAQCAtODEsNiArOTAsNyBAQCB2b2lkIGlu aXRpYWxpemVNYWluVGhyZWFkUGxhdGZvcm0oKQogICAgIEFTU0VSVCghbWFpblRocmVhZFB0aHJl YWQpOwogICAgIEFTU0VSVCghbWFpblRocmVhZE5TVGhyZWFkKTsKICNlbmRpZgorICAgIGluaXRp YWxpemVNYWluVGhyZWFkUnVuTG9vcCgpOwogCiAgICAgaW5pdGlhbGl6ZUdDVGhyZWFkcygpOwog fQpAQCAtMTE3LDcgKzEyNyw3IEBAIHN0YXRpYyB2b2lkIHBvc3RUaW1lcigpCiAgICAgICAgIHJl dHVybjsKIAogICAgIGlzVGltZXJQb3N0ZWQgPSB0cnVlOwotICAgIENGUnVuTG9vcEFkZFRpbWVy KENGUnVuTG9vcEdldEN1cnJlbnQoKSwgQ0ZSdW5Mb29wVGltZXJDcmVhdGUoMCwgMCwgMCwgMCwg MCwgdGltZXJGaXJlZCwgMCksIGtDRlJ1bkxvb3BDb21tb25Nb2Rlcyk7CisgICAgQ0ZSdW5Mb29w QWRkVGltZXIobWFpblRocmVhZFJ1bkxvb3AsIENGUnVuTG9vcFRpbWVyQ3JlYXRlKDAsIDAsIDAs IDAsIDAsIHRpbWVyRmlyZWQsIDApLCBrQ0ZSdW5Mb29wQ29tbW9uTW9kZXMpOwogfQogCiB2b2lk IHNjaGVkdWxlRGlzcGF0Y2hGdW5jdGlvbnNPbk1haW5UaHJlYWQoKQpAQCAtMTc0LDYgKzE4NCw3 IEBAIHZvaWQgaW5pdGlhbGl6ZVdlYlRocmVhZFBsYXRmb3JtKCkKICAgICBtYWluVGhyZWFkRXN0 YWJsaXNoZWRBc1B0aHJlYWRNYWluID0gZmFsc2U7CiAgICAgbWFpblRocmVhZFB0aHJlYWQgPSBw dGhyZWFkX3NlbGYoKTsKICAgICBtYWluVGhyZWFkTlNUaHJlYWQgPSBbW05TVGhyZWFkIGN1cnJl bnRUaHJlYWRdIHJldGFpbl07CisgICAgaW5pdGlhbGl6ZU1haW5UaHJlYWRSdW5Mb29wKCk7CiB9 CiAKIGJvb2wgY2FuQWNjZXNzVGhyZWFkTG9jYWxEYXRhRm9yVGhyZWFkKFRocmVhZElkZW50aWZp ZXIgdGhyZWFkSWQpCg==