113568 2013-03-29 04:35:15 -0700 g_slist_reverse() may not be required in webKitWebAudioSrcLoop 2013-03-30 03:39:39 -0700 1 1 1 Unclassified WebKit Web Audio 528+ (Nightly build) All All RESOLVED FIXED P3 Minor --- 1 praveen.j praveen.j cdumez crogers dev_sachin eric.carlson feature-media-reviews jer.noble pnormand s.choi webkit.review.bot oldest_to_newest 866077 0 praveen.j 2013-03-29 04:35:15 -0700 webKitWebAudioSrcLoop() will be called continuously after AudioContext instance initialization which affects CPU load. Using decrement counter in for loop can reduce no. of instructions generated (when comparison is done with 0 in jump instruction). Also, g_slist_reverse() need not be used in that case. 866079 1 195722 praveen.j 2013-03-29 04:43:05 -0700 Created attachment 195722 Patch Basically, this change reduces the no. of instructions generated for webKitWebAudioSrcLoop. 866130 2 195722 pnormand 2013-03-29 06:45:33 -0700 Comment on attachment 195722 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195722&action=review Looks good but I'd like to test this patch before landing > Source/WebCore/ChangeLog:8 > + Decremental for loop logic implemented to avoid using g_slist_reverse(). This could be expanded a bit, explaining the performance gain. > Source/WebCore/ChangeLog:10 > + No new tests (OOPS!). You'd need to remove this line unless you state the patch is covered by existing webaudio tests. 866152 3 pnormand 2013-03-29 07:42:14 -0700 Ok I tested it, if you can improve the ChangeLog a bit it'd be great :) 866556 4 praveen.j 2013-03-29 22:43:07 -0700 (In reply to comment #2) > (From update of attachment 195722 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195722&action=review > > Looks good but I'd like to test this patch before landing > > > Source/WebCore/ChangeLog:8 > > + Decremental for loop logic implemented to avoid using g_slist_reverse(). > > This could be expanded a bit, explaining the performance gain. I tested with basic audiocontext with 2 destination channels only(No other nodes webaudio nodes are created). Calculated the time taken to execute webKitWebAudioSrcLoop() for 100000 iteration and the details are as below. Original code - 2.025230 micro seconds Original code + patch - 1.964759 micro seconds Its a small gain indeed, but a gain nevertheless. Given the frequency with which webKitWebAudioSrcLoop() is called, CPU load should decrease a bit. > > > Source/WebCore/ChangeLog:10 > > + No new tests (OOPS!). > > You'd need to remove this line unless you state the patch is covered by existing webaudio tests. I will update the patch shortly. 866557 5 195842 praveen.j 2013-03-29 22:49:25 -0700 Created attachment 195842 Patch Patch updated as per review comments. 866559 6 praveen.j 2013-03-29 23:22:16 -0700 (In reply to comment #4) > (In reply to comment #2) > > (From update of attachment 195722 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=195722&action=review > > > > Looks good but I'd like to test this patch before landing > > > > > Source/WebCore/ChangeLog:8 > > > + Decremental for loop logic implemented to avoid using g_slist_reverse(). > > > > This could be expanded a bit, explaining the performance gain. > > I tested with basic audiocontext with 2 destination channels only(No other nodes webaudio nodes are created). Calculated the time taken to execute webKitWebAudioSrcLoop() for 100000 iteration and the details are as below. > > Original code - 2.025230 micro seconds > Original code + patch - 1.964759 micro seconds Correction: it is Original code - 2.025230 micro seconds per function execution Original code + patch - 1.964759 micro seconds per function execution > > Its a small gain indeed, but a gain nevertheless. Given the frequency with which webKitWebAudioSrcLoop() is called, CPU load should decrease a bit. > > > > > > Source/WebCore/ChangeLog:10 > > > + No new tests (OOPS!). > > > > You'd need to remove this line unless you state the patch is covered by existing webaudio tests. > > I will update the patch shortly. 866576 7 pnormand 2013-03-30 01:27:24 -0700 Ok it's good you made some measurements, can you put this explanation in the ChangeLog itself please? 866583 8 s.choi 2013-03-30 01:50:10 -0700 FYI - changed assignee to Praveen Jadhav. 866594 9 195851 praveen.j 2013-03-30 02:56:23 -0700 Created attachment 195851 Patch 866598 10 195851 webkit.review.bot 2013-03-30 03:39:35 -0700 Comment on attachment 195851 Patch Clearing flags on attachment: 195851 Committed r147278: <http://trac.webkit.org/changeset/147278> 866599 11 webkit.review.bot 2013-03-30 03:39:39 -0700 All reviewed patches have been landed. Closing bug. 195722 2013-03-29 04:43:05 -0700 2013-03-29 22:49:25 -0700 Patch WebAudio-113568.txt text/plain 2310 praveen.j SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NzIwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAzLTI5ICBQcmF2ZWVu IFIgSmFkaGF2ICA8cHJhdmVlbi5qQHNhbXN1bmcuY29tPgorCisgICAgICAgIGdfc2xpc3RfcmV2 ZXJzZSgpIG1heSBub3QgYmUgcmVxdWlyZWQgaW4gd2ViS2l0V2ViQXVkaW9TcmNMb29wCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM1NjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWNyZW1lbnRhbCBm b3IgbG9vcCBsb2dpYyBpbXBsZW1lbnRlZCB0byBhdm9pZCB1c2luZyBnX3NsaXN0X3JldmVyc2Uo KS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3Jt L2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdTdHJlYW1lci5jcHA6CisgICAg ICAgICh3ZWJLaXRXZWJBdWRpb1NyY0xvb3ApOgorCiAyMDEzLTAzLTI5ICBLZWlzaGkgSGF0dG9y aSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCB0aGUgZXZlbnQgaGFuZGxlciBj b250ZW50IGF0dHJpYnV0ZXMgdGhhdCBhcmUgZGVmaW5lZCBpbiB0aGUgc3BlYyB0byBIVE1MRWxl bWVudApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktp dFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIu Y3BwCShyZXZpc2lvbiAxNDcyMDUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9n c3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zNTUsNyArMzU1LDcgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViQXVkaW9TcmNMb29wKFdl YktpdAogCiAgICAgR1NMaXN0KiBjaGFubmVsQnVmZmVyTGlzdCA9IDA7CiAgICAgdW5zaWduZWQg YnVmZmVyU2l6ZSA9IHByaXYtPmZyYW1lc1RvUHVsbCAqIHNpemVvZihmbG9hdCk7Ci0gICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnBhZHMpOyBpKyspIHsK KyAgICBmb3IgKGludCBpID0gZ19zbGlzdF9sZW5ndGgocHJpdi0+cGFkcykgLSAxOyBpID49IDA7 IGktLSkgewogICAgICAgICBHc3RCdWZmZXIqIGNoYW5uZWxCdWZmZXIgPSBnc3RfYnVmZmVyX25l d19hbmRfYWxsb2MoYnVmZmVyU2l6ZSk7CiAgICAgICAgIEFTU0VSVChjaGFubmVsQnVmZmVyKTsK ICAgICAgICAgY2hhbm5lbEJ1ZmZlckxpc3QgPSBnX3NsaXN0X3ByZXBlbmQoY2hhbm5lbEJ1ZmZl ckxpc3QsIGNoYW5uZWxCdWZmZXIpOwpAQCAtMzY4LDEyICszNjgsMTEgQEAgc3RhdGljIHZvaWQg d2ViS2l0V2ViQXVkaW9TcmNMb29wKFdlYktpdAogICAgICAgICBwcml2LT5idXMtPnNldENoYW5u ZWxNZW1vcnkoaSwgcmVpbnRlcnByZXRfY2FzdDxmbG9hdCo+KEdTVF9CVUZGRVJfREFUQShjaGFu bmVsQnVmZmVyKSksIHByaXYtPmZyYW1lc1RvUHVsbCk7CiAjZW5kaWYKICAgICB9Ci0gICAgY2hh bm5lbEJ1ZmZlckxpc3QgPSBnX3NsaXN0X3JldmVyc2UoY2hhbm5lbEJ1ZmZlckxpc3QpOwogCiAg ICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBsb2NhbC9saXZlIGF1ZGlvIGlucHV0LgogICAg IHByaXYtPnByb3ZpZGVyLT5yZW5kZXIoMCwgcHJpdi0+YnVzLCBwcml2LT5mcmFtZXNUb1B1bGwp OwogCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnBh ZHMpOyBpKyspIHsKKyAgICBmb3IgKGludCBpID0gZ19zbGlzdF9sZW5ndGgocHJpdi0+cGFkcykg LSAxOyBpID49IDA7IGktLSkgewogICAgICAgICBHc3RQYWQqIHBhZCA9IHN0YXRpY19jYXN0PEdz dFBhZCo+KGdfc2xpc3RfbnRoX2RhdGEocHJpdi0+cGFkcywgaSkpOwogICAgICAgICBHc3RCdWZm ZXIqIGNoYW5uZWxCdWZmZXIgPSBzdGF0aWNfY2FzdDxHc3RCdWZmZXIqPihnX3NsaXN0X250aF9k YXRhKGNoYW5uZWxCdWZmZXJMaXN0LCBpKSk7CiAK 195842 2013-03-29 22:49:25 -0700 2013-03-30 02:56:23 -0700 Patch WebAudio-113568.txt text/plain 2340 praveen.j SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NzIwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAzLTI5ICBQcmF2ZWVu IFIgSmFkaGF2ICA8cHJhdmVlbi5qQHNhbXN1bmcuY29tPgorCisgICAgICAgIGdfc2xpc3RfcmV2 ZXJzZSgpIG1heSBub3QgYmUgcmVxdWlyZWQgaW4gd2ViS2l0V2ViQXVkaW9TcmNMb29wCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM1NjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWNyZW1lbnRhbCAn Zm9yJyBsb29wIGxvZ2ljIGltcGxlbWVudGVkIHRvIGF2b2lkIHVzaW5nIGdfc2xpc3RfcmV2ZXJz ZSgpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgY292ZXJlZCBieSBleGlzdGluZyB3ZWJhdWRp byB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJB dWRpb1NvdXJjZUdTdHJlYW1lci5jcHA6CisgICAgICAgICh3ZWJLaXRXZWJBdWRpb1NyY0xvb3Ap OgorCiAyMDEzLTAzLTI5ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAg ICAgICAgIEFkZCB0aGUgZXZlbnQgaGFuZGxlciBjb250ZW50IGF0dHJpYnV0ZXMgdGhhdCBhcmUg ZGVmaW5lZCBpbiB0aGUgc3BlYyB0byBIVE1MRWxlbWVudApJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdlYkF1ZGlvU291cmNlR1N0cmVhbWVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIv V2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiAxNDcyMDUpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3Vy Y2VHU3RyZWFtZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNTUsNyArMzU1LDcgQEAgc3RhdGlj IHZvaWQgd2ViS2l0V2ViQXVkaW9TcmNMb29wKFdlYktpdAogCiAgICAgR1NMaXN0KiBjaGFubmVs QnVmZmVyTGlzdCA9IDA7CiAgICAgdW5zaWduZWQgYnVmZmVyU2l6ZSA9IHByaXYtPmZyYW1lc1Rv UHVsbCAqIHNpemVvZihmbG9hdCk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGdfc2xp c3RfbGVuZ3RoKHByaXYtPnBhZHMpOyBpKyspIHsKKyAgICBmb3IgKGludCBpID0gZ19zbGlzdF9s ZW5ndGgocHJpdi0+cGFkcykgLSAxOyBpID49IDA7IGktLSkgewogICAgICAgICBHc3RCdWZmZXIq IGNoYW5uZWxCdWZmZXIgPSBnc3RfYnVmZmVyX25ld19hbmRfYWxsb2MoYnVmZmVyU2l6ZSk7CiAg ICAgICAgIEFTU0VSVChjaGFubmVsQnVmZmVyKTsKICAgICAgICAgY2hhbm5lbEJ1ZmZlckxpc3Qg PSBnX3NsaXN0X3ByZXBlbmQoY2hhbm5lbEJ1ZmZlckxpc3QsIGNoYW5uZWxCdWZmZXIpOwpAQCAt MzY4LDEyICszNjgsMTEgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViQXVkaW9TcmNMb29wKFdlYktp dAogICAgICAgICBwcml2LT5idXMtPnNldENoYW5uZWxNZW1vcnkoaSwgcmVpbnRlcnByZXRfY2Fz dDxmbG9hdCo+KEdTVF9CVUZGRVJfREFUQShjaGFubmVsQnVmZmVyKSksIHByaXYtPmZyYW1lc1Rv UHVsbCk7CiAjZW5kaWYKICAgICB9Ci0gICAgY2hhbm5lbEJ1ZmZlckxpc3QgPSBnX3NsaXN0X3Jl dmVyc2UoY2hhbm5lbEJ1ZmZlckxpc3QpOwogCiAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZv ciBsb2NhbC9saXZlIGF1ZGlvIGlucHV0LgogICAgIHByaXYtPnByb3ZpZGVyLT5yZW5kZXIoMCwg cHJpdi0+YnVzLCBwcml2LT5mcmFtZXNUb1B1bGwpOwogCi0gICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnBhZHMpOyBpKyspIHsKKyAgICBmb3IgKGludCBp ID0gZ19zbGlzdF9sZW5ndGgocHJpdi0+cGFkcykgLSAxOyBpID49IDA7IGktLSkgewogICAgICAg ICBHc3RQYWQqIHBhZCA9IHN0YXRpY19jYXN0PEdzdFBhZCo+KGdfc2xpc3RfbnRoX2RhdGEocHJp di0+cGFkcywgaSkpOwogICAgICAgICBHc3RCdWZmZXIqIGNoYW5uZWxCdWZmZXIgPSBzdGF0aWNf Y2FzdDxHc3RCdWZmZXIqPihnX3NsaXN0X250aF9kYXRhKGNoYW5uZWxCdWZmZXJMaXN0LCBpKSk7 CiAK 195851 2013-03-30 02:56:23 -0700 2013-03-30 03:39:35 -0700 Patch WebAudio-113568.txt text/plain 2478 praveen.j SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NzIwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAzLTI5ICBQcmF2ZWVu IFIgSmFkaGF2ICA8cHJhdmVlbi5qQHNhbXN1bmcuY29tPgorCisgICAgICAgIGdfc2xpc3RfcmV2 ZXJzZSgpIG1heSBub3QgYmUgcmVxdWlyZWQgaW4gd2ViS2l0V2ViQXVkaW9TcmNMb29wCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM1NjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWNyZW1lbnRhbCAn Zm9yJyBsb29wIGxvZ2ljIGltcGxlbWVudGVkIHRvIGF2b2lkIHVzaW5nIGdfc2xpc3RfcmV2ZXJz ZSgpLgorCisgICAgICAgIE9yaWdpbmFsIGNvZGUgICAgICAgICAgICAtIDIuMDI1MjMwIG1pY3Jv IHNlY29uZHMgcGVyIGxvb3AKKyAgICAgICAgT3JpZ2luYWwgY29kZSArIHBhdGNoICAgIC0gMS45 NjQ3NTkgbWljcm8gc2Vjb25kcyBwZXIgbG9vcAorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgY292 ZXJlZCBieSBleGlzdGluZyB3ZWJhdWRpbyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2F1 ZGlvL2dzdHJlYW1lci9XZWJLaXRXZWJBdWRpb1NvdXJjZUdTdHJlYW1lci5jcHA6CisgICAgICAg ICh3ZWJLaXRXZWJBdWRpb1NyY0xvb3ApOgorCiAyMDEzLTAzLTI5ICBLZWlzaGkgSGF0dG9yaSAg PGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCB0aGUgZXZlbnQgaGFuZGxlciBjb250 ZW50IGF0dHJpYnV0ZXMgdGhhdCBhcmUgZGVmaW5lZCBpbiB0aGUgc3BlYyB0byBIVE1MRWxlbWVu dApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0cmVhbWVyL1dlYktpdFdl YkF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3Bw CShyZXZpc2lvbiAxNDcyMDUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3Ry ZWFtZXIvV2ViS2l0V2ViQXVkaW9Tb3VyY2VHU3RyZWFtZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNTUsNyArMzU1LDcgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViQXVkaW9TcmNMb29wKFdlYktp dAogCiAgICAgR1NMaXN0KiBjaGFubmVsQnVmZmVyTGlzdCA9IDA7CiAgICAgdW5zaWduZWQgYnVm ZmVyU2l6ZSA9IHByaXYtPmZyYW1lc1RvUHVsbCAqIHNpemVvZihmbG9hdCk7Ci0gICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnBhZHMpOyBpKyspIHsKKyAg ICBmb3IgKGludCBpID0gZ19zbGlzdF9sZW5ndGgocHJpdi0+cGFkcykgLSAxOyBpID49IDA7IGkt LSkgewogICAgICAgICBHc3RCdWZmZXIqIGNoYW5uZWxCdWZmZXIgPSBnc3RfYnVmZmVyX25ld19h bmRfYWxsb2MoYnVmZmVyU2l6ZSk7CiAgICAgICAgIEFTU0VSVChjaGFubmVsQnVmZmVyKTsKICAg ICAgICAgY2hhbm5lbEJ1ZmZlckxpc3QgPSBnX3NsaXN0X3ByZXBlbmQoY2hhbm5lbEJ1ZmZlckxp c3QsIGNoYW5uZWxCdWZmZXIpOwpAQCAtMzY4LDEyICszNjgsMTEgQEAgc3RhdGljIHZvaWQgd2Vi S2l0V2ViQXVkaW9TcmNMb29wKFdlYktpdAogICAgICAgICBwcml2LT5idXMtPnNldENoYW5uZWxN ZW1vcnkoaSwgcmVpbnRlcnByZXRfY2FzdDxmbG9hdCo+KEdTVF9CVUZGRVJfREFUQShjaGFubmVs QnVmZmVyKSksIHByaXYtPmZyYW1lc1RvUHVsbCk7CiAjZW5kaWYKICAgICB9Ci0gICAgY2hhbm5l bEJ1ZmZlckxpc3QgPSBnX3NsaXN0X3JldmVyc2UoY2hhbm5lbEJ1ZmZlckxpc3QpOwogCiAgICAg Ly8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBsb2NhbC9saXZlIGF1ZGlvIGlucHV0LgogICAgIHBy aXYtPnByb3ZpZGVyLT5yZW5kZXIoMCwgcHJpdi0+YnVzLCBwcml2LT5mcmFtZXNUb1B1bGwpOwog Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGdfc2xpc3RfbGVuZ3RoKHByaXYtPnBhZHMp OyBpKyspIHsKKyAgICBmb3IgKGludCBpID0gZ19zbGlzdF9sZW5ndGgocHJpdi0+cGFkcykgLSAx OyBpID49IDA7IGktLSkgewogICAgICAgICBHc3RQYWQqIHBhZCA9IHN0YXRpY19jYXN0PEdzdFBh ZCo+KGdfc2xpc3RfbnRoX2RhdGEocHJpdi0+cGFkcywgaSkpOwogICAgICAgICBHc3RCdWZmZXIq IGNoYW5uZWxCdWZmZXIgPSBzdGF0aWNfY2FzdDxHc3RCdWZmZXIqPihnX3NsaXN0X250aF9kYXRh KGNoYW5uZWxCdWZmZXJMaXN0LCBpKSk7CiAK