[PATCH 1/2] lib: write talloc report in notmuch_database_destroy

[PATCH 1/2] lib: write talloc report in notmuch_database_destroy

[David Bremner]

Since most memory allocation is (ultimately) in the talloc context
defined by a notmuch_database_t pointer, this gives a more complete
view of memory still allocated at program shutdown.

We also change the talloc report in notmuch.c to mode "a" to avoid
clobbering the newly reported log.
---
 lib/database.cc | 9 +++++++++
 notmuch.c       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/database.cc b/lib/database.cc
index 96458f6f..0052cb65 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -733,6 +733,15 @@ notmuch_status_t
 notmuch_database_destroy (notmuch_database_t *notmuch)
 {
     notmuch_status_t status;
+    const char* talloc_report;
+
+    talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
+    if (talloc_report && strcmp (talloc_report, "") != 0) {
+	FILE *report = fopen (talloc_report, "a");
+	if (report) {
+	    talloc_report_full (notmuch, report);
+	}
+    }
 
     status = notmuch_database_close (notmuch);
 
diff --git a/notmuch.c b/notmuch.c
index d0a94fc2..1404b70c 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -589,7 +589,7 @@ main (int argc, char *argv[])
 	 * talloc_enable_null_tracking
 	 */
 
-	FILE *report = fopen (talloc_report, "w");
+	FILE *report = fopen (talloc_report, "a");
 	if (report) {
 	    talloc_report_full (NULL, report);
 	} else {
-- 
2.30.2

[PATCH 2/2] lib/config: fix memory leak

[David Bremner]

This commit fixes a small memory leak (per iterator restart) by
actually using the talloc context intended to be blown away on
restart.
---
 lib/config.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config.cc b/lib/config.cc
index 0ec66372..368ed669 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -318,7 +318,7 @@ notmuch_config_values_valid (notmuch_config_values_t *values)
 const char *
 notmuch_config_values_get (notmuch_config_values_t *values)
 {
-    return talloc_strndup (values, values->iterator, values->tok_len);
+    return talloc_strndup (values->children, values->iterator, values->tok_len);
 }
 
 void
-- 
2.30.2

Re: [PATCH 2/2] lib/config: fix memory leak

[David Bremner]

David Bremner <david@tethera.net> writes:

> This commit fixes a small memory leak (per iterator restart) by
> actually using the talloc context intended to be blown away on
> restart.
> ---
>  lib/config.cc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/config.cc b/lib/config.cc
> index 0ec66372..368ed669 100644
> --- a/lib/config.cc
> +++ b/lib/config.cc
> @@ -318,7 +318,7 @@ notmuch_config_values_valid (notmuch_config_values_t *values)
>  const char *
>  notmuch_config_values_get (notmuch_config_values_t *values)
>  {
> -    return talloc_strndup (values, values->iterator, values->tok_len);
> +    return talloc_strndup (values->children, values->iterator, values->tok_len);
>  }

applied to release and master

d

Re: [PATCH 1/2] lib: write talloc report in notmuch_database_destroy

[David Bremner]

David Bremner <david@tethera.net> writes:
>      notmuch_status_t status;
> +    const char* talloc_report;

uncrustify tells me that should be

           const char *talloc_report

fixed in git.

Re: [PATCH 1/2] lib: write talloc report in notmuch_database_destroy

[David Bremner]

David Bremner <david@tethera.net> writes:

> Since most memory allocation is (ultimately) in the talloc context
> defined by a notmuch_database_t pointer, this gives a more complete
> view of memory still allocated at program shutdown.
>
> We also change the talloc report in notmuch.c to mode "a" to avoid
> clobbering the newly reported log.

applied to master

d