Date: Wed, 16 May 2012 15:12:50 +1200 From: Andrew Thompson <thompsa@FreeBSD.org> To: "current@freebsd.org Current" <current@freebsd.org> Subject: sockstat & jid patch Message-ID: <CAFAOGNSFT_pAsj_vfsWQSv1V3SiJq55y%2BKmWqaftuZwi%2B0Sr5A@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--047d7b2e0961be32ec04c01eb168 Content-Type: text/plain; charset=ISO-8859-1 Hi, Here is a quick patch to limit the sockstat output to a specific jail id, this is useful to verify which sockets a jail has open. A jid of 0 will show the host system. This will result in an extra syscall per socket when -j is set but I do not think warrants a process cache. Any objections? Andrew --047d7b2e0961be32ec04c01eb168 Content-Type: application/octet-stream; name="sockstat_jid.diff" Content-Disposition: attachment; filename="sockstat_jid.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h29tf1dv0 SW5kZXg6IHNvY2tzdGF0LjEKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc29ja3N0YXQuMQkocmV2aXNpb24gMjM1 NDUzKQorKysgc29ja3N0YXQuMQkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNyBAQAogLlwi CiAuXCIgJEZyZWVCU0QkCiAuXCIKLS5EZCBKYW51YXJ5IDI0LCAyMDEyCisuRGQgTWF5IDE2LCAy MDEyCiAuRHQgU09DS1NUQVQgMQogLk9zCiAuU2ggTkFNRQpAQCAtMzYsNiArMzYsNyBAQAogLlNo IFNZTk9QU0lTCiAuTm0KIC5PcCBGbCA0NmNMbHUKKy5PcCBGbCBqIEFyIGppZAogLk9wIEZsIHAg QXIgcG9ydHMKIC5PcCBGbCBQIEFyIHByb3RvY29scwogLlNoIERFU0NSSVBUSU9OCkBAIC01Nyw2 ICs1OCw4IEBAIFNob3cKIChJUHY2KSBzb2NrZXRzLgogLkl0IEZsIGMKIFNob3cgY29ubmVjdGVk IHNvY2tldHMuCisuSXQgRmwgaiBBciBqaWQKK1Nob3cgb25seSBzb2NrZXRzIGJlbG9uZ2luZyB0 byB0aGUgc3BlY2lmaWVkIGphaWwgSUQuCiAuSXQgRmwgTAogT25seSBzaG93IEludGVybmV0IHNv Y2tldHMgaWYgdGhlIGxvY2FsIG9yIGZvcmVpZ24gYWRkcmVzc2VzIGFyZSBub3QKIGluIHRoZSBs b29wYmFjayBuZXR3b3JrIHByZWZpeApJbmRleDogc29ja3N0YXQuYwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBz b2Nrc3RhdC5jCShyZXZpc2lvbiAyMzU0NTMpCisrKyBzb2Nrc3RhdC5jCSh3b3JraW5nIGNvcHkp CkBAIC02Miw2ICs2Miw3IEBAIF9fRkJTRElEKCIkRnJlZUJTRCQiKTsKIHN0YXRpYyBpbnQJIG9w dF80OwkJLyogU2hvdyBJUHY0IHNvY2tldHMgKi8KIHN0YXRpYyBpbnQJIG9wdF82OwkJLyogU2hv dyBJUHY2IHNvY2tldHMgKi8KIHN0YXRpYyBpbnQJIG9wdF9jOwkJLyogU2hvdyBjb25uZWN0ZWQg c29ja2V0cyAqLworc3RhdGljIGludAkgb3B0X2o7CQkvKiBTaG93IHNwZWNpZmllZCBqYWlsICov CiBzdGF0aWMgaW50CSBvcHRfTDsJCS8qIERvbid0IHNob3cgSVB2NCBvciBJUHY2IGxvb3BiYWNr IHNvY2tldHMgKi8KIHN0YXRpYyBpbnQJIG9wdF9sOwkJLyogU2hvdyBsaXN0ZW5pbmcgc29ja2V0 cyAqLwogc3RhdGljIGludAkgb3B0X3U7CQkvKiBTaG93IFVuaXggZG9tYWluIHNvY2tldHMgKi8K QEAgLTU0OSw2ICs1NTAsMjcgQEAgZ2V0cHJvY25hbWUocGlkX3QgcGlkKQogfQogCiBzdGF0aWMg aW50CitnZXRwcm9jamlkKHBpZF90IHBpZCkKK3sKKwlzdGF0aWMgc3RydWN0IGtpbmZvX3Byb2Mg cHJvYzsKKwlzaXplX3QgbGVuOworCWludCBtaWJbNF07CisKKwltaWJbMF0gPSBDVExfS0VSTjsK KwltaWJbMV0gPSBLRVJOX1BST0M7CisJbWliWzJdID0gS0VSTl9QUk9DX1BJRDsKKwltaWJbM10g PSAoaW50KXBpZDsKKwlsZW4gPSBzaXplb2YgcHJvYzsKKwlpZiAoc3lzY3RsKG1pYiwgNCwgJnBy b2MsICZsZW4sIE5VTEwsIDApID09IC0xKSB7CisJCS8qIERvIG5vdCB3YXJuIGlmIHRoZSBwcm9j ZXNzIGV4aXRzIGJlZm9yZSB3ZSBnZXQgaXRzIGppZC4gKi8KKwkJaWYgKGVycm5vICE9IEVTUkNI KQorCQkJd2Fybigic3lzY3RsKCkiKTsKKwkJcmV0dXJuICgtMSk7CisJfQorCXJldHVybiAocHJv Yy5raV9qaWQpOworfQorCitzdGF0aWMgaW50CiBjaGVja19wb3J0cyhzdHJ1Y3Qgc29jayAqcykK IHsKIAlpbnQgcG9ydDsKQEAgLTY0Myw2ICs2NjUsOCBAQCBkaXNwbGF5KHZvaWQpCiAJZm9yICh4 ZiA9IHhmaWxlcywgbiA9IDA7IG4gPCBueGZpbGVzOyArK24sICsreGYpIHsKIAkJaWYgKHhmLT54 Zl9kYXRhID09IE5VTEwpCiAJCQljb250aW51ZTsKKwkJaWYgKG9wdF9qID49IDAgJiYgb3B0X2og IT0gZ2V0cHJvY2ppZCh4Zi0+eGZfcGlkKSkKKwkJCWNvbnRpbnVlOwogCQloYXNoID0gKGludCko KHVpbnRwdHJfdCl4Zi0+eGZfZGF0YSAlIEhBU0hTSVpFKTsKIAkJZm9yIChzID0gc29ja2hhc2hb aGFzaF07IHMgIT0gTlVMTDsgcyA9IHMtPm5leHQpCiAJCQlpZiAoKHZvaWQgKilzLT5zb2NrZXQg PT0geGYtPnhmX2RhdGEpCkBAIC02NjgsNiArNjkyLDggQEAgZGlzcGxheSh2b2lkKQogCQlwb3Mg Kz0geHByaW50ZigiJWQgIiwgeGYtPnhmX2ZkKTsKIAkJZGlzcGxheXNvY2socywgcG9zKTsKIAl9 CisJaWYgKG9wdF9qID49IDApCisJCXJldHVybjsKIAlmb3IgKGhhc2ggPSAwOyBoYXNoIDwgSEFT SFNJWkU7IGhhc2grKykgewogCQlmb3IgKHMgPSBzb2NraGFzaFtoYXNoXTsgcyAhPSBOVUxMOyBz ID0gcy0+bmV4dCkgewogCQkJaWYgKHMtPnNob3duKQpAQCAtNzE2LDcgKzc0Miw4IEBAIG1haW4o aW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAlpbnQgcHJvdG9zX2RlZmluZWQgPSAtMTsKIAlpbnQg bywgaTsKIAotCXdoaWxlICgobyA9IGdldG9wdChhcmdjLCBhcmd2LCAiNDZjTGxwOlA6dXYiKSkg IT0gLTEpCisJb3B0X2ogPSAtMTsKKwl3aGlsZSAoKG8gPSBnZXRvcHQoYXJnYywgYXJndiwgIjQ2 Y2o6TGxwOlA6dXYiKSkgIT0gLTEpCiAJCXN3aXRjaCAobykgewogCQljYXNlICc0JzoKIAkJCW9w dF80ID0gMTsKQEAgLTcyNyw2ICs3NTQsOSBAQCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10p CiAJCWNhc2UgJ2MnOgogCQkJb3B0X2MgPSAxOwogCQkJYnJlYWs7CisJCWNhc2UgJ2onOgorCQkJ b3B0X2ogPSBhdG9pKG9wdGFyZyk7CisJCQlicmVhazsKIAkJY2FzZSAnTCc6CiAJCQlvcHRfTCA9 IDE7CiAJCQlicmVhazsK --047d7b2e0961be32ec04c01eb168--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFAOGNSFT_pAsj_vfsWQSv1V3SiJq55y%2BKmWqaftuZwi%2B0Sr5A>