[Patch v2 1/4] CLI: add talloc leak report, controlled by an environment variable.

diff --git a/4c/1f64d800ef6bd88d05c761d29da9118150de9e b/4c/1f64d800ef6bd88d05c761d29da9118150de9e
new file mode 100644 (file)
index 0000000..53f3132
--- /dev/null
+++ b/4c/1f64d800ef6bd88d05c761d29da9118150de9e
@@ -0,0 +1,103 @@
+Return-Path: <bremner@tethera.net>\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 3B480431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 26 Dec 2012 13:58:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 FFsvqXYfwYM2 for <notmuch@notmuchmail.org>;\r
+       Wed, 26 Dec 2012 13:58:57 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id ACEEF429E28\r
+       for <notmuch@notmuchmail.org>; Wed, 26 Dec 2012 13:58:51 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Tnyzv-0002wg-Pv; Wed, 26 Dec 2012 17:58:47 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Tnyzq-0002Xq-9y; Wed, 26 Dec 2012 17:58:42 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 1/4] CLI: add talloc leak report,\r
+       controlled by an environment variable.\r
+Date: Wed, 26 Dec 2012 17:58:28 -0400\r
+Message-Id: <1356559111-9447-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1356559111-9447-1-git-send-email-david@tethera.net>\r
+References: <1356559111-9447-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: 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: Wed, 26 Dec 2012 21:58:58 -0000\r
+\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 |   24 ++++++++++++++++++++++--\r
+ 1 file changed, 22 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch.c b/notmuch.c\r
+index ee2892e..6b7aae8 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -321,8 +321,28 @@ 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
++          /* in the future support for this environment variable may\r
++           * be supplemented or replaced by command line arguments\r
++           * --leak-report and/or --leak-report-full */\r
++\r
++          talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");\r
++\r
++          /* this relies on the previous call to\r
++           * talloc_enable_null_tracking */\r
++\r
++          if (talloc_report && strcmp (talloc_report, "") != 0) {\r
++              FILE *report = fopen (talloc_report, "w");\r
++              talloc_report_full (NULL, report);\r
++          }\r
++\r
++          return ret;\r
++      }\r
+     }\r
+ \r
+     fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",\r
+-- \r
+1.7.10.4\r
+\r