From nobody Wed May 14 11:58:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1524486552857404.9638827907604; Mon, 23 Apr 2018 05:29:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 715472B0A9A; Mon, 23 Apr 2018 12:29:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D52CB77DB9; Mon, 23 Apr 2018 12:29:10 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8AD1B4CAA4; Mon, 23 Apr 2018 12:29:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3NCSom9007503 for ; Mon, 23 Apr 2018 08:28:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4FB317C54; Mon, 23 Apr 2018 12:28:50 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4AD383B81; Mon, 23 Apr 2018 12:28:49 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 23 Apr 2018 13:28:40 +0100 Message-Id: <20180423122841.10955-4-berrange@redhat.com> In-Reply-To: <20180423122841.10955-1-berrange@redhat.com> References: <20180423122841.10955-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [PATCH v2 3/4] log: support logging using shell wildcard syntax X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 23 Apr 2018 12:29:12 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Rather than specialcasing handling of the '*' character, use fnmatch() to get normal shell wildcard syntax, as described in 'man glob(7)'. To get an indication of the performance impact of using globs instead of plain string matches, a test program was written. The list of all 260 log categories was extracted from the source. Then a typical log filters setup was picked by creating an array of the strings "qemu", "security", "util", "cgroup", "event", "object". Every filter string was matched against every log category. Timing information showed that using strstr() this took 8 microseconds, while fnmatch() took 114 microseconds. IOW, fnmatch is 14 times slower than our existing strstr check. These numbers show a worst case scenario that wil never be hit, because it is rare that every log category would have data output. The log category matches are cached, so each category is only checked once no matter how many log statements are emitted. IOW despite being slower, this will be lost in the noise and have no consequence on real world logging performance. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Ferlan --- src/util/virlog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 5262d613f6..be9fc0cf78 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -40,6 +40,7 @@ #if HAVE_SYS_UN_H # include #endif +#include =20 #include "virerror.h" #include "virlog.h" @@ -508,7 +509,7 @@ virLogSourceUpdate(virLogSourcePtr source) size_t i; =20 for (i =3D 0; i < virLogNbFilters; i++) { - if (strstr(source->name, virLogFilters[i]->match)) { + if (fnmatch(virLogFilters[i]->match, source->name, 0) =3D=3D 0= ) { priority =3D virLogFilters[i]->priority; flags =3D virLogFilters[i]->flags; break; --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list