From 3b5fa8d50cd7e4db0691884effcbdc7809ad9ed9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Oct 2014 21:29:20 +0200 Subject: [PATCH] Don't recompile the same regex over and over --- src/libexpr/names.cc | 5 ++--- src/libexpr/names.hh | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/libexpr/names.cc b/src/libexpr/names.cc index c2b273334..cda5aa195 100644 --- a/src/libexpr/names.cc +++ b/src/libexpr/names.cc @@ -1,6 +1,5 @@ #include "names.hh" #include "util.hh" -#include "regex.hh" namespace nix { @@ -34,8 +33,8 @@ DrvName::DrvName(const string & s) : hits(0) bool DrvName::matches(DrvName & n) { if (name != "*") { - Regex regex(name); - if (!regex.matches(n.name)) return false; + if (!regex) regex = std::shared_ptr(new Regex(name)); + if (!regex->matches(n.name)) return false; } if (version != "" && version != n.version) return false; return true; diff --git a/src/libexpr/names.hh b/src/libexpr/names.hh index ebe113e82..4b3dcddf7 100644 --- a/src/libexpr/names.hh +++ b/src/libexpr/names.hh @@ -1,6 +1,9 @@ #pragma once +#include + #include "types.hh" +#include "regex.hh" namespace nix { @@ -14,6 +17,9 @@ struct DrvName DrvName(); DrvName(const string & s); bool matches(DrvName & n); + +private: + std::shared_ptr regex; }; typedef list DrvNames;