164591 2016-11-10 07:38:24 -0800 [Linux] Memory process values shown by the WebMemorySampler in linux are wrong 2016-11-10 08:07:06 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply oldest_to_newest 1249786 0 cgarcia 2016-11-10 07:38:24 -0800 It's parsing /proc/self/statm, and returning the values as if they were bytes, but they are number of pages, so to get the bytes we need to take the page size into account. In r208534 I added a method to get /proc/self/statm values in bytes to Platform layer, so we can simply use that instead. 1249787 1 294371 cgarcia 2016-11-10 07:41:55 -0800 Created attachment 294371 Patch 1249794 2 cgarcia 2016-11-10 08:07:06 -0800 Committed r208538: <http://trac.webkit.org/changeset/208538> 294371 2016-11-10 07:41:55 -0800 2016-11-10 07:59:41 -0800 Patch wk2-memory-sampler-linux-process-memory.diff text/plain 5193 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwYmI1ZTI5Li5mMGNiOTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTYtMTEtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtMaW51eF0gTWVtb3J5IHByb2Nlc3MgdmFsdWVzIHNob3duIGJ5IHRoZSBX ZWJNZW1vcnlTYW1wbGVyIGluIGxpbnV4IGFyZSB3cm9uZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY0NTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQncyBwYXJzaW5nIC9wcm9jL3NlbGYvc3RhdG0s IGFuZCByZXR1cm5pbmcgdGhlIHZhbHVlcyBhcyBpZiB0aGV5IHdlcmUgYnl0ZXMsIGJ1dCB0aGV5 IGFyZSBudW1iZXIgb2YgcGFnZXMsIHNvCisgICAgICAgIHRvIGdldCB0aGUgYnl0ZXMgd2UgbmVl ZCB0byB0YWtlIHRoZSBwYWdlIHNpemUgaW50byBhY2NvdW50LiBJbiByMjA4NTM0IEkgYWRkZWQg YSBtZXRob2QgdG8gZ2V0IC9wcm9jL3NlbGYvc3RhdG0KKyAgICAgICAgdmFsdWVzIGluIGJ5dGVz IHRvIFBsYXRmb3JtIGxheWVyLCBzbyB3ZSBjYW4gc2ltcGx5IHVzZSB0aGF0IGluc3RlYWQuCisK KyAgICAgICAgKiBTaGFyZWQvbGludXgvV2ViTWVtb3J5U2FtcGxlckxpbnV4LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViTWVtb3J5U2FtcGxlcjo6c2FtcGxlV2ViS2l0KTogVXNlIGN1cnJlbnRQ cm9jZXNzTWVtb3J5U3RhdHVzKCkgYW5kIHVwZGF0ZSB0aGUgZGVzY3JpcHRpb25zIHRvCisgICAg ICAgIGNsYXJpZnkgdGhhdCB2YWx1ZXMgYXJlIGluIGJ5dGVzLgorCiAyMDE2LTEwLTE0ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBNZW1vcnlQ cmVzc3VyZUhhbmRsZXIgc2hvdWxkbid0IGtub3cgaG93IHRvIHJlbGVhc2UgV2ViQ29yZSBtZW1v cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9saW51eC9XZWJNZW1vcnlTYW1w bGVyTGludXguY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9yeVNhbXBs ZXJMaW51eC5jcHAKaW5kZXggZTUzZGEwYy4uZTQzN2Y0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9yeVNhbXBsZXJMaW51eC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9yeVNhbXBsZXJMaW51eC5jcHAKQEAgLTI4LDEw ICsyOCwxMSBAQAogCiAjaWYgRU5BQkxFKE1FTU9SWV9TQU1QTEVSKQogCi0jaW5jbHVkZSAiTm90 SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9NZW1vcnlTdGF0aXN0aWNz Lmg+Ci0jaW5jbHVkZSA8cnVudGltZS9KU0NJbmxpbmVzLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9D dXJyZW50UHJvY2Vzc01lbW9yeVN0YXR1cy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSlNET01XaW5k b3cuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CisjaW5jbHVkZSA8cnVu dGltZS9KU0NJbmxpbmVzLmg+CiAjaW5jbHVkZSA8cnVudGltZS9KU0xvY2suaD4KICNpbmNsdWRl IDxzdHJpbmcuaD4KICNpbmNsdWRlIDxzeXMvc3lzaW5mby5oPgpAQCAtNDQsMTYgKzQ1LDYgQEAg dXNpbmcgbmFtZXNwYWNlIFdURjsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0cnVjdCBBcHBs aWNhdGlvbk1lbW9yeVN0YXRzIHsKLSAgICBzaXplX3QgdG90YWxQcm9ncmFtU2l6ZTsKLSAgICBz aXplX3QgcmVzaWRlbnRTZXRTaXplOwotICAgIHNpemVfdCBzaGFyZWRTaXplOwotICAgIHNpemVf dCB0ZXh0U2l6ZTsKLSAgICBzaXplX3QgbGlicmFyeVNpemU7Ci0gICAgc2l6ZV90IGRhdGFTdGFj a1NpemU7Ci0gICAgc2l6ZV90IGRpcnR5UGFnZVNpemU7Ci19OwotCiBzdGF0aWMgY29uc3QgdW5z aWduZWQgaW50IG1heEJ1ZmZlciA9IDEyODsKIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBpbnQgbWF4 UHJvY2Vzc1BhdGggPSAzNTsKIApAQCAtODQsMjggKzc1LDYgQEAgc3RhdGljIGlubGluZSB2b2lk IGFwcGVuZEtleVZhbHVlUGFpcihXZWJNZW1vcnlTdGF0aXN0aWNzJiBzdGF0cywgY29uc3QgU3Ry aW5nJgogICAgIHN0YXRzLnZhbHVlcy5hcHBlbmQodmFsdWUpOwogfQogCi1zdGF0aWMgQXBwbGlj YXRpb25NZW1vcnlTdGF0cyBzYW1wbGVNZW1vcnlBbGxvY2F0ZWRGb3JBcHBsaWNhdGlvbigpCi17 Ci0gICAgQXBwbGljYXRpb25NZW1vcnlTdGF0cyBhcHBsaWNhdGlvblN0YXRzID0gezAsIDAsIDAs IDAsIDAsIDAsIDB9OwotICAgIGNoYXIgcHJvY2Vzc1BhdGhbbWF4UHJvY2Vzc1BhdGhdOwotICAg IHNucHJpbnRmKHByb2Nlc3NQYXRoLCBtYXhQcm9jZXNzUGF0aCwgIi9wcm9jL3NlbGYvc3RhdG0i KTsKLSAgICBGSUxFKiBzdGF0bUZpbGVEZXNjcmlwdG9yID0gZm9wZW4ocHJvY2Vzc1BhdGgsICJy Iik7Ci0gICAgaWYgKCFzdGF0bUZpbGVEZXNjcmlwdG9yKQotICAgICAgICByZXR1cm4gYXBwbGlj YXRpb25TdGF0czsKLQotICAgIGFwcGxpY2F0aW9uU3RhdHMudG90YWxQcm9ncmFtU2l6ZSA9IG5l eHRUb2tlbihzdGF0bUZpbGVEZXNjcmlwdG9yKS50b0ludCgpOwotICAgIGFwcGxpY2F0aW9uU3Rh dHMucmVzaWRlbnRTZXRTaXplID0gbmV4dFRva2VuKHN0YXRtRmlsZURlc2NyaXB0b3IpLnRvSW50 KCk7Ci0gICAgYXBwbGljYXRpb25TdGF0cy5zaGFyZWRTaXplID0gbmV4dFRva2VuKHN0YXRtRmls ZURlc2NyaXB0b3IpLnRvSW50KCk7Ci0gICAgYXBwbGljYXRpb25TdGF0cy50ZXh0U2l6ZSA9IG5l eHRUb2tlbihzdGF0bUZpbGVEZXNjcmlwdG9yKS50b0ludCgpOwotICAgIGFwcGxpY2F0aW9uU3Rh dHMubGlicmFyeVNpemUgPSBuZXh0VG9rZW4oc3RhdG1GaWxlRGVzY3JpcHRvcikudG9JbnQoKTsK LSAgICBhcHBsaWNhdGlvblN0YXRzLmRhdGFTdGFja1NpemUgPSBuZXh0VG9rZW4oc3RhdG1GaWxl RGVzY3JpcHRvcikudG9JbnQoKTsKLSAgICBhcHBsaWNhdGlvblN0YXRzLmRpcnR5UGFnZVNpemUg PSBuZXh0VG9rZW4oc3RhdG1GaWxlRGVzY3JpcHRvcikudG9JbnQoKTsKLQotICAgIGZjbG9zZShz dGF0bUZpbGVEZXNjcmlwdG9yKTsKLQotICAgIHJldHVybiBhcHBsaWNhdGlvblN0YXRzOwotfQot CiBTdHJpbmcgV2ViTWVtb3J5U2FtcGxlcjo6cHJvY2Vzc05hbWUoKSBjb25zdAogewogICAgIGNo YXIgcHJvY2Vzc1BhdGhbbWF4UHJvY2Vzc1BhdGhdOwpAQCAtMTMwLDE1ICs5OSwxNiBAQCBXZWJN ZW1vcnlTdGF0aXN0aWNzIFdlYk1lbW9yeVNhbXBsZXI6OnNhbXBsZVdlYktpdCgpIGNvbnN0CiAK ICAgICBhcHBlbmRLZXlWYWx1ZVBhaXIod2ViS2l0TWVtb3J5U3RhdHMsIEFTQ0lJTGl0ZXJhbCgi VGltZXN0YW1wIiksIG5vdyk7CiAKLSAgICBBcHBsaWNhdGlvbk1lbW9yeVN0YXRzIGFwcGxpY2F0 aW9uU3RhdHMgPSBzYW1wbGVNZW1vcnlBbGxvY2F0ZWRGb3JBcHBsaWNhdGlvbigpOworICAgIFBy b2Nlc3NNZW1vcnlTdGF0dXMgcHJvY2Vzc01lbW9yeVN0YXR1czsKKyAgICBjdXJyZW50UHJvY2Vz c01lbW9yeVN0YXR1cyhwcm9jZXNzTWVtb3J5U3RhdHVzKTsKIAotICAgIGFwcGVuZEtleVZhbHVl UGFpcih3ZWJLaXRNZW1vcnlTdGF0cywgQVNDSUlMaXRlcmFsKCJUb3RhbCBQcm9ncmFtIFNpemUi KSwgYXBwbGljYXRpb25TdGF0cy50b3RhbFByb2dyYW1TaXplKTsKLSAgICBhcHBlbmRLZXlWYWx1 ZVBhaXIod2ViS2l0TWVtb3J5U3RhdHMsIEFTQ0lJTGl0ZXJhbCgiUlNTIiksIGFwcGxpY2F0aW9u U3RhdHMucmVzaWRlbnRTZXRTaXplKTsKLSAgICBhcHBlbmRLZXlWYWx1ZVBhaXIod2ViS2l0TWVt b3J5U3RhdHMsIEFTQ0lJTGl0ZXJhbCgiU2hhcmVkIiksIGFwcGxpY2F0aW9uU3RhdHMuc2hhcmVk U2l6ZSk7Ci0gICAgYXBwZW5kS2V5VmFsdWVQYWlyKHdlYktpdE1lbW9yeVN0YXRzLCBBU0NJSUxp dGVyYWwoIlRleHQiKSwgYXBwbGljYXRpb25TdGF0cy50ZXh0U2l6ZSk7Ci0gICAgYXBwZW5kS2V5 VmFsdWVQYWlyKHdlYktpdE1lbW9yeVN0YXRzLCBBU0NJSUxpdGVyYWwoIkxpYnJhcnkiKSwgYXBw bGljYXRpb25TdGF0cy5saWJyYXJ5U2l6ZSk7Ci0gICAgYXBwZW5kS2V5VmFsdWVQYWlyKHdlYktp dE1lbW9yeVN0YXRzLCBBU0NJSUxpdGVyYWwoIkRhdGEvU3RhY2siKSwgYXBwbGljYXRpb25TdGF0 cy5kYXRhU3RhY2tTaXplKTsKLSAgICBhcHBlbmRLZXlWYWx1ZVBhaXIod2ViS2l0TWVtb3J5U3Rh dHMsIEFTQ0lJTGl0ZXJhbCgiRGlydHkiKSwgYXBwbGljYXRpb25TdGF0cy5kaXJ0eVBhZ2VTaXpl KTsKKyAgICBhcHBlbmRLZXlWYWx1ZVBhaXIod2ViS2l0TWVtb3J5U3RhdHMsIEFTQ0lJTGl0ZXJh bCgiVG90YWwgUHJvZ3JhbSBCeXRlcyIpLCBwcm9jZXNzTWVtb3J5U3RhdHVzLnNpemUpOworICAg IGFwcGVuZEtleVZhbHVlUGFpcih3ZWJLaXRNZW1vcnlTdGF0cywgQVNDSUlMaXRlcmFsKCJSZXNp ZGVudCBTZXQgQnl0ZXMiKSwgcHJvY2Vzc01lbW9yeVN0YXR1cy5yZXNpZGVudCk7CisgICAgYXBw ZW5kS2V5VmFsdWVQYWlyKHdlYktpdE1lbW9yeVN0YXRzLCBBU0NJSUxpdGVyYWwoIlJlc2lkZW50 IFNoYXJlZCBCeXRlcyIpLCBwcm9jZXNzTWVtb3J5U3RhdHVzLnNoYXJlZCk7CisgICAgYXBwZW5k S2V5VmFsdWVQYWlyKHdlYktpdE1lbW9yeVN0YXRzLCBBU0NJSUxpdGVyYWwoIlRleHQgQnl0ZXMi KSwgcHJvY2Vzc01lbW9yeVN0YXR1cy50ZXh0KTsKKyAgICBhcHBlbmRLZXlWYWx1ZVBhaXIod2Vi S2l0TWVtb3J5U3RhdHMsIEFTQ0lJTGl0ZXJhbCgiTGlicmFyeSBCeXRlcyIpLCBwcm9jZXNzTWVt b3J5U3RhdHVzLmxpYik7CisgICAgYXBwZW5kS2V5VmFsdWVQYWlyKHdlYktpdE1lbW9yeVN0YXRz LCBBU0NJSUxpdGVyYWwoIkRhdGEgKyBTdGFjayBCeXRlcyIpLCBwcm9jZXNzTWVtb3J5U3RhdHVz LmRhdGEpOworICAgIGFwcGVuZEtleVZhbHVlUGFpcih3ZWJLaXRNZW1vcnlTdGF0cywgQVNDSUlM aXRlcmFsKCJEaXJ0eSBCeXRlcyIpLCBwcm9jZXNzTWVtb3J5U3RhdHVzLmR0KTsKIAogICAgIHNp emVfdCB0b3RhbEJ5dGVzSW5Vc2UgPSAwOwogICAgIHNpemVfdCB0b3RhbEJ5dGVzQ29tbWl0dGVk ID0gMDsK