91094 2012-07-12 07:47:19 -0700 [Qt] Implement MemoryUsageSupport 2012-07-12 10:08:07 -0700 1 1 1 Unclassified WebKit Platform 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen abarth dglazkov haraken japhet jochen ossy webkit.review.bot oldest_to_newest 667760 0 allan.jensen 2012-07-12 07:47:19 -0700 We should support the MemoryUsageSupport class, it is currently only used by the V8 garbage-collector, but it can be usefull for us to measure run-time memory-usage more accurately and to implement a memory pressure handler. 667766 1 151952 allan.jensen 2012-07-12 07:54:26 -0700 Created attachment 151952 Patch 667773 2 151952 webkit.review.bot 2012-07-12 08:00:40 -0700 Comment on attachment 151952 Patch Attachment 151952 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13180834 667783 3 151957 allan.jensen 2012-07-12 08:12:00 -0700 Created attachment 151957 Patch 667794 4 151957 abarth 2012-07-12 08:23:02 -0700 Comment on attachment 151957 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151957&action=review > Source/WebCore/platform/MemoryUsageSupport.h:36 > +// MemoryUsageSupport is currently only used by the V8 garbage collector. I wouldn't add this sort of comment. It's likely to get out of date quickly. 667800 5 allan.jensen 2012-07-12 08:27:49 -0700 (In reply to comment #4) > (From update of attachment 151957 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=151957&action=review > > > Source/WebCore/platform/MemoryUsageSupport.h:36 > > +// MemoryUsageSupport is currently only used by the V8 garbage collector. > > I wouldn't add this sort of comment. It's likely to get out of date quickly. Okay. 667814 6 allan.jensen 2012-07-12 08:34:53 -0700 Committed r122462: <http://trac.webkit.org/changeset/122462> 667847 7 ossy 2012-07-12 09:15:34 -0700 (In reply to comment #6) > Committed r122462: <http://trac.webkit.org/changeset/122462> It broke the 4.8 builds, could you fix it, please? /ramdisk/qt-linux-release/build/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp:25:45: error: JavaScriptCore/MemoryStatistics.h: No such file or directory 667915 8 allan.jensen 2012-07-12 10:08:07 -0700 (In reply to comment #7) > (In reply to comment #6) > > Committed r122462: <http://trac.webkit.org/changeset/122462> > > It broke the 4.8 builds, could you fix it, please? > /ramdisk/qt-linux-release/build/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp:25:45: error: JavaScriptCore/MemoryStatistics.h: No such file or directory Fixed in r122474. 151952 2012-07-12 07:54:26 -0700 2012-07-12 08:11:53 -0700 Patch bug-91094-20120712165429.patch text/plain 10335 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 ZWJkOWFhYzNjNzYyY2VkMWJiZWMxY2UyOTk5ZmZlMjRmM2UyYzk3Li5jZGI3ZWNiNzhhYzg1ODc2 YTlhZmRmMDZmNWUxYjVlMTAzNWM4YjJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMi0wNy0xMiAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVu c2VuQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEltcGxlbWVudCBNZW1vcnlVc2FnZVN1cHBv cnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMDk0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29tcGls ZSBpbiBNZW1vcnlTdGF0aXN0aWNzIHNvIHdlIGNhbiBtYWtlIHVzZSBvZiB0aGUgaW50ZXJmYWNl LgorCisgICAgICAgICogVGFyZ2V0LnByaToKKwogMjAxMi0wNy0xMiAgQ3NhYmEgT3N6dHJvZ29u w6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSBkZWFkIGNvZGUgYWZ0ZXIg cjEyMjM5Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNjkyMjQyZTg0NjJhNDI5NGNjODQ5MzEwZDIwY2U4N2Yx NmY2YmQwLi5iNTk1MzNhZTliMjJhNjQwMjhmZmE1NTA1NjlkMTFjOTE4N2U2MmZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTItMDctMTIgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAg PGFsbGFuLmplbnNlbkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBJbXBsZW1lbnQgTWVtb3J5 VXNhZ2VTdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MTA5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEltcGxlbWVudHMgUXQgdmVyc2lvbnMgb2YgdGhlIG1lbW9yeS11c2FnZSBmdW5jdGlvbnMg dXNpbmcgdGhlIGluZm9ybWF0aW9uIHdlIGhhdmUgYXZhaWxhYmxlCisgICAgICAgIGZyb20gdGhl IHZhcmlvdXMgbWVtb3J5IHN5c3RlbXMgdXNlZCBpbiBXZWJLaXQuCisKKyAgICAgICAgQWxzbyBn ZXRzIHJpZCBvZiBhIHJlZHVuZGFudCBpbmRpcmVjdGlvbiBpbiBWOEdDQ29udHJvbGxlci4KKwor ICAgICAgICAqIFRhcmdldC5wcmk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhHQ0NvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhHQ0NvbnRyb2xsZXI6OmdjRXBpbG9ndWUpOgor ICAgICAgICAoV2ViQ29yZTo6VjhHQ0NvbnRyb2xsZXI6OmNoZWNrTWVtb3J5VXNhZ2UpOgorICAg ICAgICAqIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5oOgorICAgICAgICAqIHBsYXRmb3Jt L3F0L01lbW9yeVVzYWdlU3VwcG9ydFF0LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpt YWxsb2NNZW1vcnlVc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjptZW1vcnlVc2FnZUtCKToKKyAg ICAgICAgKFdlYkNvcmU6OmFjdHVhbE1lbW9yeVVzYWdlS0IpOgorICAgICAgICAoV2ViQ29yZTo6 TWVtb3J5VXNhZ2VTdXBwb3J0OjptZW1vcnlVc2FnZU1CKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l bW9yeVVzYWdlU3VwcG9ydDo6YWN0dWFsTWVtb3J5VXNhZ2VNQik6CisgICAgICAgIChXZWJDb3Jl OjpNZW1vcnlVc2FnZVN1cHBvcnQ6Omxvd01lbW9yeVVzYWdlTUIpOgorICAgICAgICAoV2ViQ29y ZTo6TWVtb3J5VXNhZ2VTdXBwb3J0OjpoaWdoTWVtb3J5VXNhZ2VNQik6CisgICAgICAgIChXZWJD b3JlOjpNZW1vcnlVc2FnZVN1cHBvcnQ6OmhpZ2hVc2FnZURlbHRhTUIpOgorICAgICAgICAoV2Vi Q29yZTo6TWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5U2l6ZXNJbkJ5dGVzKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9xdC9QbGF0Zm9ybVN1cHBvcnQuaDoKKyAgICAgICAgKFBsYXRmb3Jt U3VwcG9ydCk6CisKIDIwMTItMDctMTIgIFhpbmduYW4gV2FuZyAgPHhpbmduYW4ud2FuZ0BpbnRl bC5jb20+CiAKICAgICAgICAgW0luZGV4ZWREQl0gdXBwZXJPcGVuIHNldCB0byB0cnVlIGluIGxv d2VyQm91bmQoKS9sb3dlck9wZW4gc2V0IHRvIHRydWUgaW4gdXBwZXJCb3VuZCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9UYXJnZXQucHJpCmluZGV4IDYzNTUwMzk4N2RmYTE4M2M4ZTU0MGFhMWQ0ODU1MGMzYTZk YTkwZjcuLmI2YzUyYTI4ZjkxYzM0MzI5MjJjZjlkY2M2MDBlM2Y1MDJhOWZhN2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9UYXJnZXQucHJpCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9UYXJnZXQucHJpCkBAIC0yMTgsNiArMjE4LDcgQEAgU09VUkNFUyArPSBcCiAgICAg cnVudGltZS9MaXRlcmFsUGFyc2VyLmNwcCBcCiAgICAgcnVudGltZS9Mb29rdXAuY3BwIFwKICAg ICBydW50aW1lL01hdGhPYmplY3QuY3BwIFwKKyAgICBydW50aW1lL01lbW9yeVN0YXRpc3RpY3Mu Y3BwIFwKICAgICBydW50aW1lL05hbWVDb25zdHJ1Y3Rvci5jcHAgXAogICAgIHJ1bnRpbWUvTmFt ZUluc3RhbmNlLmNwcCBcCiAgICAgcnVudGltZS9OYW1lUHJvdG90eXBlLmNwcCBcCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpIGIvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnBy aQppbmRleCAyYWVlYmZjMzY5ODE0NTEwYjc4NzkzNTYwMDdkNWQ3YTBkZGVhODgwLi5mYzQyYzEx YjVmODU2OWQ4MDhkODBjYWNlZmY2YmU3MmJlYjI0Nzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9UYXJnZXQucHJpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKQEAgLTExNjcs NyArMTE2Nyw3IEBAIFNPVVJDRVMgKz0gXAogICAgIHBsYXRmb3JtL0xpbmtIYXNoLmNwcCBcCiAg ICAgcGxhdGZvcm0vTG9nZ2luZy5jcHAgXAogICAgIHBsYXRmb3JtL01lbW9yeVByZXNzdXJlSGFu ZGxlci5jcHAgXAotICAgIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5jcHAgXAorICAgIHBs YXRmb3JtL3F0L01lbW9yeVVzYWdlU3VwcG9ydFF0LmNwcCBcCiAgICAgcGxhdGZvcm0vTUlNRVR5 cGVSZWdpc3RyeS5jcHAgXAogICAgIHBsYXRmb3JtL21vY2svRGV2aWNlTW90aW9uQ2xpZW50TW9j ay5jcHAgXAogICAgIHBsYXRmb3JtL21vY2svRGV2aWNlT3JpZW50YXRpb25DbGllbnRNb2NrLmNw cCBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29udHJvbGxl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29udHJvbGxlci5jcHAKaW5k ZXggOTkxZTg4YjVjNjZlZmJhYjhmMmQ5MTIwOTU2YjNmODRjNGQwODcxZC4uZTZhMzMzNmRmOGM1 Y2NiZjczZmIwODFjYzFiYzNjMmYwMWFlYmQ1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhHQ0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcApAQCAtNDc1LDIzICs0NzUsNiBAQCBpbnQgVjhHQ0Nv bnRyb2xsZXI6OndvcmtpbmdTZXRFc3RpbWF0ZU1CID0gMDsKIAogbmFtZXNwYWNlIHsKIAotaW50 IGdldE1lbW9yeVVzYWdlSW5NQigpCi17Ci0jaWYgUExBVEZPUk0oQ0hST01JVU0pCi0gICAgcmV0 dXJuIE1lbW9yeVVzYWdlU3VwcG9ydDo6bWVtb3J5VXNhZ2VNQigpOwotI2Vsc2UKLSAgICByZXR1 cm4gMDsKLSNlbmRpZgotfQotCi1pbnQgZ2V0QWN0dWFsTWVtb3J5VXNhZ2VJbk1CKCkKLXsKLSNp ZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICByZXR1cm4gTWVtb3J5VXNhZ2VTdXBwb3J0OjphY3R1 YWxNZW1vcnlVc2FnZU1CKCk7Ci0jZWxzZQotICAgIHJldHVybiAwOwotI2VuZGlmCi19CiAKIH0g IC8vIGFub255bW91cyBuYW1lc3BhY2UKIApAQCAtNTA2LDcgKzQ4OSw3IEBAIHZvaWQgVjhHQ0Nv bnRyb2xsZXI6OmdjRXBpbG9ndWUoKQogICAgIEdDRXBpbG9ndWVWaXNpdG9yPE5vZGUsIFNwZWNp YWxDYXNlRXBpbG9ndWVOb2RlSGFuZGxlciwgJkRPTURhdGFTdG9yZTo6d2Vha05vZGVDYWxsYmFj az4gZXBpbG9ndWVOb2RlVmlzaXRvcjsKICAgICB2aXNpdEFjdGl2ZURPTU5vZGVzKCZlcGlsb2d1 ZU5vZGVWaXNpdG9yKTsKIAotICAgIHdvcmtpbmdTZXRFc3RpbWF0ZU1CID0gZ2V0QWN0dWFsTWVt b3J5VXNhZ2VJbk1CKCk7CisgICAgd29ya2luZ1NldEVzdGltYXRlTUIgPSBNZW1vcnlVc2FnZVN1 cHBvcnQ6OmFjdHVhbE1lbW9yeVVzYWdlSW5NQigpOwogCiAjaWZuZGVmIE5ERUJVRwogICAgIC8v IENoZWNrIGFsbCBzdXJ2aXZhbHMgYXJlIHdlYWsuCkBAIC01MzAsNyArNTEzLDcgQEAgdm9pZCBW OEdDQ29udHJvbGxlcjo6Y2hlY2tNZW1vcnlVc2FnZSgpCiAgICAgY29uc3QgaW50IGxvd01lbW9y eVVzYWdlTUIgPSBNZW1vcnlVc2FnZVN1cHBvcnQ6Omxvd01lbW9yeVVzYWdlTUIoKTsKICAgICBj b25zdCBpbnQgaGlnaE1lbW9yeVVzYWdlTUIgPSBNZW1vcnlVc2FnZVN1cHBvcnQ6OmhpZ2hNZW1v cnlVc2FnZU1CKCk7CiAgICAgY29uc3QgaW50IGhpZ2hVc2FnZURlbHRhTUIgPSBNZW1vcnlVc2Fn ZVN1cHBvcnQ6OmhpZ2hVc2FnZURlbHRhTUIoKTsKLSAgICBpbnQgbWVtb3J5VXNhZ2VNQiA9IGdl dE1lbW9yeVVzYWdlSW5NQigpOworICAgIGludCBtZW1vcnlVc2FnZU1CID0gTWVtb3J5VXNhZ2VT dXBwb3J0OjptZW1vcnlVc2FnZUluTUIoKTsKICAgICBpZiAoKG1lbW9yeVVzYWdlTUIgPiBsb3dN ZW1vcnlVc2FnZU1CICYmIG1lbW9yeVVzYWdlTUIgPiAyICogd29ya2luZ1NldEVzdGltYXRlTUIp IHx8IChtZW1vcnlVc2FnZU1CID4gaGlnaE1lbW9yeVVzYWdlTUIgJiYgbWVtb3J5VXNhZ2VNQiA+ IHdvcmtpbmdTZXRFc3RpbWF0ZU1CICsgaGlnaFVzYWdlRGVsdGFNQikpCiAgICAgICAgIHY4OjpW ODo6TG93TWVtb3J5Tm90aWZpY2F0aW9uKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgKaW5kZXggNGYxYTBiZGQ3ZGRkN2FiYTFkZTZlNWRk YTAyMjgyZWVmMmMwNmEyZi4uZGMxMjczMjk3OGJjOWI3YjdlYmIxZmM4Zjc3ZWRhYmU2ZThlNDJk MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgKQEAg LTMzLDYgKzMzLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCisvLyBNZW1vcnlVc2FnZVN1 cHBvcnQgaXMgY3VycmVudGx5IG9ubHkgdXNlZCBieSB0aGUgVjggZ2FyYmFnZSBjb2xsZWN0b3Iu CiBjbGFzcyBNZW1vcnlVc2FnZVN1cHBvcnQgewogcHVibGljOgogICAgIC8vIFJldHVybnMgdGhl IGN1cnJlbnQgc3BhY2UgYWxsb2NhdGVkIGZvciB0aGUgcGFnZWZpbGUsIGluIE1CLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTWVtb3J5VXNhZ2VTdXBwb3J0UXQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTWVtb3J5VXNhZ2VTdXBwb3J0UXQuY3BwCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjcwOGU0NDBiNjhlODc5MTdjYzA1MjNjNzA2NmI5ZDQ1YjMyYzRlZjAKLS0tIC9k ZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9NZW1vcnlVc2FnZVN1cHBv cnRRdC5jcHAKQEAgLTAsMCArMSwxMTEgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29v Z2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqICAgICAgICAgICAoQykgMjAxMiBOb2tp YSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKKyAqIAorICogVGhpcyBs aWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgor ICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1 YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRh dGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIuMSBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIg b3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZGlzdHJp YnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1dCBXSVRIT1VU IEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgKiBN RVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUg dGhlIEdOVQorICogTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWls cy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGVz c2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBp ZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCisgKiBGb3VuZGF0aW9uLCBJbmMuLCA1 MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjExMC0xMzAxICBV U0EKKyAqCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIk1lbW9yeVVzYWdl U3VwcG9ydC5oIgorCisjaW5jbHVkZSAiSlNET01XaW5kb3cuaCIKKyNpbmNsdWRlIDxKYXZhU2Ny aXB0Q29yZS9NZW1vcnlTdGF0aXN0aWNzLmg+CisjaW5jbHVkZSA8d3RmL0Zhc3RNYWxsb2MuaD4K KworI2lmIE9TKExJTlVYKQorI2luY2x1ZGUgPG1hbGxvYy5oPgorI2VuZGlmCisKK25hbWVzcGFj ZSBXZWJDb3JlIHsKKworI2lmIE9TKExJTlVYKQorc3RhdGljIHNpemVfdCBtYWxsb2NNZW1vcnlV c2FnZSgpCit7CisgICAgLy8gUmV0dXJuIGhvdyBtdWNoIG1lbW9yeSAoaW4gYnl0ZXMpIGhhcyBi ZWVuIGFsbG9jYXRlZCBvbiB0aGUgc3lzdGVtIGhlYXAuCisgICAgc3RydWN0IG1hbGxpbmZvIG1p bmZvID0gOjptYWxsaW5mbygpOworCisgICAgcmV0dXJuIG1pbmZvLmFyZW5hOworfQorI2Vsc2UK K3N0YXRpYyBzaXplX3QgbWFsbG9jTWVtb3J5VXNhZ2UoKQoreworICAgIC8vIEZJWE1FOiBJbXBs ZW1lbnQgZm9yIG90aGVyIHN1cHBvcnRlZCBPUydzLgorICAgIHJldHVybiAwOworfQorI2VuZGlm CisKKy8vIFRoaXMgaXMgaG93IG11Y2ggc3lzdGVtLW1lbW9yeSB3ZSB1c2UuCitzdGF0aWMgaW50 IG1lbW9yeVVzYWdlS0IoKQoreworICAgIHNpemVfdCBtYWxsb2NVc2FnZSA9IG1hbGxvY01lbW9y eVVzYWdlKCk7CisgICAgV1RGOjpGYXN0TWFsbG9jU3RhdGlzdGljcyBmbVN0YXRzID0gV1RGOjpm YXN0TWFsbG9jU3RhdGlzdGljcygpOworCisgICAgLy8gRXh0cmFjdCBtZW1vcnkgc3RhdGlzdGlj cyBmcm9tIEphdmFTY3JpcHRDb3JlOgorICAgIEpTQzo6R2xvYmFsTWVtb3J5U3RhdGlzdGljcyBq c2NTdGF0cyA9IEpTQzo6Z2xvYmFsTWVtb3J5U3RhdGlzdGljcygpOworICAgIHNpemVfdCBqc2NI ZWFwVXNhZ2UgPSBKU0RPTVdpbmRvdzo6Y29tbW9uSlNHbG9iYWxEYXRhKCktPmhlYXAuY2FwYWNp dHkoKTsKKyAgICByZXR1cm4gKG1hbGxvY1VzYWdlICsgZm1TdGF0cy5jb21taXR0ZWRWTUJ5dGVz ICsganNjU3RhdHMuc3RhY2tCeXRlcyArIGpzY1N0YXRzLkpJVEJ5dGVzICsganNjSGVhcFVzYWdl KSA+PiAxMDsKK30KKworLy8gVGhpcyBpcyBob3cgbXVjaCBtZW1vcnkgd2UgdXNlIGludGVybmFs bHksIG5vdCBpbmNsdWRpbmcgbWVtb3J5IG9ubHkgcmVzZXJ2ZWQgZnJvbSB0aGUgc3lzdGVtLgor c3RhdGljIGludCBhY3R1YWxNZW1vcnlVc2FnZUtCKCkKK3sKKyAgICBzaXplX3QgbWFsbG9jVXNh Z2UgPSBtYWxsb2NNZW1vcnlVc2FnZSgpOworICAgIFdURjo6RmFzdE1hbGxvY1N0YXRpc3RpY3Mg Zm1TdGF0cyA9IFdURjo6ZmFzdE1hbGxvY1N0YXRpc3RpY3MoKTsKKworICAgIC8vIEV4dHJhY3Qg bWVtb3J5IHN0YXRpc3RpY3MgZnJvbSBKYXZhU2NyaXB0Q29yZToKKyAgICBKU0M6Okdsb2JhbE1l bW9yeVN0YXRpc3RpY3MganNjU3RhdHMgPSBKU0M6Omdsb2JhbE1lbW9yeVN0YXRpc3RpY3MoKTsK KyAgICBzaXplX3QganNjSGVhcFVzYWdlID0gSlNET01XaW5kb3c6OmNvbW1vbkpTR2xvYmFsRGF0 YSgpLT5oZWFwLnNpemUoKTsKKyAgICByZXR1cm4gKG1hbGxvY1VzYWdlICsgZm1TdGF0cy5jb21t aXR0ZWRWTUJ5dGVzIC0gZm1TdGF0cy5mcmVlTGlzdEJ5dGVzICsganNjU3RhdHMuc3RhY2tCeXRl cyArIGpzY1N0YXRzLkpJVEJ5dGVzICsganNjSGVhcFVzYWdlKSA+PiAxMDsKK30KKworaW50IE1l bW9yeVVzYWdlU3VwcG9ydDo6bWVtb3J5VXNhZ2VNQigpCit7CisgICAgcmV0dXJuIG1lbW9yeVVz YWdlS0IoKSA+PiAxMDsKK30KKworaW50IE1lbW9yeVVzYWdlU3VwcG9ydDo6YWN0dWFsTWVtb3J5 VXNhZ2VNQigpCit7CisgICAgcmV0dXJuIGFjdHVhbE1lbW9yeVVzYWdlS0IoKSA+PiAxMDsKK30K KworLy8gRklYTUU6IFRoZXNlIHZhbHVlcyBzaG91bGQgYmUgZGV0ZXJtaW5lZCBiYXNlZCBvbiBo YXJkd2FyZSBvciBzZXQgYnkgdGhlIGFwcGxpY2F0aW9uLgorCitzdGF0aWMgY29uc3QgdW5zaWdu ZWQgbm9ybWFsTWVtb3J5V2F0ZXJtYXJrID0gMTI4OyAvLyBDaHJvbWl1bSBkZWZhdWx0OiAyNTYK K3N0YXRpYyBjb25zdCB1bnNpZ25lZCBoaWdoTWVtb3J5V2F0ZXJtYXJrID0gMjU2OyAvLyBDaHJv bWl1bSBkZWZhdWx0OiAxMDI0CitzdGF0aWMgY29uc3QgdW5zaWduZWQgaGlnaE1lbW9yeURlbHRh ID0gNjQ7IC8vIENocm9taXVtIGRlZmF1bHQ6IDEyOAorCitpbnQgTWVtb3J5VXNhZ2VTdXBwb3J0 Ojpsb3dNZW1vcnlVc2FnZU1CKCkKK3sKKyAgICByZXR1cm4gbm9ybWFsTWVtb3J5V2F0ZXJtYXJr OworfQorCitpbnQgTWVtb3J5VXNhZ2VTdXBwb3J0OjpoaWdoTWVtb3J5VXNhZ2VNQigpCit7Cisg ICAgcmV0dXJuIGhpZ2hNZW1vcnlXYXRlcm1hcms7Cit9CisKK2ludCBNZW1vcnlVc2FnZVN1cHBv cnQ6OmhpZ2hVc2FnZURlbHRhTUIoKQoreworICAgIHJldHVybiBoaWdoTWVtb3J5RGVsdGE7Cit9 CisKK2Jvb2wgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5U2l6ZXNJbkJ5dGVzKHNp emVfdCosIHNpemVfdCopCit7CisgICAgLy8gRklYTUU6IE5vdCBpbXBsZW1lbnRlZC4KKyAgICBy ZXR1cm4gZmFsc2U7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1BsYXRmb3JtU3VwcG9ydC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vcXQvUGxhdGZvcm1TdXBwb3J0LmgKaW5kZXggMGUxODhkYjhmOTQ0ZWMzYmUx OGI2ZDk2NDUzOTA3YzI5ZTJlZWMwNi4uZDBiZjE1NDlhZGY3ZDUyOTViODZjZDcxNDRmYmMzZmZl ZTZjYzEwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGxhdGZvcm1T dXBwb3J0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGxhdGZvcm1TdXBwb3J0 LmgKQEAgLTkyLDE0ICs5Miw2IEBAIHB1YmxpYzoKICAgICAvLyBQbHVnaW4KICAgICBzdGF0aWMg TlBPYmplY3QqIHBsdWdpblNjcmlwdGFibGVPYmplY3QoV2lkZ2V0Kik7CiAKLSAgICAvLyBJZiBt ZW1vcnkgdXNhZ2UgaXMgYmVsb3cgdGhpcyB0aHJlc2hvbGQsIGRvIG5vdCBib3RoZXIgZm9yY2lu ZyBHQy4KLSAgICBzdGF0aWMgaW50IGxvd01lbW9yeVVzYWdlTUIoKSB7IHJldHVybiAyNTY7IH0K LQotICAgIC8vIElmIG1lbW9yeSB1c2FnZSBpcyBhYm92ZSB0aGlzIHRocmVzaG9sZCwgZm9yY2Ug R0MgbW9yZSBhZ2dyZXNzaXZlbHkuCi0gICAgc3RhdGljIGludCBoaWdoTWVtb3J5VXNhZ2VNQigp IHsgcmV0dXJuIDEwMjQ7IH0KLQotICAgIC8vIERlbHRhIG9mIG1lbW9yeSB1c2FnZSBncm93dGgg KHZzLiBsYXN0IGFjdHVhbE1lbW9yeVVzYWdlTUIoKSkgdG8gZm9yY2UgR0Mgd2hlbiBtZW1vcnkg dXNhZ2UgaXMgaGlnaC4KLSAgICBzdGF0aWMgaW50IGhpZ2hVc2FnZURlbHRhTUIoKSB7IHJldHVy biAxMjg7IH0KIH07CiAKIH0K 151957 2012-07-12 08:12:00 -0700 2012-07-12 08:23:02 -0700 Patch bug-91094-20120712171203.patch text/plain 10575 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 ZWJkOWFhYzNjNzYyY2VkMWJiZWMxY2UyOTk5ZmZlMjRmM2UyYzk3Li5jZGI3ZWNiNzhhYzg1ODc2 YTlhZmRmMDZmNWUxYjVlMTAzNWM4YjJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMi0wNy0xMiAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVu c2VuQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEltcGxlbWVudCBNZW1vcnlVc2FnZVN1cHBv cnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMDk0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29tcGls ZSBpbiBNZW1vcnlTdGF0aXN0aWNzIHNvIHdlIGNhbiBtYWtlIHVzZSBvZiB0aGUgaW50ZXJmYWNl LgorCisgICAgICAgICogVGFyZ2V0LnByaToKKwogMjAxMi0wNy0xMiAgQ3NhYmEgT3N6dHJvZ29u w6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSBkZWFkIGNvZGUgYWZ0ZXIg cjEyMjM5Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNjkyMjQyZTg0NjJhNDI5NGNjODQ5MzEwZDIwY2U4N2Yx NmY2YmQwLi5iNTk1MzNhZTliMjJhNjQwMjhmZmE1NTA1NjlkMTFjOTE4N2U2MmZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTItMDctMTIgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAg PGFsbGFuLmplbnNlbkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBJbXBsZW1lbnQgTWVtb3J5 VXNhZ2VTdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MTA5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEltcGxlbWVudHMgUXQgdmVyc2lvbnMgb2YgdGhlIG1lbW9yeS11c2FnZSBmdW5jdGlvbnMg dXNpbmcgdGhlIGluZm9ybWF0aW9uIHdlIGhhdmUgYXZhaWxhYmxlCisgICAgICAgIGZyb20gdGhl IHZhcmlvdXMgbWVtb3J5IHN5c3RlbXMgdXNlZCBpbiBXZWJLaXQuCisKKyAgICAgICAgQWxzbyBn ZXRzIHJpZCBvZiBhIHJlZHVuZGFudCBpbmRpcmVjdGlvbiBpbiBWOEdDQ29udHJvbGxlci4KKwor ICAgICAgICAqIFRhcmdldC5wcmk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhHQ0NvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhHQ0NvbnRyb2xsZXI6OmdjRXBpbG9ndWUpOgor ICAgICAgICAoV2ViQ29yZTo6VjhHQ0NvbnRyb2xsZXI6OmNoZWNrTWVtb3J5VXNhZ2UpOgorICAg ICAgICAqIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5oOgorICAgICAgICAqIHBsYXRmb3Jt L3F0L01lbW9yeVVzYWdlU3VwcG9ydFF0LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpt YWxsb2NNZW1vcnlVc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjptZW1vcnlVc2FnZUtCKToKKyAg ICAgICAgKFdlYkNvcmU6OmFjdHVhbE1lbW9yeVVzYWdlS0IpOgorICAgICAgICAoV2ViQ29yZTo6 TWVtb3J5VXNhZ2VTdXBwb3J0OjptZW1vcnlVc2FnZU1CKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l bW9yeVVzYWdlU3VwcG9ydDo6YWN0dWFsTWVtb3J5VXNhZ2VNQik6CisgICAgICAgIChXZWJDb3Jl OjpNZW1vcnlVc2FnZVN1cHBvcnQ6Omxvd01lbW9yeVVzYWdlTUIpOgorICAgICAgICAoV2ViQ29y ZTo6TWVtb3J5VXNhZ2VTdXBwb3J0OjpoaWdoTWVtb3J5VXNhZ2VNQik6CisgICAgICAgIChXZWJD b3JlOjpNZW1vcnlVc2FnZVN1cHBvcnQ6OmhpZ2hVc2FnZURlbHRhTUIpOgorICAgICAgICAoV2Vi Q29yZTo6TWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5U2l6ZXNJbkJ5dGVzKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9xdC9QbGF0Zm9ybVN1cHBvcnQuaDoKKyAgICAgICAgKFBsYXRmb3Jt U3VwcG9ydCk6CisKIDIwMTItMDctMTIgIFhpbmduYW4gV2FuZyAgPHhpbmduYW4ud2FuZ0BpbnRl bC5jb20+CiAKICAgICAgICAgW0luZGV4ZWREQl0gdXBwZXJPcGVuIHNldCB0byB0cnVlIGluIGxv d2VyQm91bmQoKS9sb3dlck9wZW4gc2V0IHRvIHRydWUgaW4gdXBwZXJCb3VuZCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9UYXJnZXQucHJpCmluZGV4IDYzNTUwMzk4N2RmYTE4M2M4ZTU0MGFhMWQ0ODU1MGMzYTZk YTkwZjcuLmI2YzUyYTI4ZjkxYzM0MzI5MjJjZjlkY2M2MDBlM2Y1MDJhOWZhN2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9UYXJnZXQucHJpCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9UYXJnZXQucHJpCkBAIC0yMTgsNiArMjE4LDcgQEAgU09VUkNFUyArPSBcCiAgICAg cnVudGltZS9MaXRlcmFsUGFyc2VyLmNwcCBcCiAgICAgcnVudGltZS9Mb29rdXAuY3BwIFwKICAg ICBydW50aW1lL01hdGhPYmplY3QuY3BwIFwKKyAgICBydW50aW1lL01lbW9yeVN0YXRpc3RpY3Mu Y3BwIFwKICAgICBydW50aW1lL05hbWVDb25zdHJ1Y3Rvci5jcHAgXAogICAgIHJ1bnRpbWUvTmFt ZUluc3RhbmNlLmNwcCBcCiAgICAgcnVudGltZS9OYW1lUHJvdG90eXBlLmNwcCBcCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpIGIvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnBy aQppbmRleCAyYWVlYmZjMzY5ODE0NTEwYjc4NzkzNTYwMDdkNWQ3YTBkZGVhODgwLi5mYzQyYzEx YjVmODU2OWQ4MDhkODBjYWNlZmY2YmU3MmJlYjI0Nzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9UYXJnZXQucHJpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKQEAgLTExNjcs NyArMTE2Nyw3IEBAIFNPVVJDRVMgKz0gXAogICAgIHBsYXRmb3JtL0xpbmtIYXNoLmNwcCBcCiAg ICAgcGxhdGZvcm0vTG9nZ2luZy5jcHAgXAogICAgIHBsYXRmb3JtL01lbW9yeVByZXNzdXJlSGFu ZGxlci5jcHAgXAotICAgIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5jcHAgXAorICAgIHBs YXRmb3JtL3F0L01lbW9yeVVzYWdlU3VwcG9ydFF0LmNwcCBcCiAgICAgcGxhdGZvcm0vTUlNRVR5 cGVSZWdpc3RyeS5jcHAgXAogICAgIHBsYXRmb3JtL21vY2svRGV2aWNlTW90aW9uQ2xpZW50TW9j ay5jcHAgXAogICAgIHBsYXRmb3JtL21vY2svRGV2aWNlT3JpZW50YXRpb25DbGllbnRNb2NrLmNw cCBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29udHJvbGxl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29udHJvbGxlci5jcHAKaW5k ZXggOTkxZTg4YjVjNjZlZmJhYjhmMmQ5MTIwOTU2YjNmODRjNGQwODcxZC4uNTk0M2RjM2I1N2Y1 NGVkNzQ5M2FhYWYxY2YyZjAzYmFmZmU5YzdmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhHQ0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcApAQCAtNDc1LDIzICs0NzUsNiBAQCBpbnQgVjhHQ0Nv bnRyb2xsZXI6OndvcmtpbmdTZXRFc3RpbWF0ZU1CID0gMDsKIAogbmFtZXNwYWNlIHsKIAotaW50 IGdldE1lbW9yeVVzYWdlSW5NQigpCi17Ci0jaWYgUExBVEZPUk0oQ0hST01JVU0pCi0gICAgcmV0 dXJuIE1lbW9yeVVzYWdlU3VwcG9ydDo6bWVtb3J5VXNhZ2VNQigpOwotI2Vsc2UKLSAgICByZXR1 cm4gMDsKLSNlbmRpZgotfQotCi1pbnQgZ2V0QWN0dWFsTWVtb3J5VXNhZ2VJbk1CKCkKLXsKLSNp ZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICByZXR1cm4gTWVtb3J5VXNhZ2VTdXBwb3J0OjphY3R1 YWxNZW1vcnlVc2FnZU1CKCk7Ci0jZWxzZQotICAgIHJldHVybiAwOwotI2VuZGlmCi19CiAKIH0g IC8vIGFub255bW91cyBuYW1lc3BhY2UKIApAQCAtNTA2LDcgKzQ4OSw3IEBAIHZvaWQgVjhHQ0Nv bnRyb2xsZXI6OmdjRXBpbG9ndWUoKQogICAgIEdDRXBpbG9ndWVWaXNpdG9yPE5vZGUsIFNwZWNp YWxDYXNlRXBpbG9ndWVOb2RlSGFuZGxlciwgJkRPTURhdGFTdG9yZTo6d2Vha05vZGVDYWxsYmFj az4gZXBpbG9ndWVOb2RlVmlzaXRvcjsKICAgICB2aXNpdEFjdGl2ZURPTU5vZGVzKCZlcGlsb2d1 ZU5vZGVWaXNpdG9yKTsKIAotICAgIHdvcmtpbmdTZXRFc3RpbWF0ZU1CID0gZ2V0QWN0dWFsTWVt b3J5VXNhZ2VJbk1CKCk7CisgICAgd29ya2luZ1NldEVzdGltYXRlTUIgPSBNZW1vcnlVc2FnZVN1 cHBvcnQ6OmFjdHVhbE1lbW9yeVVzYWdlTUIoKTsKIAogI2lmbmRlZiBOREVCVUcKICAgICAvLyBD aGVjayBhbGwgc3Vydml2YWxzIGFyZSB3ZWFrLgpAQCAtNTMwLDcgKzUxMyw3IEBAIHZvaWQgVjhH Q0NvbnRyb2xsZXI6OmNoZWNrTWVtb3J5VXNhZ2UoKQogICAgIGNvbnN0IGludCBsb3dNZW1vcnlV c2FnZU1CID0gTWVtb3J5VXNhZ2VTdXBwb3J0Ojpsb3dNZW1vcnlVc2FnZU1CKCk7CiAgICAgY29u c3QgaW50IGhpZ2hNZW1vcnlVc2FnZU1CID0gTWVtb3J5VXNhZ2VTdXBwb3J0OjpoaWdoTWVtb3J5 VXNhZ2VNQigpOwogICAgIGNvbnN0IGludCBoaWdoVXNhZ2VEZWx0YU1CID0gTWVtb3J5VXNhZ2VT dXBwb3J0OjpoaWdoVXNhZ2VEZWx0YU1CKCk7Ci0gICAgaW50IG1lbW9yeVVzYWdlTUIgPSBnZXRN ZW1vcnlVc2FnZUluTUIoKTsKKyAgICBpbnQgbWVtb3J5VXNhZ2VNQiA9IE1lbW9yeVVzYWdlU3Vw cG9ydDo6bWVtb3J5VXNhZ2VNQigpOwogICAgIGlmICgobWVtb3J5VXNhZ2VNQiA+IGxvd01lbW9y eVVzYWdlTUIgJiYgbWVtb3J5VXNhZ2VNQiA+IDIgKiB3b3JraW5nU2V0RXN0aW1hdGVNQikgfHwg KG1lbW9yeVVzYWdlTUIgPiBoaWdoTWVtb3J5VXNhZ2VNQiAmJiBtZW1vcnlVc2FnZU1CID4gd29y a2luZ1NldEVzdGltYXRlTUIgKyBoaWdoVXNhZ2VEZWx0YU1CKSkKICAgICAgICAgdjg6OlY4OjpM b3dNZW1vcnlOb3RpZmljYXRpb24oKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9NZW1vcnlVc2FnZVN1cHBvcnQuaAppbmRleCA0ZjFhMGJkZDdkZGQ3YWJhMWRlNmU1ZGRhMDIy ODJlZWYyYzA2YTJmLi5kYzEyNzMyOTc4YmM5YjdiN2ViYjFmYzhmNzdlZGFiZTZlOGU0MmQzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuaApAQCAtMzMs NiArMzMsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKy8vIE1lbW9yeVVzYWdlU3VwcG9y dCBpcyBjdXJyZW50bHkgb25seSB1c2VkIGJ5IHRoZSBWOCBnYXJiYWdlIGNvbGxlY3Rvci4KIGNs YXNzIE1lbW9yeVVzYWdlU3VwcG9ydCB7CiBwdWJsaWM6CiAgICAgLy8gUmV0dXJucyB0aGUgY3Vy cmVudCBzcGFjZSBhbGxvY2F0ZWQgZm9yIHRoZSBwYWdlZmlsZSwgaW4gTUIuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9NZW1vcnlVc2FnZVN1cHBvcnRRdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9NZW1vcnlVc2FnZVN1cHBvcnRRdC5jcHAKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uMjVlMTFiNGE0MGMxNzMwZGUzMjdkOWMxN2Q3NTI2MjI5NzZhYjk1ZgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L01lbW9yeVVzYWdlU3VwcG9ydFF0 LmNwcApAQCAtMCwwICsxLDExNCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogICAgICAgICAgIChDKSAyMDEyIE5va2lhIENv cnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQorICogCisgKiBUaGlzIGxpYnJh cnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBt b2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGlj CisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9u OyBlaXRoZXIKKyAqIHZlcnNpb24gMi4xIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRp b24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRl ZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogYnV0IFdJVEhPVVQgQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAqIE1FUkNI QU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUg R05VCisgKiBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgor ICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMZXNzZXIg R2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2UgYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IGlmIG5v dCwgd3JpdGUgdG8gdGhlIEZyZWUgU29mdHdhcmUKKyAqIEZvdW5kYXRpb24sIEluYy4sIDUxIEZy YW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsIEJvc3RvbiwgTUEgIDAyMTEwLTEzMDEgIFVTQQor ICoKKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiTWVtb3J5VXNhZ2VTdXBw b3J0LmgiCisKKyNpbmNsdWRlICJKU0RPTVdpbmRvdy5oIgorI2luY2x1ZGUgPEphdmFTY3JpcHRD b3JlL01lbW9yeVN0YXRpc3RpY3MuaD4KKyNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgorCisj aWYgT1MoTElOVVgpCisjaW5jbHVkZSA8bWFsbG9jLmg+CisjZW5kaWYKKworbmFtZXNwYWNlIFdl YkNvcmUgeworCisjaWYgT1MoTElOVVgpCitzdGF0aWMgc2l6ZV90IG1hbGxvY01lbW9yeVVzYWdl KGJvb2wgaW51c2UpCit7CisgICAgLy8gUmV0dXJuIGhvdyBtdWNoIG1lbW9yeSAoaW4gYnl0ZXMp IGhhcyBiZWVuIGFsbG9jYXRlZCBvbiB0aGUgc3lzdGVtIGhlYXAuCisgICAgc3RydWN0IG1hbGxp bmZvIG1pbmZvID0gOjptYWxsaW5mbygpOworCisgICAgLy8gSWYgd2Ugd2FudCB0aGUgaW50ZXJu YWwgbWVtb3J5IHVzYWdlLCB3ZSBzdWJ0cmFjdCB0aGUgbWVtb3J5IHVzZWQgYnkKKyAgICAvLyBm cmVlIGJsb2Nrcy4gVGhhdCBpcyBtZW1vcnkgYWxsb2NhdGVkIGZyb20gdGhlIHN5c3RlbSBieSBt YWxsb2MgYnV0CisgICAgLy8gd2hpY2ggbWFsbG9jIGNvbnNpZGVycyBmcmVlLgorICAgIHJldHVy biBtaW5mby5hcmVuYSAtIChpbnVzZSA/IG1pbmZvLmZvcmRibGtzIDogMCk7Cit9CisjZWxzZQor c3RhdGljIHNpemVfdCBtYWxsb2NNZW1vcnlVc2FnZShib29sKQoreworICAgIC8vIEZJWE1FOiBJ bXBsZW1lbnQgZm9yIG90aGVyIHN1cHBvcnRlZCBPUydzLgorICAgIHJldHVybiAwOworfQorI2Vu ZGlmCisKKy8vIFRoaXMgaXMgaG93IG11Y2ggc3lzdGVtLW1lbW9yeSB3ZSB1c2UuCitzdGF0aWMg aW50IG1lbW9yeVVzYWdlS0IoKQoreworICAgIHNpemVfdCBtYWxsb2NVc2FnZSA9IG1hbGxvY01l bW9yeVVzYWdlKGZhbHNlKTsKKyAgICBXVEY6OkZhc3RNYWxsb2NTdGF0aXN0aWNzIGZtU3RhdHMg PSBXVEY6OmZhc3RNYWxsb2NTdGF0aXN0aWNzKCk7CisKKyAgICAvLyBFeHRyYWN0IG1lbW9yeSBz dGF0aXN0aWNzIGZyb20gSmF2YVNjcmlwdENvcmU6CisgICAgSlNDOjpHbG9iYWxNZW1vcnlTdGF0 aXN0aWNzIGpzY1N0YXRzID0gSlNDOjpnbG9iYWxNZW1vcnlTdGF0aXN0aWNzKCk7CisgICAgc2l6 ZV90IGpzY0hlYXBVc2FnZSA9IEpTRE9NV2luZG93Ojpjb21tb25KU0dsb2JhbERhdGEoKS0+aGVh cC5jYXBhY2l0eSgpOworICAgIHJldHVybiAobWFsbG9jVXNhZ2UgKyBmbVN0YXRzLmNvbW1pdHRl ZFZNQnl0ZXMgKyBqc2NTdGF0cy5zdGFja0J5dGVzICsganNjU3RhdHMuSklUQnl0ZXMgKyBqc2NI ZWFwVXNhZ2UpID4+IDEwOworfQorCisvLyBUaGlzIGlzIGhvdyBtdWNoIG1lbW9yeSB3ZSB1c2Ug aW50ZXJuYWxseSwgbm90IGluY2x1ZGluZyBtZW1vcnkgb25seSByZXNlcnZlZCBmcm9tIHRoZSBz eXN0ZW0uCitzdGF0aWMgaW50IGFjdHVhbE1lbW9yeVVzYWdlS0IoKQoreworICAgIHNpemVfdCBt YWxsb2NVc2FnZSA9IG1hbGxvY01lbW9yeVVzYWdlKHRydWUpOworICAgIFdURjo6RmFzdE1hbGxv Y1N0YXRpc3RpY3MgZm1TdGF0cyA9IFdURjo6ZmFzdE1hbGxvY1N0YXRpc3RpY3MoKTsKKworICAg IC8vIEV4dHJhY3QgbWVtb3J5IHN0YXRpc3RpY3MgZnJvbSBKYXZhU2NyaXB0Q29yZToKKyAgICBK U0M6Okdsb2JhbE1lbW9yeVN0YXRpc3RpY3MganNjU3RhdHMgPSBKU0M6Omdsb2JhbE1lbW9yeVN0 YXRpc3RpY3MoKTsKKyAgICBzaXplX3QganNjSGVhcFVzYWdlID0gSlNET01XaW5kb3c6OmNvbW1v bkpTR2xvYmFsRGF0YSgpLT5oZWFwLnNpemUoKTsKKyAgICByZXR1cm4gKG1hbGxvY1VzYWdlICsg Zm1TdGF0cy5jb21taXR0ZWRWTUJ5dGVzIC0gZm1TdGF0cy5mcmVlTGlzdEJ5dGVzICsganNjU3Rh dHMuc3RhY2tCeXRlcyArIGpzY1N0YXRzLkpJVEJ5dGVzICsganNjSGVhcFVzYWdlKSA+PiAxMDsK K30KKworaW50IE1lbW9yeVVzYWdlU3VwcG9ydDo6bWVtb3J5VXNhZ2VNQigpCit7CisgICAgcmV0 dXJuIG1lbW9yeVVzYWdlS0IoKSA+PiAxMDsKK30KKworaW50IE1lbW9yeVVzYWdlU3VwcG9ydDo6 YWN0dWFsTWVtb3J5VXNhZ2VNQigpCit7CisgICAgcmV0dXJuIGFjdHVhbE1lbW9yeVVzYWdlS0Io KSA+PiAxMDsKK30KKworLy8gRklYTUU6IFRoZXNlIHZhbHVlcyBzaG91bGQgYmUgZGV0ZXJtaW5l ZCBiYXNlZCBvbiBoYXJkd2FyZSBvciBzZXQgYnkgdGhlIGFwcGxpY2F0aW9uLgorCitzdGF0aWMg Y29uc3QgdW5zaWduZWQgbm9ybWFsTWVtb3J5V2F0ZXJtYXJrID0gMTI4OyAvLyBDaHJvbWl1bSBk ZWZhdWx0OiAyNTYKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBoaWdoTWVtb3J5V2F0ZXJtYXJrID0g MjU2OyAvLyBDaHJvbWl1bSBkZWZhdWx0OiAxMDI0CitzdGF0aWMgY29uc3QgdW5zaWduZWQgaGln aE1lbW9yeURlbHRhID0gNjQ7IC8vIENocm9taXVtIGRlZmF1bHQ6IDEyOAorCitpbnQgTWVtb3J5 VXNhZ2VTdXBwb3J0Ojpsb3dNZW1vcnlVc2FnZU1CKCkKK3sKKyAgICByZXR1cm4gbm9ybWFsTWVt b3J5V2F0ZXJtYXJrOworfQorCitpbnQgTWVtb3J5VXNhZ2VTdXBwb3J0OjpoaWdoTWVtb3J5VXNh Z2VNQigpCit7CisgICAgcmV0dXJuIGhpZ2hNZW1vcnlXYXRlcm1hcms7Cit9CisKK2ludCBNZW1v cnlVc2FnZVN1cHBvcnQ6OmhpZ2hVc2FnZURlbHRhTUIoKQoreworICAgIHJldHVybiBoaWdoTWVt b3J5RGVsdGE7Cit9CisKK2Jvb2wgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5U2l6 ZXNJbkJ5dGVzKHNpemVfdCosIHNpemVfdCopCit7CisgICAgLy8gRklYTUU6IE5vdCBpbXBsZW1l bnRlZC4KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1BsYXRmb3JtU3VwcG9ydC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGxhdGZvcm1TdXBwb3J0LmgKaW5kZXggMGUxODhk YjhmOTQ0ZWMzYmUxOGI2ZDk2NDUzOTA3YzI5ZTJlZWMwNi4uZDBiZjE1NDlhZGY3ZDUyOTViODZj ZDcxNDRmYmMzZmZlZTZjYzEwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v cXQvUGxhdGZvcm1TdXBwb3J0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGxh dGZvcm1TdXBwb3J0LmgKQEAgLTkyLDE0ICs5Miw2IEBAIHB1YmxpYzoKICAgICAvLyBQbHVnaW4K ICAgICBzdGF0aWMgTlBPYmplY3QqIHBsdWdpblNjcmlwdGFibGVPYmplY3QoV2lkZ2V0Kik7CiAK LSAgICAvLyBJZiBtZW1vcnkgdXNhZ2UgaXMgYmVsb3cgdGhpcyB0aHJlc2hvbGQsIGRvIG5vdCBi b3RoZXIgZm9yY2luZyBHQy4KLSAgICBzdGF0aWMgaW50IGxvd01lbW9yeVVzYWdlTUIoKSB7IHJl dHVybiAyNTY7IH0KLQotICAgIC8vIElmIG1lbW9yeSB1c2FnZSBpcyBhYm92ZSB0aGlzIHRocmVz aG9sZCwgZm9yY2UgR0MgbW9yZSBhZ2dyZXNzaXZlbHkuCi0gICAgc3RhdGljIGludCBoaWdoTWVt b3J5VXNhZ2VNQigpIHsgcmV0dXJuIDEwMjQ7IH0KLQotICAgIC8vIERlbHRhIG9mIG1lbW9yeSB1 c2FnZSBncm93dGggKHZzLiBsYXN0IGFjdHVhbE1lbW9yeVVzYWdlTUIoKSkgdG8gZm9yY2UgR0Mg d2hlbiBtZW1vcnkgdXNhZ2UgaXMgaGlnaC4KLSAgICBzdGF0aWMgaW50IGhpZ2hVc2FnZURlbHRh TUIoKSB7IHJldHVybiAxMjg7IH0KIH07CiAKIH0K