1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 421AC431FCF
\r
6 for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 10:26:43 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 9GP82TeDpERI for <notmuch@notmuchmail.org>;
\r
16 Sat, 19 Jan 2013 10:26:42 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id C0377431FD0
\r
21 for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 10:26:11 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.82.78] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1Twd7J-0007xL-7c; Sat, 19 Jan 2013 14:26:09 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1Twd7D-0005au-L9; Sat, 19 Jan 2013 14:26:03 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 5/7] CLI: add --leak-report top level option
\r
34 Date: Sat, 19 Jan 2013 14:25:56 -0400
\r
35 Message-Id: <1358619958-21209-6-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
37 In-Reply-To: <1358619958-21209-1-git-send-email-david@tethera.net>
\r
38 References: <1358619958-21209-1-git-send-email-david@tethera.net>
\r
40 Cc: David Bremner <bremner@debian.org>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Sat, 19 Jan 2013 18:26:43 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 This roughly mimics the samba4 argument. The presence of the command
\r
58 line argument overrides any value of NOTMUCH_TALLOC_REPORT in the
\r
61 man/man1/notmuch.1 | 8 ++++++++
\r
62 notmuch.c | 18 +++++++-----------
\r
63 2 files changed, 15 insertions(+), 11 deletions(-)
\r
65 diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1
\r
66 index 6bf9b2e..5c58c41 100644
\r
67 --- a/man/man1/notmuch.1
\r
68 +++ b/man/man1/notmuch.1
\r
69 @@ -70,6 +70,14 @@ Print a synopsis of available commands and exit.
\r
70 Print the installed version of notmuch, and exit.
\r
75 +.BI \-\-leak-report= path
\r
77 +Write a detailed report of all memory allocated via talloc to
\r
84 diff --git a/notmuch.c b/notmuch.c
\r
85 index a674481..f8d4b35 100644
\r
88 @@ -250,11 +250,13 @@ main (int argc, char *argv[])
\r
91 notmuch_bool_t print_help=FALSE, print_version=FALSE;
\r
92 + const char* leak_report=NULL;
\r
95 notmuch_opt_desc_t options[] = {
\r
96 { NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },
\r
97 { NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },
\r
98 + { NOTMUCH_OPT_STRING, &leak_report, "leak-report", 'l', 0 },
\r
102 @@ -290,21 +292,15 @@ main (int argc, char *argv[])
\r
104 if (strcmp (argv[opt_index], command->name) == 0) {
\r
106 - char *talloc_report;
\r
108 ret = (command->function)(local, argc - opt_index, argv + opt_index);
\r
110 - /* in the future support for this environment variable may
\r
111 - * be supplemented or replaced by command line arguments
\r
112 - * --leak-report and/or --leak-report-full */
\r
114 - talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
\r
116 - /* this relies on the previous call to
\r
117 - * talloc_enable_null_tracking */
\r
118 + if (leak_report == NULL) {
\r
119 + leak_report = getenv ("NOTMUCH_TALLOC_REPORT");
\r
122 - if (talloc_report && strcmp (talloc_report, "") != 0) {
\r
123 - FILE *report = fopen (talloc_report, "w");
\r
124 + if (leak_report && (strcmp (leak_report, "") != 0)) {
\r
125 + FILE *report = fopen (leak_report, "w");
\r
126 talloc_report_full (NULL, report);
\r