104971 2012-12-13 16:02:42 -0800 Use 'perf' to profile on linux instead of google-pprof by default 2012-12-17 16:32:17 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric eric abarth dpranke pdr tony webkit.review.bot willchan oldest_to_newest 791055 0 eric 2012-12-13 16:02:42 -0800 Use 'perf' to profile on linux instead of google-pprof by default 791058 1 179364 eric 2012-12-13 16:07:52 -0800 Created attachment 179364 Patch 791104 2 179364 dpranke 2012-12-13 16:41:05 -0800 Comment on attachment 179364 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179364&action=review > Tools/Scripts/webkitpy/common/system/executive.py:313 > + while seconds_left > 0: this could be just 'while seconds_left > 0 and self.check_running_pid(pid):' > Tools/Scripts/webkitpy/common/system/profiler.py:104 > + self._target_pid = None Given that you're passing the pids to the executive, this isn't a target_pid, this is either a host_pid or just a pid (I'd use just a pid) 791109 3 179364 eric 2012-12-13 16:43:40 -0800 Comment on attachment 179364 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179364&action=review >> Tools/Scripts/webkitpy/common/system/executive.py:313 >> + while seconds_left > 0: > > this could be just 'while seconds_left > 0 and self.check_running_pid(pid):' Yes, sorry, this was more complicated originally. Will fix. >> Tools/Scripts/webkitpy/common/system/profiler.py:104 >> + self._target_pid = None > > Given that you're passing the pids to the executive, this isn't a target_pid, this is either a host_pid or just a pid (I'd use just a pid) Oh, I was trying to differentiate it from the perf pid. I'm open to other names. I wasn't trying to make the host/target distinction, but I can see how that's confusing here. Suggestions? 791218 4 eric 2012-12-13 18:43:44 -0800 updated. Works: %run-perf-tests --chromium --profile [/src/WebKit] Running 113 tests Running Animation/balls.html (1 of 113) WARNING: Kernel address maps (/proc/{kallsyms,modules}) are restricted, check /proc/sys/kernel/kptr_restrict. Samples in kernel functions may not be resolved if a suitable vmlinux file is not found in the buildid cache or in the vmlinux path. Samples in kernel modules won't be resolved at all. If some relocation was applied (e.g. kexec) symbols may be misresolved even with a suitable vmlinux or kallsyms file. Finished: 3.059183 s [ perf record: Woken up 3 times to write data ] [ perf record: Captured and wrote 0.661 MB /src/WebKit/Source/WebKit/chromium/webkit/Release/layout-test-results/test-41.data (~28895 samples) ] perf report -g none -i /src/WebKit/Source/WebKit/chromium/webkit/Release/layout-test-results/test-41.data 5.04% DumpRenderTree perf-6532.map [.] 0x29bc5a44b1e7 2.19% DumpRenderTree DumpRenderTree [.] v8::internal::FastDtoa(double, v8::internal::FastDtoaMode, int, v8::internal::Vector<char>, int*, int*) 2.18% DumpRenderTree DumpRenderTree [.] WebCore::Length::initFromLength(WebCore::Length const&) 1.95% DumpRenderTree libfreetype.so.6.8.0 [.] 0x248db 1.64% DumpRenderTree DumpRenderTree [.] tc_free 1.64% DumpRenderTree DumpRenderTree [.] WebCore::RenderStyle::diff(WebCore::RenderStyle const*, unsigned int&) const 1.47% DumpRenderTree [kernel.kallsyms] [k] 0xffffffff8103b51a 1.46% DumpRenderTree DumpRenderTree [.] tc_malloc 1.28% DumpRenderTree DumpRenderTree [.] v8::internal::JSObject::SetPropertyWithInterceptor(v8::internal::String*, v8::internal::Object*, PropertyAttributes, v8::internal::StrictModeFlag) 1.26% DumpRenderTree DumpRenderTree [.] WebCore::RenderStyle::create() To view the full profile, run: perf report -i /src/WebKit/Source/WebKit/chromium/webkit/Release/layout-test-results/test-41.data 791219 5 179399 eric 2012-12-13 18:44:20 -0800 Created attachment 179399 Patch 791280 6 179399 webkit.review.bot 2012-12-13 20:31:22 -0800 Comment on attachment 179399 Patch Clearing flags on attachment: 179399 Committed r137706: <http://trac.webkit.org/changeset/137706> 791281 7 webkit.review.bot 2012-12-13 20:31:25 -0800 All reviewed patches have been landed. Closing bug. 791294 8 eric 2012-12-13 20:54:47 -0800 This caused a test-webkitpy failure, but I fixed in http://trac.webkit.org/changeset/137711 793148 9 eric 2012-12-17 16:32:17 -0800 *** Bug 104609 has been marked as a duplicate of this bug. *** 179364 2012-12-13 16:07:52 -0800 2012-12-13 18:44:18 -0800 Patch bug-104971-20121213160512.patch text/plain 6728 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NjUyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWVjNDczZGNkNjU1OTFmYmYzZmRiNDk3YWFiZmI3MTFm ZjZhOTdmYy4uNmM4NzNhOTZmMTc1ZmY3YmQ2OWI2NzJjZjE5MTUzZTFkMDYyZTU1ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3 IEBACiAyMDEyLTEyLTEzICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAorICAgICAg ICBVc2UgJ3BlcmYnIHRvIHByb2ZpbGUgb24gbGludXggaW5zdGVhZCBvZiBnb29nbGUtcHByb2Yg YnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA0OTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBtYWtlcyBDaHJvbWl1bSBMaW51eCBtYXRjaCBDaHJvbWl1bSBBbmRyb2lkIGFuZCB1 c2UgdGhlIHBlcmYKKyAgICAgICAgdG9vbCBieSBkZWZhdWx0LiAgT25jZSBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0ODkxCisgICAgICAgIGxhbmRzIGl0IHdpbGwg YmUgcG9zc2libGUgdG8gdXNlIHBwcm9mIGFnYWluIG9uIExpbnV4LgorCisgICAgICAgIFRoaXMg aXMgc2xpZ2h0bHkgbW9yZSBhZHZhbmNlZCB0aGFuIHRoZSBBbmRyb2lkUGVyZiBwcm9maWxlciBh cworICAgICAgICBpbnN0ZWFkIG9mIHVzaW5nIGEgdGltZW91dCBvbiAicGVyZiByZWNvcmQiIEkg aW5zdGVhZCB3YXRjaAorICAgICAgICBmb3IgdGhlIHRlcm1pbmF0aW9uIG9mIHRoZSB0YXJnZXQg cHJvY2VzcyBhbmQgdGhlbiBjb250cm9sLUMKKyAgICAgICAgdGhlICdwZXJmIHJlY29yZCcgcHJv Y2Vzcy4gIFRoaXMgcmVxdWlyZWQgbWUgdG8gYWRkIHR3byBuZXcKKyAgICAgICAgbWV0aG9kcyB0 byBFeGVjdXRpdmUsIG9uZSB0byBoYXZlIGEgbGltaXRlZC10aW1lIHdhaXQoKSBhbmQKKyAgICAg ICAgdGhlIHNlY29uZCB0byBiZSBhYmxlIHRvIHNlbmQgYSBjb250cm9sLUMuICBJIGNob3NlIHRv IGFkZAorICAgICAgICB0aGVzZSB0byBFeGVjdXRpdmUgdG8gbWFrZSB0aGVtIGVhc2llciB0byBt b2NrL2ZpeC1mb3Itd2luMzIKKyAgICAgICAgYXQgYSBsYXRlciB0aW1lIGlmIG5lZWRlZC4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHk6Cisg ICAgICAgIChFeGVjdXRpdmUud2FpdF9saW1pdGVkKToKKyAgICAgICAgKEV4ZWN1dGl2ZS5pbnRl cnJ1cHQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wcm9maWxl ci5weToKKyAgICAgICAgKFByb2ZpbGVyRmFjdG9yeS5jcmVhdGVfcHJvZmlsZXIpOgorICAgICAg ICAoUGVyZik6CisgICAgICAgIChQZXJmLl9faW5pdF9fKToKKyAgICAgICAgKFBlcmYuX3BlcmZf cGF0aCk6CisgICAgICAgIChQZXJmLmF0dGFjaF90b19waWQpOgorICAgICAgICAoUGVyZi5fZmly c3RfdGVuX2xpbmVzX29mX3Byb2ZpbGUpOgorICAgICAgICAoUGVyZi5wcm9maWxlX2FmdGVyX2V4 aXQpOgorCisyMDEyLTEyLTEzICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAg ICAgICBNYWtlIC0tcHJvZmlsZSBvdXRwdXQgZWFzaWVyIHRvIHVuZGVyc3RhbmQgZm9yIHBwcm9m IG9uIGxpbnV4CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDQ5NTcKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL2V4ZWN1dGl2ZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9l eGVjdXRpdmUucHkKaW5kZXggNDJhODEyMmQzNmUwZWU0ODA0NjQxOGE5YWNkYTExOTI0ODA1MzAx Ny4uYWY1OWIzMjU1YjNlNDgxMTk2MDFlMjQ5OTFhZTkzZTBlZDljMmE5OCAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CkBAIC0zMDcs NiArMzA3LDE1IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICB3aGlsZSBzZWxm LmNoZWNrX3J1bm5pbmdfcGlkKHBpZCk6CiAgICAgICAgICAgICB0aW1lLnNsZWVwKDAuMjUpCiAK KyAgICBkZWYgd2FpdF9saW1pdGVkKHNlbGYsIHBpZCwgbGltaXRfaW5fc2Vjb25kcz1Ob25lLCBj aGVja19mcmVxdWVuY3lfaW5fc2Vjb25kcz1Ob25lKToKKyAgICAgICAgc2Vjb25kc19sZWZ0ID0g bGltaXRfaW5fc2Vjb25kcyBvciAxMAorICAgICAgICBzbGVlcF9sZW5ndGggPSBjaGVja19mcmVx dWVuY3lfaW5fc2Vjb25kcyBvciAxCisgICAgICAgIHdoaWxlIHNlY29uZHNfbGVmdCA+IDA6Cisg ICAgICAgICAgICBpZiBub3Qgc2VsZi5jaGVja19ydW5uaW5nX3BpZChwaWQpOgorICAgICAgICAg ICAgICAgIGJyZWFrCisgICAgICAgICAgICBzZWNvbmRzX2xlZnQgLT0gc2xlZXBfbGVuZ3RoCisg ICAgICAgICAgICB0aW1lLnNsZWVwKHNsZWVwX2xlbmd0aCkKKwogICAgIGRlZiBfd2luZG93c19p bWFnZV9uYW1lKHNlbGYsIHByb2Nlc3NfbmFtZSk6CiAgICAgICAgIG5hbWUsIGV4dGVuc2lvbiA9 IG9zLnBhdGguc3BsaXRleHQocHJvY2Vzc19uYW1lKQogICAgICAgICBpZiBub3QgZXh0ZW5zaW9u OgpAQCAtMzE1LDYgKzMyNCwxNyBAQCBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKICAgICAgICAg ICAgIHByb2Nlc3NfbmFtZSA9ICIlcy5leGUiICUgbmFtZQogICAgICAgICByZXR1cm4gcHJvY2Vz c19uYW1lCiAKKyAgICBkZWYgaW50ZXJydXB0KHNlbGYsIHBpZCk6CisgICAgICAgIGludGVycnVw dF9zaWduYWwgPSBzaWduYWwuU0lHSU5UCisgICAgICAgICMgRklYTUU6IFRoZSBweXRob24gZG9j cyBzZWVtIHRvIGltcGx5IHRoYXQgcGxhdGZvcm0gPT0gJ3dpbjMyJyBtYXkgbmVlZCB0byB1c2Ug c2lnbmFsLkNUUkxfQ19FVkVOVAorICAgICAgICAjIGh0dHA6Ly9kb2NzLnB5dGhvbi5vcmcvMi9s aWJyYXJ5L3NpZ25hbC5odG1sCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIG9zLmtpbGwocGlk LCBpbnRlcnJ1cHRfc2lnbmFsKQorICAgICAgICBleGNlcHQgT1NFcnJvcjoKKyAgICAgICAgICAg ICMgU2lsZW50bHkgaWdub3JlIHdoZW4gdGhlIHBpZCBkb2Vzbid0IGV4aXN0LgorICAgICAgICAg ICAgIyBJdCdzIGltcG9zc2libGUgZm9yIGNhbGxlcnMgdG8gYXZvaWQgcmFjZSBjb25kaXRpb25z IHdpdGggcHJvY2VzcyBzaHV0ZG93bi4KKyAgICAgICAgICAgIHBhc3MKKwogICAgIGRlZiBraWxs X2FsbChzZWxmLCBwcm9jZXNzX25hbWUpOgogICAgICAgICAiIiJBdHRlbXB0cyB0byBraWxsIHBy b2Nlc3NlcyBtYXRjaGluZyBwcm9jZXNzX25hbWUuCiAgICAgICAgIFdpbGwgZmFpbCBzaWxlbnRs eSBpZiBubyBwcm9jZXNzIGFyZSBmb3VuZC4iIiIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wcm9maWxlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3N5c3RlbS9wcm9maWxlci5weQppbmRleCBlNDQ1MmQyMmVjM2Q3ZGE3NzdiNmIy NzRkZDZkMTcyMjNiNjRjY2EzLi4wYjg3ZDY3MWM0MTY5NzY0ZWEwMjcwNTZlMjFmYjJjMjFlOWEz ODEzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcHJv ZmlsZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Byb2Zp bGVyLnB5CkBAIC0zNyw3ICszNyw3IEBAIGNsYXNzIFByb2ZpbGVyRmFjdG9yeShvYmplY3QpOgog ICAgIGRlZiBjcmVhdGVfcHJvZmlsZXIoY2xzLCBob3N0LCBleGVjdXRhYmxlX3BhdGgsIG91dHB1 dF9kaXIsIGlkZW50aWZpZXI9Tm9uZSk6CiAgICAgICAgIGlmIGhvc3QucGxhdGZvcm0uaXNfbWFj KCk6CiAgICAgICAgICAgICByZXR1cm4gSVByb2ZpbGVyKGhvc3QsIGV4ZWN1dGFibGVfcGF0aCwg b3V0cHV0X2RpciwgaWRlbnRpZmllcikKLSAgICAgICAgcmV0dXJuIEdvb2dsZVBQcm9mKGhvc3Qs IGV4ZWN1dGFibGVfcGF0aCwgb3V0cHV0X2RpciwgaWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJu IFBlcmYoaG9zdCwgZXhlY3V0YWJsZV9wYXRoLCBvdXRwdXRfZGlyLCBpZGVudGlmaWVyKQogCiAK IGNsYXNzIFByb2ZpbGVyKG9iamVjdCk6CkBAIC05Nyw2ICs5Nyw0OSBAQCBjbGFzcyBHb29nbGVQ UHJvZihTaW5nbGVGaWxlT3V0cHV0UHJvZmlsZXIpOgogICAgICAgICBwcmludCAnICcuam9pbihb c2VsZi5fcHByb2ZfcGF0aCgpLCBzZWxmLl9leGVjdXRhYmxlX3BhdGgsIHNlbGYuX291dHB1dF9w YXRoXSkKIAogCitjbGFzcyBQZXJmKFNpbmdsZUZpbGVPdXRwdXRQcm9maWxlcik6CisgICAgZGVm IF9faW5pdF9fKHNlbGYsIGhvc3QsIGV4ZWN1dGFibGVfcGF0aCwgb3V0cHV0X2RpciwgaWRlbnRp Zmllcj1Ob25lKToKKyAgICAgICAgc3VwZXIoUGVyZiwgc2VsZikuX19pbml0X18oaG9zdCwgZXhl Y3V0YWJsZV9wYXRoLCBvdXRwdXRfZGlyLCAiZGF0YSIsIGlkZW50aWZpZXIpCisgICAgICAgIHNl bGYuX3BlcmZfcHJvY2VzcyA9IE5vbmUKKyAgICAgICAgc2VsZi5fdGFyZ2V0X3BpZCA9IE5vbmUK KworICAgIGRlZiBfcGVyZl9wYXRoKHNlbGYpOgorICAgICAgICAjIEZJWE1FOiBXZSBtYXkgbmVl ZCB0byBzdXBwb3J0IGZpbmRpbmcgdGhlIHBlcmYgYmluYXJ5IGluIG90aGVyIGxvY2F0aW9ucy4K KyAgICAgICAgcmV0dXJuICdwZXJmJworCisgICAgZGVmIGF0dGFjaF90b19waWQoc2VsZiwgcGlk KToKKyAgICAgICAgYXNzZXJ0KG5vdCBzZWxmLl9wZXJmX3Byb2Nlc3MgYW5kIG5vdCBzZWxmLl90 YXJnZXRfcGlkKQorICAgICAgICBzZWxmLl90YXJnZXRfcGlkID0gcGlkCisgICAgICAgIGNtZCA9 IFtzZWxmLl9wZXJmX3BhdGgoKSwgInJlY29yZCIsICItZyIsICItcCIsIHBpZCwgIi1vIiwgc2Vs Zi5fb3V0cHV0X3BhdGhdCisgICAgICAgIGNtZCA9IG1hcCh1bmljb2RlLCBjbWQpCisgICAgICAg IHNlbGYuX3BlcmZfcHJvY2VzcyA9IHNlbGYuX2hvc3QuZXhlY3V0aXZlLnBvcGVuKGNtZCkKKwor ICAgIGRlZiBfZmlyc3RfdGVuX2xpbmVzX29mX3Byb2ZpbGUoc2VsZiwgcGVyZl9vdXRwdXQpOgor ICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiXiNbXlxuXSpcbigoPzogW15cbl0qXG4pezEsMTB9 KSIsIHBlcmZfb3V0cHV0LCByZS5NVUxUSUxJTkUpCisgICAgICAgIHJldHVybiBtYXRjaC5ncm91 cCgxKSBpZiBtYXRjaCBlbHNlIE5vbmUKKworICAgIGRlZiBwcm9maWxlX2FmdGVyX2V4aXQoc2Vs Zik6CisgICAgICAgICMgUGVyZiBkb2Vzbid0IGF1dG9tYXRpY2FsbHkgd2F0Y2ggdGhlIGF0dGFj aGVkIHBpZCBmb3IgZGVhdGggbm90aWZpY2F0aW9ucywKKyAgICAgICAgIyBzbyB3ZSBoYXZlIHRv IGRvIGl0IGZvciBpdCwgYW5kIHRoZW4gdGVsbCBpdCBpdHMgdGltZSB0byBzdG9wIHNhbXBsaW5n LiA6KAorICAgICAgICBzZWxmLl9ob3N0LmV4ZWN1dGl2ZS53YWl0X2xpbWl0ZWQoc2VsZi5fdGFy Z2V0X3BpZCwgbGltaXRfaW5fc2Vjb25kcz0xMCkKKyAgICAgICAgcGVyZl9leGl0Y29kZSA9IHNl bGYuX3BlcmZfcHJvY2Vzcy5wb2xsKCkKKyAgICAgICAgaWYgcGVyZl9leGl0Y29kZSBpcyBOb25l OiAgIyBUaGlzIHNob3VsZCBhbHdheXMgYmUgdGhlIGNhc2UsIHVubGVzcyBwZXJmIGVycm9yJ2Qg b3V0IGVhcmx5LgorICAgICAgICAgICAgc2VsZi5faG9zdC5leGVjdXRpdmUuaW50ZXJydXB0KHNl bGYuX3BlcmZfcHJvY2Vzcy5waWQpCisKKyAgICAgICAgcGVyZl9leGl0Y29kZSA9IHNlbGYuX3Bl cmZfcHJvY2Vzcy53YWl0KCkKKyAgICAgICAgaWYgcGVyZl9leGl0Y29kZSBub3QgaW4gKDAsIC0y KTogICMgVGhlIGV4aXQgY29kZSBzaG91bGQgYWx3YXlzIGJlIC0yLCBhcyB3ZSdyZSBhbHdheXMg aW50ZXJydXB0aW5nIHBlcmYuCisgICAgICAgICAgICBwcmludCAiJ3BlcmYgcmVjb3JkJyBmYWls ZWQgKGV4aXQgY29kZTogJWkpLCBjYW4ndCBwcm9jZXNzIHJlc3VsdHM6IiAlIHBlcmZfZXhpdGNv ZGUKKyAgICAgICAgICAgIHJldHVybgorCisgICAgICAgIHBlcmZfYXJncyA9IFtzZWxmLl9wZXJm X3BhdGgoKSwgJ3JlcG9ydCcsICctZycsICdub25lJywgJy1pJywgc2VsZi5fb3V0cHV0X3BhdGhd CisgICAgICAgIHByaW50ICIgIi5qb2luKHBlcmZfYXJncykKKyAgICAgICAgcGVyZl9vdXRwdXQg PSBzZWxmLl9ob3N0LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChwZXJmX2FyZ3MpCisgICAgICAgIHBy aW50IHNlbGYuX2ZpcnN0X3Rlbl9saW5lc19vZl9wcm9maWxlKHBlcmZfb3V0cHV0KQorCisgICAg ICAgIHByaW50ICJUbyB2aWV3IHRoZSBmdWxsIHByb2ZpbGUsIHJ1bjoiCisgICAgICAgIHByaW50 ICcgJy5qb2luKFtzZWxmLl9wZXJmX3BhdGgoKSwgJ3JlcG9ydCcsICctaScsIHNlbGYuX291dHB1 dF9wYXRoXSkKKworCiBjbGFzcyBJUHJvZmlsZXIoU2luZ2xlRmlsZU91dHB1dFByb2ZpbGVyKToK ICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgZXhlY3V0YWJsZV9wYXRoLCBvdXRwdXRfZGly LCBpZGVudGlmaWVyPU5vbmUpOgogICAgICAgICBzdXBlcihJUHJvZmlsZXIsIHNlbGYpLl9faW5p dF9fKGhvc3QsIGV4ZWN1dGFibGVfcGF0aCwgb3V0cHV0X2RpciwgImR0cHMiLCBpZGVudGlmaWVy KQo= 179399 2012-12-13 18:44:20 -0800 2012-12-13 20:31:22 -0800 Patch bug-104971-20121213184140.patch text/plain 6660 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3Njk1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjBjMTEzOTJiYzlmZGQwZmNmNDU1MWQ1NDhkMDNlY2Yy NTIyM2E5Yy4uYmNmNmU4OTY0ZDExMTE4NWVkMmZiZWJlY2RhOTIyYzE5NWUwZjJmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1 IEBACisyMDEyLTEyLTEzICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAg ICBVc2UgJ3BlcmYnIHRvIHByb2ZpbGUgb24gbGludXggaW5zdGVhZCBvZiBnb29nbGUtcHByb2Yg YnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA0OTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBtYWtlcyBDaHJvbWl1bSBMaW51eCBtYXRjaCBDaHJvbWl1bSBBbmRyb2lkIGFuZCB1 c2UgdGhlIHBlcmYKKyAgICAgICAgdG9vbCBieSBkZWZhdWx0LiAgT25jZSBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0ODkxCisgICAgICAgIGxhbmRzIGl0IHdpbGwg YmUgcG9zc2libGUgdG8gdXNlIHBwcm9mIGFnYWluIG9uIExpbnV4LgorCisgICAgICAgIFRoaXMg aXMgc2xpZ2h0bHkgbW9yZSBhZHZhbmNlZCB0aGFuIHRoZSBBbmRyb2lkUGVyZiBwcm9maWxlciBh cworICAgICAgICBpbnN0ZWFkIG9mIHVzaW5nIGEgdGltZW91dCBvbiAicGVyZiByZWNvcmQiIEkg aW5zdGVhZCB3YXRjaAorICAgICAgICBmb3IgdGhlIHRlcm1pbmF0aW9uIG9mIHRoZSB0YXJnZXQg cHJvY2VzcyBhbmQgdGhlbiBjb250cm9sLUMKKyAgICAgICAgdGhlICdwZXJmIHJlY29yZCcgcHJv Y2Vzcy4gIFRoaXMgcmVxdWlyZWQgbWUgdG8gYWRkIHR3byBuZXcKKyAgICAgICAgbWV0aG9kcyB0 byBFeGVjdXRpdmUsIG9uZSB0byBoYXZlIGEgbGltaXRlZC10aW1lIHdhaXQoKSBhbmQKKyAgICAg ICAgdGhlIHNlY29uZCB0byBiZSBhYmxlIHRvIHNlbmQgYSBjb250cm9sLUMuICBJIGNob3NlIHRv IGFkZAorICAgICAgICB0aGVzZSB0byBFeGVjdXRpdmUgdG8gbWFrZSB0aGVtIGVhc2llciB0byBt b2NrL2ZpeC1mb3Itd2luMzIKKyAgICAgICAgYXQgYSBsYXRlciB0aW1lIGlmIG5lZWRlZC4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHk6Cisg ICAgICAgIChFeGVjdXRpdmUud2FpdF9saW1pdGVkKToKKyAgICAgICAgKEV4ZWN1dGl2ZS5pbnRl cnJ1cHQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wcm9maWxl ci5weToKKyAgICAgICAgKFByb2ZpbGVyRmFjdG9yeS5jcmVhdGVfcHJvZmlsZXIpOgorICAgICAg ICAoUGVyZik6CisgICAgICAgIChQZXJmLl9faW5pdF9fKToKKyAgICAgICAgKFBlcmYuX3BlcmZf cGF0aCk6CisgICAgICAgIChQZXJmLmF0dGFjaF90b19waWQpOgorICAgICAgICAoUGVyZi5fZmly c3RfdGVuX2xpbmVzX29mX3Byb2ZpbGUpOgorICAgICAgICAoUGVyZi5wcm9maWxlX2FmdGVyX2V4 aXQpOgorCiAyMDEyLTEyLTEzICBKdWxpZSBQYXJlbnQgIDxqcGFyZW50QGNocm9taXVtLm9yZz4K IAogICAgICAgICBEYXNoYm9hcmQgY2xlYW51cDogcmVtb3ZlIHVzYWdlIG9mIGdsb2JhbCBnX2J1 aWxkZXJzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVt L2V4ZWN1dGl2ZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVj dXRpdmUucHkKaW5kZXggY2NlYWNiZTRhYmY4MDM4OWFlMTJkYjg3ZjIxNWRhMmEzMjRhNjYwMy4u YTkzYWI3MDYzMjhhZTlmMzg5NjQyOWJiZTAwYjFjZTBjNmJlMzY1NSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CkBAIC0zMDQsNiAr MzA0LDEzIEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICB3aGlsZSBzZWxmLmNo ZWNrX3J1bm5pbmdfcGlkKHBpZCk6CiAgICAgICAgICAgICB0aW1lLnNsZWVwKDAuMjUpCiAKKyAg ICBkZWYgd2FpdF9saW1pdGVkKHNlbGYsIHBpZCwgbGltaXRfaW5fc2Vjb25kcz1Ob25lLCBjaGVj a19mcmVxdWVuY3lfaW5fc2Vjb25kcz1Ob25lKToKKyAgICAgICAgc2Vjb25kc19sZWZ0ID0gbGlt aXRfaW5fc2Vjb25kcyBvciAxMAorICAgICAgICBzbGVlcF9sZW5ndGggPSBjaGVja19mcmVxdWVu Y3lfaW5fc2Vjb25kcyBvciAxCisgICAgICAgIHdoaWxlIHNlY29uZHNfbGVmdCA+IDAgYW5kIHNl bGYuY2hlY2tfcnVubmluZ19waWQocGlkKToKKyAgICAgICAgICAgIHNlY29uZHNfbGVmdCAtPSBz bGVlcF9sZW5ndGgKKyAgICAgICAgICAgIHRpbWUuc2xlZXAoc2xlZXBfbGVuZ3RoKQorCiAgICAg ZGVmIF93aW5kb3dzX2ltYWdlX25hbWUoc2VsZiwgcHJvY2Vzc19uYW1lKToKICAgICAgICAgbmFt ZSwgZXh0ZW5zaW9uID0gb3MucGF0aC5zcGxpdGV4dChwcm9jZXNzX25hbWUpCiAgICAgICAgIGlm IG5vdCBleHRlbnNpb246CkBAIC0zMTIsNiArMzE5LDE3IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmpl Y3QpOgogICAgICAgICAgICAgcHJvY2Vzc19uYW1lID0gIiVzLmV4ZSIgJSBuYW1lCiAgICAgICAg IHJldHVybiBwcm9jZXNzX25hbWUKIAorICAgIGRlZiBpbnRlcnJ1cHQoc2VsZiwgcGlkKToKKyAg ICAgICAgaW50ZXJydXB0X3NpZ25hbCA9IHNpZ25hbC5TSUdJTlQKKyAgICAgICAgIyBGSVhNRTog VGhlIHB5dGhvbiBkb2NzIHNlZW0gdG8gaW1wbHkgdGhhdCBwbGF0Zm9ybSA9PSAnd2luMzInIG1h eSBuZWVkIHRvIHVzZSBzaWduYWwuQ1RSTF9DX0VWRU5UCisgICAgICAgICMgaHR0cDovL2RvY3Mu cHl0aG9uLm9yZy8yL2xpYnJhcnkvc2lnbmFsLmh0bWwKKyAgICAgICAgdHJ5OgorICAgICAgICAg ICAgb3Mua2lsbChwaWQsIGludGVycnVwdF9zaWduYWwpCisgICAgICAgIGV4Y2VwdCBPU0Vycm9y OgorICAgICAgICAgICAgIyBTaWxlbnRseSBpZ25vcmUgd2hlbiB0aGUgcGlkIGRvZXNuJ3QgZXhp c3QuCisgICAgICAgICAgICAjIEl0J3MgaW1wb3NzaWJsZSBmb3IgY2FsbGVycyB0byBhdm9pZCBy YWNlIGNvbmRpdGlvbnMgd2l0aCBwcm9jZXNzIHNodXRkb3duLgorICAgICAgICAgICAgcGFzcwor CiAgICAgZGVmIGtpbGxfYWxsKHNlbGYsIHByb2Nlc3NfbmFtZSk6CiAgICAgICAgICIiIkF0dGVt cHRzIHRvIGtpbGwgcHJvY2Vzc2VzIG1hdGNoaW5nIHByb2Nlc3NfbmFtZS4KICAgICAgICAgV2ls bCBmYWlsIHNpbGVudGx5IGlmIG5vIHByb2Nlc3MgYXJlIGZvdW5kLiIiIgpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Byb2ZpbGVyLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Byb2ZpbGVyLnB5CmluZGV4IGU0NDUyZDIy ZWMzZDdkYTc3N2I2YjI3NGRkNmQxNzIyM2I2NGNjYTMuLjk4NmFmYTc2MjU1MmI1NDRmN2NkMzA2 ZjEwZjFiMGE4ZDYyZTNiMWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9wcm9maWxlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vcHJvZmlsZXIucHkKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgUHJvZmlsZXJGYWN0 b3J5KG9iamVjdCk6CiAgICAgZGVmIGNyZWF0ZV9wcm9maWxlcihjbHMsIGhvc3QsIGV4ZWN1dGFi bGVfcGF0aCwgb3V0cHV0X2RpciwgaWRlbnRpZmllcj1Ob25lKToKICAgICAgICAgaWYgaG9zdC5w bGF0Zm9ybS5pc19tYWMoKToKICAgICAgICAgICAgIHJldHVybiBJUHJvZmlsZXIoaG9zdCwgZXhl Y3V0YWJsZV9wYXRoLCBvdXRwdXRfZGlyLCBpZGVudGlmaWVyKQotICAgICAgICByZXR1cm4gR29v Z2xlUFByb2YoaG9zdCwgZXhlY3V0YWJsZV9wYXRoLCBvdXRwdXRfZGlyLCBpZGVudGlmaWVyKQor ICAgICAgICByZXR1cm4gUGVyZihob3N0LCBleGVjdXRhYmxlX3BhdGgsIG91dHB1dF9kaXIsIGlk ZW50aWZpZXIpCiAKIAogY2xhc3MgUHJvZmlsZXIob2JqZWN0KToKQEAgLTk3LDYgKzk3LDQ5IEBA IGNsYXNzIEdvb2dsZVBQcm9mKFNpbmdsZUZpbGVPdXRwdXRQcm9maWxlcik6CiAgICAgICAgIHBy aW50ICcgJy5qb2luKFtzZWxmLl9wcHJvZl9wYXRoKCksIHNlbGYuX2V4ZWN1dGFibGVfcGF0aCwg c2VsZi5fb3V0cHV0X3BhdGhdKQogCiAKK2NsYXNzIFBlcmYoU2luZ2xlRmlsZU91dHB1dFByb2Zp bGVyKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgZXhlY3V0YWJsZV9wYXRoLCBvdXRw dXRfZGlyLCBpZGVudGlmaWVyPU5vbmUpOgorICAgICAgICBzdXBlcihQZXJmLCBzZWxmKS5fX2lu aXRfXyhob3N0LCBleGVjdXRhYmxlX3BhdGgsIG91dHB1dF9kaXIsICJkYXRhIiwgaWRlbnRpZmll cikKKyAgICAgICAgc2VsZi5fcGVyZl9wcm9jZXNzID0gTm9uZQorICAgICAgICBzZWxmLl9waWRf YmVpbmdfcHJvZmlsZWQgPSBOb25lCisKKyAgICBkZWYgX3BlcmZfcGF0aChzZWxmKToKKyAgICAg ICAgIyBGSVhNRTogV2UgbWF5IG5lZWQgdG8gc3VwcG9ydCBmaW5kaW5nIHRoZSBwZXJmIGJpbmFy eSBpbiBvdGhlciBsb2NhdGlvbnMuCisgICAgICAgIHJldHVybiAncGVyZicKKworICAgIGRlZiBh dHRhY2hfdG9fcGlkKHNlbGYsIHBpZCk6CisgICAgICAgIGFzc2VydChub3Qgc2VsZi5fcGVyZl9w cm9jZXNzIGFuZCBub3Qgc2VsZi5fcGlkX2JlaW5nX3Byb2ZpbGVkKQorICAgICAgICBzZWxmLl9w aWRfYmVpbmdfcHJvZmlsZWQgPSBwaWQKKyAgICAgICAgY21kID0gW3NlbGYuX3BlcmZfcGF0aCgp LCAicmVjb3JkIiwgIi1nIiwgIi1wIiwgcGlkLCAiLW8iLCBzZWxmLl9vdXRwdXRfcGF0aF0KKyAg ICAgICAgY21kID0gbWFwKHVuaWNvZGUsIGNtZCkKKyAgICAgICAgc2VsZi5fcGVyZl9wcm9jZXNz ID0gc2VsZi5faG9zdC5leGVjdXRpdmUucG9wZW4oY21kKQorCisgICAgZGVmIF9maXJzdF90ZW5f bGluZXNfb2ZfcHJvZmlsZShzZWxmLCBwZXJmX291dHB1dCk6CisgICAgICAgIG1hdGNoID0gcmUu c2VhcmNoKCJeI1teXG5dKlxuKCg/OiBbXlxuXSpcbil7MSwxMH0pIiwgcGVyZl9vdXRwdXQsIHJl Lk1VTFRJTElORSkKKyAgICAgICAgcmV0dXJuIG1hdGNoLmdyb3VwKDEpIGlmIG1hdGNoIGVsc2Ug Tm9uZQorCisgICAgZGVmIHByb2ZpbGVfYWZ0ZXJfZXhpdChzZWxmKToKKyAgICAgICAgIyBQZXJm IGRvZXNuJ3QgYXV0b21hdGljYWxseSB3YXRjaCB0aGUgYXR0YWNoZWQgcGlkIGZvciBkZWF0aCBu b3RpZmljYXRpb25zLAorICAgICAgICAjIHNvIHdlIGhhdmUgdG8gZG8gaXQgZm9yIGl0LCBhbmQg dGhlbiB0ZWxsIGl0IGl0cyB0aW1lIHRvIHN0b3Agc2FtcGxpbmcuIDooCisgICAgICAgIHNlbGYu X2hvc3QuZXhlY3V0aXZlLndhaXRfbGltaXRlZChzZWxmLl9waWRfYmVpbmdfcHJvZmlsZWQsIGxp bWl0X2luX3NlY29uZHM9MTApCisgICAgICAgIHBlcmZfZXhpdGNvZGUgPSBzZWxmLl9wZXJmX3By b2Nlc3MucG9sbCgpCisgICAgICAgIGlmIHBlcmZfZXhpdGNvZGUgaXMgTm9uZTogICMgVGhpcyBz aG91bGQgYWx3YXlzIGJlIHRoZSBjYXNlLCB1bmxlc3MgcGVyZiBlcnJvcidkIG91dCBlYXJseS4K KyAgICAgICAgICAgIHNlbGYuX2hvc3QuZXhlY3V0aXZlLmludGVycnVwdChzZWxmLl9wZXJmX3By b2Nlc3MucGlkKQorCisgICAgICAgIHBlcmZfZXhpdGNvZGUgPSBzZWxmLl9wZXJmX3Byb2Nlc3Mu d2FpdCgpCisgICAgICAgIGlmIHBlcmZfZXhpdGNvZGUgbm90IGluICgwLCAtMik6ICAjIFRoZSBl eGl0IGNvZGUgc2hvdWxkIGFsd2F5cyBiZSAtMiwgYXMgd2UncmUgYWx3YXlzIGludGVycnVwdGlu ZyBwZXJmLgorICAgICAgICAgICAgcHJpbnQgIidwZXJmIHJlY29yZCcgZmFpbGVkIChleGl0IGNv ZGU6ICVpKSwgY2FuJ3QgcHJvY2VzcyByZXN1bHRzOiIgJSBwZXJmX2V4aXRjb2RlCisgICAgICAg ICAgICByZXR1cm4KKworICAgICAgICBwZXJmX2FyZ3MgPSBbc2VsZi5fcGVyZl9wYXRoKCksICdy ZXBvcnQnLCAnLWcnLCAnbm9uZScsICctaScsIHNlbGYuX291dHB1dF9wYXRoXQorICAgICAgICBw cmludCAiICIuam9pbihwZXJmX2FyZ3MpCisgICAgICAgIHBlcmZfb3V0cHV0ID0gc2VsZi5faG9z dC5leGVjdXRpdmUucnVuX2NvbW1hbmQocGVyZl9hcmdzKQorICAgICAgICBwcmludCBzZWxmLl9m aXJzdF90ZW5fbGluZXNfb2ZfcHJvZmlsZShwZXJmX291dHB1dCkKKworICAgICAgICBwcmludCAi VG8gdmlldyB0aGUgZnVsbCBwcm9maWxlLCBydW46IgorICAgICAgICBwcmludCAnICcuam9pbihb c2VsZi5fcGVyZl9wYXRoKCksICdyZXBvcnQnLCAnLWknLCBzZWxmLl9vdXRwdXRfcGF0aF0pCisK KwogY2xhc3MgSVByb2ZpbGVyKFNpbmdsZUZpbGVPdXRwdXRQcm9maWxlcik6CiAgICAgZGVmIF9f aW5pdF9fKHNlbGYsIGhvc3QsIGV4ZWN1dGFibGVfcGF0aCwgb3V0cHV0X2RpciwgaWRlbnRpZmll cj1Ob25lKToKICAgICAgICAgc3VwZXIoSVByb2ZpbGVyLCBzZWxmKS5fX2luaXRfXyhob3N0LCBl eGVjdXRhYmxlX3BhdGgsIG91dHB1dF9kaXIsICJkdHBzIiwgaWRlbnRpZmllcikK