Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 3B480431FB6 for ; Wed, 26 Dec 2012 13:58:58 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FFsvqXYfwYM2 for ; Wed, 26 Dec 2012 13:58:57 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id ACEEF429E28 for ; Wed, 26 Dec 2012 13:58:51 -0800 (PST) Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net ([156.34.82.78] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Tnyzv-0002wg-Pv; Wed, 26 Dec 2012 17:58:47 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1Tnyzq-0002Xq-9y; Wed, 26 Dec 2012 17:58:42 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [Patch v2 1/4] CLI: add talloc leak report, controlled by an environment variable. Date: Wed, 26 Dec 2012 17:58:28 -0400 Message-Id: <1356559111-9447-2-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356559111-9447-1-git-send-email-david@tethera.net> References: <1356559111-9447-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Dec 2012 21:58:58 -0000 From: David Bremner The argument handling in notmuch.c seems due for an overhaul, but until then use an environment variable to specify a location to write the talloc leak report to. This is only enabled for the (interesting) case where some notmuch subcommand is invoked. --- notmuch.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/notmuch.c b/notmuch.c index ee2892e..6b7aae8 100644 --- a/notmuch.c +++ b/notmuch.c @@ -321,8 +321,28 @@ main (int argc, char *argv[]) for (i = 0; i < ARRAY_SIZE (commands); i++) { command = &commands[i]; - if (strcmp (argv[1], command->name) == 0) - return (command->function)(local, argc - 1, &argv[1]); + if (strcmp (argv[1], command->name) == 0) { + int ret; + char *talloc_report; + + ret = (command->function)(local, argc - 1, &argv[1]); + + /* in the future support for this environment variable may + * be supplemented or replaced by command line arguments + * --leak-report and/or --leak-report-full */ + + talloc_report = getenv ("NOTMUCH_TALLOC_REPORT"); + + /* this relies on the previous call to + * talloc_enable_null_tracking */ + + if (talloc_report && strcmp (talloc_report, "") != 0) { + FILE *report = fopen (talloc_report, "w"); + talloc_report_full (NULL, report); + } + + return ret; + } } fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", -- 1.7.10.4