21071 2008-09-24 12:33:58 -0700 JSCore SPI addition for reporting an object's non-GC allocated memory 2008-09-24 13:39:07 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 92567 0 ggaren 2008-09-24 12:33:58 -0700 Patch coming. Maybe we should make this API some day? 92568 1 23760 ggaren 2008-09-24 12:34:10 -0700 Created attachment 23760 patch 92569 2 23760 darin 2008-09-24 12:41:14 -0700 Comment on attachment 23760 patch + * API/JSBase.h: Filled in some missing function names. Good, but separate. Probably should land separately (first?). + * JavaScriptCore.xcodeproj/project.pbxproj: + + ^ Add the SPI. Cute, but unconventional. Should we really use this style? How about just having the comment in a paragraph with the filenames. Why SPI and not API? Is this just a staging thing? It seems strange and not helpful to make a whole new SPI.cpp file to put this function in if its SPI status will change later. The normal term for SPI in header files is "Private". The header a new SPI function should go into is whatever header the function would go into if it was API, but with "Private.h" at the end instead of ".h" or "Internal.h". review- because JSSPI.h is not the right name for this header 92575 3 ggaren 2008-09-24 13:39:07 -0700 > + * API/JSBase.h: Filled in some missing function names. > > Good, but separate. Probably should land separately (first?). Fixed. > + ^ Add the SPI. > > Cute, but unconventional. Should we really use this style? How about just > having the comment in a paragraph with the filenames. I'm not sure what the best style is. I don't like putting the comment next to the file name in a file that's truncated to 80 characters, because the first 20-75 characters on the line can be taken up just by the file name. It makes reading the actual comment hard. I also don't think that style works well when you've made one change to many files. Stating the exact same change next to each file name seems silly. Stating the change only on the first or last line seems to imply that the change was only made to the first or last file. I guess I'll state the change next to each file name. Copy-paste makes this easy. But I think it makes for a hard-to-read ChangeLog. > Why SPI and not API? Is this just a staging thing? It seems strange and not > helpful to make a whole new SPI.cpp file to put this function in if its SPI > status will change later. It's staging. I'm still unclear on whether the function should be per-context or per-object. > The normal term for SPI in header files is "Private". The header a new SPI > function should go into is whatever header the function would go into if it was > API, but with "Private.h" at the end instead of ".h" or "Internal.h". Fixed. Committed revision 36863. 23760 2008-09-24 12:34:10 -0700 2008-09-24 12:41:14 -0700 patch patch-report-extra.txt text/plain 11067 ggaren SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM2ODU2 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDgtMDkt MjQgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEZpeGVkIDxyZGFyOi8vcHJv YmxlbS81NjA1NTMyPiBOZWVkIGEgU1BJIGZvciB0ZWxsaW5nIEpTIHRoZSBzaXplIG9mCisgICAg ICAgIHRoZSBvYmplY3RzIGl0IHJldGFpbnMKKworICAgICAgICAqIEFQSS9KU0Jhc2UuaDogRmls bGVkIGluIHNvbWUgbWlzc2luZyBmdW5jdGlvbiBuYW1lcy4KKworICAgICAgICAqIEFQSS90ZXN0 cy90ZXN0YXBpLmM6IFRlc3QgdGhlIG5ldyBTUEkgYSBsaXR0bGUuCisKKyAgICAgICAgKiBBUEkv SlNTUEkuY3BwOgorICAgICAgICAqIEFQSS9KU1NQSS5oOgorICAgICAgICAqIEphdmFTY3JpcHRD b3JlLmV4cDoKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorICAgICAgICAKKyAgICAgICAgXiBBZGQgdGhlIFNQSS4KKwogMjAwOC0wOS0yNCAgR2Vv ZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IENh bWVyb24gWndhcmljaC4KSW5kZXg6IEphdmFTY3JpcHRDb3JlLmV4cAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBK YXZhU2NyaXB0Q29yZS5leHAJKHJldmlzaW9uIDM2ODUyKQorKysgSmF2YVNjcmlwdENvcmUuZXhw CSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3IEBAIF9KU1Byb3BlcnR5TmFtZUFycmF5R2V0 Q291bnQKIF9KU1Byb3BlcnR5TmFtZUFycmF5R2V0TmFtZUF0SW5kZXgKIF9KU1Byb3BlcnR5TmFt ZUFycmF5UmVsZWFzZQogX0pTUHJvcGVydHlOYW1lQXJyYXlSZXRhaW4KK19KU1JlcG9ydEV4dHJh TWVtb3J5Q29zdAogX0pTU3RhcnRQcm9maWxpbmcKIF9KU1N0cmluZ0NvcHlDRlN0cmluZwogX0pT U3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nCkluZGV4OiBBUEkvSlNCYXNlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gQVBJL0pTQmFzZS5oCShyZXZpc2lvbiAzNjg1MikKKysrIEFQSS9KU0Jhc2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtODQsNyArODQsNyBAQCBleHRlcm4gIkMiIHsKIC8qIFNjcmlwdCBFdmFsdWF0 aW9uICovCiAKIC8qIQotQGZ1bmN0aW9uCitAZnVuY3Rpb24gSlNFdmFsdWF0ZVNjcmlwdAogQGFi c3RyYWN0IEV2YWx1YXRlcyBhIHN0cmluZyBvZiBKYXZhU2NyaXB0LgogQHBhcmFtIGN0eCBUaGUg ZXhlY3V0aW9uIGNvbnRleHQgdG8gdXNlLgogQHBhcmFtIHNjcmlwdCBBIEpTU3RyaW5nIGNvbnRh aW5pbmcgdGhlIHNjcmlwdCB0byBldmFsdWF0ZS4KQEAgLTEwOSw3ICsxMDksNyBAQCBKU19FWFBP UlQgSlNWYWx1ZVJlZiBKU0V2YWx1YXRlU2NyaXB0KEpTCiBKU19FWFBPUlQgYm9vbCBKU0NoZWNr U2NyaXB0U3ludGF4KEpTQ29udGV4dFJlZiBjdHgsIEpTU3RyaW5nUmVmIHNjcmlwdCwgSlNTdHJp bmdSZWYgc291cmNlVVJMLCBpbnQgc3RhcnRpbmdMaW5lTnVtYmVyLCBKU1ZhbHVlUmVmKiBleGNl cHRpb24pOwogCiAvKiEKLUBmdW5jdGlvbgorQGZ1bmN0aW9uIEpTR2FyYmFnZUNvbGxlY3QKIEBh YnN0cmFjdCBQZXJmb3JtcyBhIEphdmFTY3JpcHQgZ2FyYmFnZSBjb2xsZWN0aW9uLiAKIEBwYXJh bSBjdHggVGhlIGV4ZWN1dGlvbiBjb250ZXh0IHRvIHVzZS4KIEBkaXNjdXNzaW9uIEphdmFTY3Jp cHQgdmFsdWVzIHRoYXQgYXJlIG9uIHRoZSBtYWNoaW5lIHN0YWNrLCBpbiBhIHJlZ2lzdGVyLCAK SW5kZXg6IEFQSS9KU1NQSS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gQVBJL0pTU1BJLmNwcAkocmV2aXNp b24gMCkKKysrIEFQSS9KU1NQSS5jcHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDIgQEAKKy8q CisgKiBDb3B5cmlnaHQgKEMpIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp YnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQ09NUFVU RVIsIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAq IFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01QVVRF UiwgSU5DLiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJ QUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVO VCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IK KyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAK KyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiSlNDb250ZXh0UmVmLmgiCisK KyNpbmNsdWRlICJBUElDYXN0LmgiCisjaW5jbHVkZSAiSlNMb2NrLmgiCisjaW5jbHVkZSAiSlNT UEkuaCIKKwordXNpbmcgbmFtZXNwYWNlIEpTQzsKKworSlNfRVhQT1JUIHZvaWQgSlNSZXBvcnRF eHRyYU1lbW9yeUNvc3QoSlNDb250ZXh0UmVmIGN0eCwgc2l6ZV90IHNpemUpCit7CisgICAgRXhl Y1N0YXRlKiBleGVjID0gdG9KUyhjdHgpOworICAgIGV4ZWMtPmdsb2JhbERhdGEoKS5oZWFwLT5y ZWdpc3RlclRocmVhZCgpOworICAgIEpTTG9jayBsb2NrKGV4ZWMpOworCisgICAgZXhlYy0+Z2xv YmFsRGF0YSgpLmhlYXAtPnJlcG9ydEV4dHJhTWVtb3J5Q29zdChzaXplKTsKK30KSW5kZXg6IEFQ SS9KU1NQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIEFQSS9KU1NQSS5oCShyZXZpc2lvbiAwKQorKysgQVBJ L0pTU1BJLmgJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTYgQEAKKy8qCisgKiBDb3B5cmlnaHQg KEMpIDIwMDggQXBwbGUgQ29tcHV0ZXIsIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgor ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50 YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRp b24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBDT01QVVRFUiwg SU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIENPTVBVVEVSLCBJ TkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVD VCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBE QU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9G IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICog UFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04g QU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1Qg TElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAorICov CisKKyNpZm5kZWYgSlNTUElfaAorI2RlZmluZSBKU1NQSV9oCisKKyNpbmNsdWRlIDxKYXZhU2Ny aXB0Q29yZS9KU0Jhc2UuaD4KKyNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9XZWJLaXRBdmFpbGFi aWxpdHkuaD4KKworI2lmbmRlZiBfX2NwbHVzcGx1cworI2luY2x1ZGUgPHN0ZGJvb2wuaD4KKyNl bmRpZgorCisjaWZkZWYgX19jcGx1c3BsdXMKK2V4dGVybiAiQyIgeworI2VuZGlmCisKKy8qIQor QGZ1bmN0aW9uCitAYWJzdHJhY3QgUmVwb3J0cyBhbiBvYmplY3QncyBub24tR0MgbWVtb3J5IHBh eWxvYWQgdG8gdGhlIGdhcmJhZ2UgY29sbGVjdG9yLgorQHBhcmFtIGN0eCBUaGUgZXhlY3V0aW9u IGNvbnRleHQgdG8gdXNlLgorQHBhcmFtIHNpemUgVGhlIHBheWxvYWQncyBzaXplLCBpbiBieXRl cy4KK0BkaXNjdXNzaW9uIFVzZSB0aGlzIGZ1bmN0aW9uIHRvIG5vdGlmeSB0aGUgZ2FyYmFnZSBj b2xsZWN0b3IgdGhhdCBhIEdDIG9iamVjdAorb3ducyBhIGxhcmdlIG5vbi1HQyBtZW1vcnkgcmVn aW9uLiBDYWxsaW5nIHRoaXMgZnVuY3Rpb24gd2lsbCBlbmNvdXJhZ2UgdGhlCitnYXJiYWdlIGNv bGxlY3RvciB0byBjb2xsZWN0IHNvb24sIGhvcGluZyB0byByZWNsYWltIHRoYXQgbGFyZ2Ugbm9u LUdDIG1lbW9yeQorcmVnaW9uLgorKi8KK0pTX0VYUE9SVCB2b2lkIEpTUmVwb3J0RXh0cmFNZW1v cnlDb3N0KEpTQ29udGV4dFJlZiBjdHgsIHNpemVfdCBzaXplKSBBVkFJTEFCTEVfQUZURVJfV0VC S0lUX1ZFUlNJT05fM18xOworCisjaWZkZWYgX19jcGx1c3BsdXMKK30KKyNlbmRpZgorCisjZW5k aWYgLyogSlNTUElfaCAqLwpJbmRleDogQVBJL3Rlc3RzL3Rlc3RhcGkuYwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBBUEkvdGVzdHMvdGVzdGFwaS5jCShyZXZpc2lvbiAzNjg1MikKKysrIEFQSS90ZXN0cy90ZXN0 YXBpLmMJKHdvcmtpbmcgY29weSkKQEAgLTI0LDYgKzI0LDcgQEAKICAqLwogCiAjaW5jbHVkZSAi SmF2YVNjcmlwdENvcmUuaCIKKyNpbmNsdWRlICJKU1NQSS5oIgogI2luY2x1ZGUgPG1hdGguaD4K ICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi9VbnVzZWRQYXJhbS5o PgpAQCAtNTgzLDYgKzU4NCwxMCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQog CiAgICAgSlNHbG9iYWxDb250ZXh0UmV0YWluKGNvbnRleHQpOwogICAgIEpTR2xvYmFsQ29udGV4 dFJlbGVhc2UoY29udGV4dCk7CisgICAgCisgICAgSlNSZXBvcnRFeHRyYU1lbW9yeUNvc3QoY29u dGV4dCwgMCk7CisgICAgSlNSZXBvcnRFeHRyYU1lbW9yeUNvc3QoY29udGV4dCwgMSk7CisgICAg SlNSZXBvcnRFeHRyYU1lbW9yeUNvc3QoY29udGV4dCwgMTAyNCk7CiAKICAgICBKU09iamVjdFJl ZiBnbG9iYWxPYmplY3QgPSBKU0NvbnRleHRHZXRHbG9iYWxPYmplY3QoY29udGV4dCk7CiAgICAg QVNTRVJUKEpTVmFsdWVJc09iamVjdChjb250ZXh0LCBnbG9iYWxPYmplY3QpKTsKSW5kZXg6IEph dmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2 YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMzY4NTIpCisr KyBKYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkp CkBAIC0zNyw2ICszNyw4IEBACiAJCTA2RDM1OEIzMERBQURBQTQwMDNCMTc0RSAvKiBNYWluVGhy ZWFkLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDA2 RDM1OEEyMERBQUQ5QzQwMDNCMTc0RSAvKiBNYWluVGhyZWFkLmNwcCAqLzsgfTsKIAkJMDZEMzU4 QjQwREFBREFBQTAwM0IxNzRFIC8qIE1haW5UaHJlYWRNYWMubW0gaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwNkQzNThBMTBEQUFEOUM0MDAzQjE3NEUgLyog TWFpblRocmVhZE1hYy5tbSAqLzsgfTsKIAkJMTQwQjdEMUQwREM2OUFGNzAwOUM0MkI4IC8qIEpT QWN0aXZhdGlvbi5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAxNERBODE4RjBEOTlGRDIwMDBCMEE0RkIgLyogSlNBY3RpdmF0aW9uLmNwcCAqLzsgfTsK KwkJMTQwRDE3OEUwRThBQ0IzOTAwMENEMTdEIC8qIEpTU1BJLmNwcCBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDE0MEQxNzhDMEU4QUNCMzkwMDBDRDE3RCAv KiBKU1NQSS5jcHAgKi87IH07CisJCTE0MEQxNzhGMEU4QUNCMzkwMDBDRDE3RCAvKiBKU1NQSS5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMTQwRDE3OEQw RThBQ0IzOTAwMENEMTdEIC8qIEpTU1BJLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo UHJpdmF0ZSwgKTsgfTsgfTsKIAkJMTQxMjExMzEwQTQ4Nzk0RDAwNDgwMjU1IC8qIEphdmFTY3Jp cHRDb3JlLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDkzMkY1QkQ5MDgyMkExQzcwMDczNjk3NSAvKiBKYXZhU2NyaXB0Q29yZS5mcmFt ZXdvcmsgKi87IH07CiAJCTE0MTIxMTM0MEE0ODc5NTgwMDQ4MDI1NSAvKiBtaW5pZG9tLmMgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDEyMTEwMjBBNDg3 ODA5MDA0ODAyNTUgLyogbWluaWRvbS5jICovOyB9OwogCQkxNDIxMzU5QjBBNjc3RjRGMDBBODE5 NUUgLyogSlNCYXNlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDE0MjEzNTlBMEE2NzdGNEYwMEE4MTk1RSAvKiBKU0Jhc2UuY3BwICovOyB9OwpAQCAt NDQzLDYgKzQ0NSw4IEBACiAJCTA2RDM1OEExMERBQUQ5QzQwMDNCMTc0RSAvKiBNYWluVGhyZWFk TWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gTWFpblRocmVh ZE1hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMDZEMzU4QTIwREFBRDlDNDAw M0IxNzRFIC8qIE1haW5UaHJlYWQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gTWFpblRocmVhZC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTA2RDM1 OEEzMERBQUQ5QzQwMDNCMTc0RSAvKiBNYWluVGhyZWFkLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IE1haW5UaHJlYWQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJ MTQwRDE3OEMwRThBQ0IzOTAwMENEMTdEIC8qIEpTU1BJLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IEpTU1BJLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK KwkJMTQwRDE3OEQwRThBQ0IzOTAwMENEMTdEIC8qIEpTU1BJLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IEpTU1BJLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTE0 MTIxMTAyMEE0ODc4MDkwMDQ4MDI1NSAvKiBtaW5pZG9tLmMgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuYzsgbmFtZSA9IG1pbmlkb20uYzsgcGF0aCA9IHRlc3RzL21pbmlkb20uYzsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTQxMjExMEQwQTQ4Nzg4NzAwNDgwMjU1IC8qIG1pbmlkb20u anMgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmphdmFzY3JpcHQ7IG5hbWUgPSBtaW5pZG9tLmpzOyBw YXRoID0gdGVzdHMvbWluaWRvbS5qczsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTQx MjExMjAwQTQ4NzkzQzAwNDgwMjU1IC8qIG1pbmlkb20gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZXhwbGljaXRGaWxlVHlwZSA9ICJjb21waWxlZC5tYWNoLW8uZXhlY3V0YWJsZSI7IGlu Y2x1ZGVJbkluZGV4ID0gMDsgcGF0aCA9IG1pbmlkb207IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9E VUNUU19ESVI7IH07CkBAIC05MzksNiArOTQzLDggQEAKIAkJCQk5NTk4OEJBOTBFNDc3QkVDMDBE MjhENEQgLyogSlNQcm9maWxlclByaXZhdGUuY3BwICovLAogCQkJCTk1MkM2M0FDMEU0Nzc3RDYw MEMxMzkzNiAvKiBKU1Byb2ZpbGVyUHJpdmF0ZS5oICovLAogCQkJCTk1QzE4RDNFMEM5MEU3RUYw MEU3MkY3MyAvKiBKU1JldGFpblB0ci5oICovLAorCQkJCTE0MEQxNzhDMEU4QUNCMzkwMDBDRDE3 RCAvKiBKU1NQSS5jcHAgKi8sCisJCQkJMTQwRDE3OEQwRThBQ0IzOTAwMENEMTdEIC8qIEpTU1BJ LmggKi8sCiAJCQkJMTQ4MkI3NEMwQTQzMDMyODAwNTE3Q0ZDIC8qIEpTU3RyaW5nUmVmLmNwcCAq LywKIAkJCQkxNDgyQjc0QjBBNDMwMzI4MDA1MTdDRkMgLyogSlNTdHJpbmdSZWYuaCAqLywKIAkJ CQkxNDZBQUIzNzBCNjZBOTQ0MDBFNTVGMTYgLyogSlNTdHJpbmdSZWZDRi5jcHAgKi8sCkBAIC0x NTkyLDYgKzE1OTgsNyBAQAogCQkJCTE0N0I4M0FDMEU2REI4QzkwMDQ3NzVBNCAvKiBCYXRjaGVk VHJhbnNpdGlvbk9wdGltaXplci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMTQ3Qjg0NjMwRTZERTZC MTAwNDc3NUE0IC8qIFB1dFByb3BlcnR5U2xvdC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJN0UyQURE OEUwRTc5QUFENTAwRDUwQzUxIC8qIENoYXJhY3RlckNsYXNzQ29uc3RydWN0b3IuaCBpbiBIZWFk ZXJzICovLAorCQkJCTE0MEQxNzhGMEU4QUNCMzkwMDBDRDE3RCAvKiBKU1NQSS5oIGluIEhlYWRl cnMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7 CiAJCX07CkBAIC0xOTAzLDYgKzE5MTAsNyBAQAogCQkJCTkzMzA0MDJDMEU2QTc2NDAwMDc4NkU2 QSAvKiBTbWFsbFN0cmluZ3MuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkNERTNCNDMwRTZDODMy RDAwMTQ1M0E3IC8qIFN0cnVjdHVyZUlELmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTdFMkFERDkw MEU3OUFDMTEwMEQ1MEM1MSAvKiBDaGFyYWN0ZXJDbGFzc0NvbnN0cnVjdG9yLmNwcCBpbiBTb3Vy Y2VzICovLAorCQkJCTE0MEQxNzhFMEU4QUNCMzkwMDBDRDE3RCAvKiBKU1NQSS5jcHAgaW4gU291 cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0g MDsKIAkJfTsK