Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A45DE9F3C for ; Mon, 28 Nov 2011 13:02:05 +0000 (UTC) Received: (qmail 58358 invoked by uid 500); 28 Nov 2011 13:02:05 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 58325 invoked by uid 500); 28 Nov 2011 13:02:05 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 58318 invoked by uid 99); 28 Nov 2011 13:02:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Nov 2011 13:02:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Nov 2011 13:02:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 72A8555B00; Mon, 28 Nov 2011 13:01:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fdmanana@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Avoid unnecessary call when there's no heartbeat defined Message-Id: <20111128130144.72A8555B00@tyr.zones.apache.org> Date: Mon, 28 Nov 2011 13:01:44 +0000 (UTC) Avoid unnecessary call when there's no heartbeat defined To avoid unncessary process preemption everytime the filter function returns false. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/dc1342d8 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/dc1342d8 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/dc1342d8 Branch: refs/heads/1.2.x Commit: dc1342d8f50a65b60df80b51206bb2927812ed82 Parents: 6b530aa Author: Filipe David Borba Manana Authored: Mon Nov 28 12:26:08 2011 +0000 Committer: Filipe David Borba Manana Committed: Mon Nov 28 13:01:06 2011 +0000 ---------------------------------------------------------------------- src/couchdb/couch_changes.erl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/dc1342d8/src/couchdb/couch_changes.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_changes.erl b/src/couchdb/couch_changes.erl index a20a15e..b0fdb06 100644 --- a/src/couchdb/couch_changes.erl +++ b/src/couchdb/couch_changes.erl @@ -527,12 +527,12 @@ reset_heartbeat() -> put(last_changes_heartbeat,now()). maybe_heartbeat(Timeout, TimeoutFun, Acc) -> - Now = now(), Before = get(last_changes_heartbeat), case Before of undefined -> {ok, Acc}; _ -> + Now = now(), case timer:now_diff(Now, Before) div 1000 >= Timeout of true -> Acc2 = TimeoutFun(Acc),