From patchwork Fri May 10 06:48:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Leblond X-Patchwork-Id: 242920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 36B8E2C009B for ; Fri, 10 May 2013 17:05:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751235Ab3EJHF2 (ORCPT ); Fri, 10 May 2013 03:05:28 -0400 Received: from ks28632.kimsufi.com ([91.121.96.152]:51566 "EHLO ks28632.kimsufi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750825Ab3EJHF1 (ORCPT ); Fri, 10 May 2013 03:05:27 -0400 Received: from bayen.regit.org ([81.57.69.189] helo=ice-age.regit.org) by ks28632.kimsufi.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Uah8z-0007YZ-Iw; Fri, 10 May 2013 08:49:29 +0200 From: Eric Leblond To: netfilter-devel@vger.kernel.org Cc: Eric Leblond Subject: [PATCH 11/11] db: db ring has precedence over backlog. Date: Fri, 10 May 2013 08:48:58 +0200 Message-Id: <1368168538-29780-12-git-send-email-eric@regit.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368168538-29780-1-git-send-email-eric@regit.org> References: <1368168538-29780-1-git-send-email-eric@regit.org> X-Spam-Score: -2.9 (--) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Eric Leblond --- util/db.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/util/db.c b/util/db.c index c23c362..6be06e6 100644 --- a/util/db.c +++ b/util/db.c @@ -177,9 +177,14 @@ int ulogd_db_configure(struct ulogd_pluginstance *upi, INIT_LLIST_HEAD(&di->backlog); di->backlog_memusage = 0; - + + di->ring.size = ringsize_ce(upi->config_kset).u.value; di->backlog_memcap = backlog_memcap_ce(upi->config_kset).u.value; - if (di->backlog_memcap > 0) { + + if (di->ring.size && di->backlog_memcap) { + ulogd_log(ULOGD_ERROR, "Ring buffer has precedence over backlog\n"); + di->backlog_memcap = 0; + } else if (di->backlog_memcap > 0) { di->backlog_oneshot = backlog_oneshot_ce(upi->config_kset).u.value; if (di->backlog_oneshot <= 2) { ulogd_log(ULOGD_ERROR, @@ -190,9 +195,6 @@ int ulogd_db_configure(struct ulogd_pluginstance *upi, di->backlog_full = 0; } - /* check ring option */ - di->ring.size = ringsize_ce(upi->config_kset).u.value; - return ret; }