[PATCH] Actually close the xapian database in notmuch_database_close

diff --git a/37/4a33ffe99f92a52d2083f5f85c88458f8873ba b/37/4a33ffe99f92a52d2083f5f85c88458f8873ba
new file mode 100644 (file)
index 0000000..7fc7e59
--- /dev/null
+++ b/37/4a33ffe99f92a52d2083f5f85c88458f8873ba
@@ -0,0 +1,96 @@
+Return-Path: <teythoon@jade-hamburg.de>\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 9A3B4431FB6\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 06:58:55 -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 rOSot76qKhGj for <notmuch@notmuchmail.org>;\r
+       Fri,  2 Mar 2012 06:58:54 -0800 (PST)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B5C8E431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 06:58:54 -0800 (PST)\r
+Received: from mail.jade-hamburg.de (unknown [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id EF2E05756A2\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 15:58:52 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 626A3DF2A6; Fri,  2 Mar 2012 15:58:52 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id 280BCDF2A2;\r
+       Fri,  2 Mar 2012 15:58:50 +0100 (CET)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1S3TwX-0006uY-Sk; Fri, 02 Mar 2012 15:58:49 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Actually close the xapian database in notmuch_database_close\r
+Date: Fri,  2 Mar 2012 15:58:39 +0100\r
+Message-Id:\r
+ <1330700319-26531-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <20120301181141.GA4797@mit.edu>\r
+References: <20120301181141.GA4797@mit.edu>\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, 02 Mar 2012 14:58:56 -0000\r
+\r
+Formerly the xapian database object was deleted and closed in its\r
+destructor once the object was garbage collected. Explicitly call\r
+close() so that the database and the associated lock is released\r
+immediately.\r
+\r
+The comment is a courtesy of Austin Clements.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ lib/database.cc |   11 +++++++++++\r
+ 1 files changed, 11 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 5efa85e..8f8df1a 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -726,6 +726,17 @@ notmuch_database_close (notmuch_database_t *notmuch)\r
+       }\r
+     }\r
+ \r
++    /* Many Xapian objects (and thus notmuch objects) hold references to\r
++     * the database, so merely deleting the database may not suffice to\r
++     * close it.  Thus, we explicitly close it here. */\r
++    if (notmuch->xapian_db != NULL) {\r
++      try {\r
++          notmuch->xapian_db->close();\r
++      } catch (const Xapian::Error &error) {\r
++          /* do nothing */\r
++      }\r
++    }\r
++\r
+     delete notmuch->term_gen;\r
+     delete notmuch->query_parser;\r
+     delete notmuch->xapian_db;\r
+-- \r
+1.7.9.1\r
+\r