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