From 737877e62467b924eea0a43eab68258b0c13db78 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 13 Feb 2017 09:48:12 +0200 Subject: Add MT-safe variable_cache, use for variable overrides --- build2/variable.txx | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'build2/variable.txx') diff --git a/build2/variable.txx b/build2/variable.txx index b993200..5b212f0 100644 --- a/build2/variable.txx +++ b/build2/variable.txx @@ -552,4 +552,73 @@ namespace build2 &map_compare, &default_empty> }; + + // variable_cache + // + template + pair variable_cache:: + insert (K k, const lookup& stem) + { + const variable_map* vars (stem.vars); // NULL if undefined. + size_t ver ( + stem.defined () + ? static_cast (stem.value)->version + : 0); + + shared_mutex& m ( + variable_cache_mutex_shard[ + hash () (this) % variable_cache_mutex_shard_size]); + + slock sl (m); + ulock ul (m, defer_lock); + + auto i (m_.find (k)); + + // Cache hit. + // + if (i != m_.end () && + i->second.stem_vars == vars && + i->second.stem_version == ver) + return pair (i->second.value, move (ul)); + + // Relock for exclusive access. Note that it is entirely possible + // that between unlock and lock someone else has updated the entry. + // + sl.unlock (); + ul.lock (); + + // Note that the cache entries are never removed so we can reuse the + // iterator. + // + pair p (i, i == m_.end ()); + + if (p.second) + p = m_.emplace (move (k), entry_type {value (nullptr), vars, ver}); + + entry_type& e (p.first->second); + + // Cache miss. + // + if (p.second) + ; + // + // Cache invalidation. + // + else if (e.stem_vars != vars || e.stem_version != ver) + { + if (e.stem_vars != vars) + e.stem_vars = vars; + else + assert (e.stem_version <= ver); + + e.stem_version = ver; + } + // + // Cache hit. + // + else + ul.unlock (); + + return pair (e.value, move (ul)); + } } -- cgit v1.1