Re: [PATCH 1/3] CLI: add talloc leak report, controlled by an environment variable.

diff --git a/70/dfcaf6e0036f6022bb3b8db0cb17d32ba5bcf1 b/70/dfcaf6e0036f6022bb3b8db0cb17d32ba5bcf1
new file mode 100644 (file)
index 0000000..b7c2df3
--- /dev/null
+++ b/70/dfcaf6e0036f6022bb3b8db0cb17d32ba5bcf1
@@ -0,0 +1,131 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id DFE49431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 20 Dec 2012 17:55:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id OHkPP91heIW7 for <notmuch@notmuchmail.org>;\r
+       Thu, 20 Dec 2012 17:55:28 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3D156431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 20 Dec 2012 17:55:28 -0800 (PST)\r
+X-AuditID: 12074424-b7f4e6d0000004ca-25-50d3c18f2b25\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 35.54.01226.F81C3D05; Thu, 20 Dec 2012 20:55:27 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qBL1tQ4r028751; \r
+       Thu, 20 Dec 2012 20:55:26 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBL1tNhH002730\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+       Thu, 20 Dec 2012 20:55:25 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1Tlrpb-0007Hb-9x; Thu, 20 Dec 2012 20:55:23 -0500\r
+Date: Thu, 20 Dec 2012 20:55:23 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: david@tethera.net\r
+Subject: Re: [PATCH 1/3] CLI: add talloc leak report, controlled by an\r
+       environment variable.\r
+Message-ID: <20121221015523.GQ6187@mit.edu>\r
+References: <1355714648-23144-1-git-send-email-david@tethera.net>\r
+       <1355714648-23144-2-git-send-email-david@tethera.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1355714648-23144-2-git-send-email-david@tethera.net>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42IR4hRV1u0/eDnA4MNUKYuNy34yW9xo7Wa0\r
+       uH5zJrMDs8evtrnMHs9W3WL22HLoPXMAcxSXTUpqTmZZapG+XQJXxsuZCQWveCuOnrzC1sB4\r
+       nauLkZNDQsBE4m/3VGYIW0ziwr31bF2MXBxCAvsYJZZ/uMYE4WxglFi/4j07hHORSeJWQzsr\r
+       SIuQwBJGiUf7U0BsFgFViROr2tlBbDYBDYlt+5czgtgiAqISpzdNAqtnFrCXWDR7EliNsECc\r
+       xL9lb8BqeAW0Jfb+fs8OMbNS4viF6awQcUGJkzOfsED0aknc+PcS6CIOIFtaYvk/DpAwp4CT\r
+       xKG789hAbFEBFYkpJ7exTWAUmoWkexaS7lkI3QsYmVcxyqbkVunmJmbmFKcm6xYnJ+blpRbp\r
+       muvlZpbopaaUbmIEBTq7i8oOxuZDSocYBTgYlXh4IywuBwixJpYVV+YeYpTkYFIS5dXbDxTi\r
+       S8pPqcxILM6ILyrNSS0+xCjBwawkwvt8CVCONyWxsiq1KB8mJc3BoiTOez3lpr+QQHpiSWp2\r
+       ampBahFMVoaDQ0mCt+0AUKNgUWp6akVaZk4JQpqJgxNkOA/Q8G0gNbzFBYm5xZnpEPlTjIpS\r
+       4rzf9wElBEASGaV5cL2wRPSKURzoFWHefSDtPMAkBtf9CmgwE9DgIL0LIINLEhFSUg2MYfwT\r
+       REsmxq7VMthS9jFna3X61AwGkcxJXzzjPZ5yf/AxOnaKU3P7V0/2hY/jvE8e0Vw2UeNj4PrP\r
+       HK6JMnqiFtmts35du/CmxURDvPoQr9XTMxPmS93cJL1WdrLz8tcJYU8nWsgIbju2W2t1R+a6\r
+       4w99m8Pe6PW79ty6ce7I1R8TTMvd5W8uUGIpzkg01GIuKk4EAPun4JYfAwAA\r
+Cc: notmuch@notmuchmail.org, David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 21 Dec 2012 01:55:29 -0000\r
+\r
+Quoth david@tethera.net on Dec 16 at 11:24 pm:\r
+> From: David Bremner <bremner@debian.org>\r
+> \r
+> The argument handling in notmuch.c seems due for an overhaul, but\r
+> until then use an environment variable to specify a location to write\r
+> the talloc leak report to.  This is only enabled for the (interesting)\r
+> case where some notmuch subcommand is invoked.\r
+> ---\r
+>  notmuch.c |   16 ++++++++++++++--\r
+>  1 file changed, 14 insertions(+), 2 deletions(-)\r
+> \r
+> diff --git a/notmuch.c b/notmuch.c\r
+> index 9516dfb..fb49c5a 100644\r
+> --- a/notmuch.c\r
+> +++ b/notmuch.c\r
+> @@ -322,8 +322,20 @@ main (int argc, char *argv[])\r
+>      for (i = 0; i < ARRAY_SIZE (commands); i++) {\r
+>      command = &commands[i];\r
+>  \r
+> -    if (strcmp (argv[1], command->name) == 0)\r
+> -        return (command->function) (local, argc - 1, &argv[1]);\r
+> +    if (strcmp (argv[1], command->name) == 0) {\r
+> +        int ret;\r
+> +        char *talloc_report;\r
+> +\r
+> +        ret = (command->function) (local, argc - 1, &argv[1]);\r
+> +\r
+> +        talloc_report=getenv ("NOTMUCH_TALLOC_REPORT");\r
+\r
+Missing spaces around =.\r
+\r
+I think hacking this in as an environment variable is fine, but maybe\r
+there should be a comment here saying that it would be better to\r
+follow Samba's talloc command-line argument conventions?\r
+\r
+> +        if (talloc_report && strcmp(talloc_report, "") != 0) {\r
+\r
+Missing space before paren.\r
+\r
+> +            FILE *report = fopen (talloc_report, "w");\r
+> +            talloc_report_full (NULL, report);\r
+\r
+Maybe I'm missing something here, but don't you have to call\r
+talloc_enable_leak_report_full before the first use of talloc to get a\r
+complete leak report?\r
+\r
+> +        }\r
+> +\r
+> +        return ret;\r
+> +    }\r
+>      }\r
+>  \r
+>      fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",\r