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 A81AD431FB6 for ; Sun, 30 Jan 2011 20:34:03 -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=[RCVD_IN_DNSWL_NONE=-0.0001] 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 W5P5rms446uJ for ; Sun, 30 Jan 2011 20:34:03 -0800 (PST) Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU [18.7.68.34]) by olra.theworths.org (Postfix) with ESMTP id 25887431FB5 for ; Sun, 30 Jan 2011 20:34:03 -0800 (PST) X-AuditID: 12074422-b7c3eae000000a70-de-4d463bbad04e Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) by dmz-mailsec-scanner-5.mit.edu (Symantec Brightmail Gateway) with SMTP id 78.CC.02672.ABB364D4; Sun, 30 Jan 2011 23:34:02 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id p0V4Y2XT015590 for ; Sun, 30 Jan 2011 23:34:02 -0500 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p0V4Y1ot008239 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT) for ; Sun, 30 Jan 2011 23:34:02 -0500 (EST) Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.72) (envelope-from ) id 1PjlSU-00070D-AY for notmuch@notmuchmail.org; Sun, 30 Jan 2011 23:33:46 -0500 Date: Sun, 30 Jan 2011 23:33:41 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 9/8] qparser: Delete (and thus close) the Xapian database. Message-ID: <20110131043341.GB13226@mit.edu> References: <1295165458-9573-1-git-send-email-amdragon@mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1295165458-9573-1-git-send-email-amdragon@mit.edu> User-Agent: Mutt/1.5.20 (2009-06-14) X-Brightmail-Tracker: AAAAAA== 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: Mon, 31 Jan 2011 04:34:03 -0000 I removed this line in a bout of overzealous deletions. The visible consequence was that the database was being unlocked lazily, resulting in a brief window after notmuch had exited but the database was still locked. --- I admit this patch series numbering is getting a little out of hand. As usual, this can be found on the qparser branch at http://awakening.csail.mit.edu/git/notmuch.git lib/database.cc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 7253bdf..3c488a9 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -826,6 +826,7 @@ notmuch_database_close (notmuch_database_t *notmuch) } delete notmuch->term_gen; + delete notmuch->xapian_db; talloc_free (notmuch); } -- 1.7.2.3