summaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-08-11 12:29:46 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-08-11 12:30:24 +0200
commit41709673f0165f16496ecf37162ed7dac06b5295 (patch)
treec213da683873bbe88927a3de58eb93f3f231a693 /staging_vespalib
parent2fe073e8e1875bc891c38099c880d156bd228e9d (diff)
Use std::atomic all over and completely get rid of homegrown atomics.
Diffstat (limited to 'staging_vespalib')
-rw-r--r--staging_vespalib/src/vespa/vespalib/stllike/cache.h4
-rw-r--r--staging_vespalib/src/vespa/vespalib/stllike/cache.hpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/stllike/cache.h b/staging_vespalib/src/vespa/vespalib/stllike/cache.h
index daee7ad7194..832e6ede43d 100644
--- a/staging_vespalib/src/vespa/vespalib/stllike/cache.h
+++ b/staging_vespalib/src/vespa/vespalib/stllike/cache.h
@@ -3,7 +3,7 @@
#include <vespa/vespalib/stllike/lrucache_map.h>
#include <vespa/vespalib/util/sync.h>
-#include <vespa/vespalib/util/atomic.h>
+#include <atomic>
namespace vespalib {
@@ -142,7 +142,7 @@ private:
size_t _sizeBytes;
mutable size_t _hit;
mutable size_t _miss;
- mutable size_t _noneExisting;
+ std::atomic<size_t> _noneExisting;
mutable size_t _race;
mutable size_t _insert;
mutable size_t _write;
diff --git a/staging_vespalib/src/vespa/vespalib/stllike/cache.hpp b/staging_vespalib/src/vespa/vespalib/stllike/cache.hpp
index 46edf740993..06e7e249ec6 100644
--- a/staging_vespalib/src/vespa/vespalib/stllike/cache.hpp
+++ b/staging_vespalib/src/vespa/vespalib/stllike/cache.hpp
@@ -106,7 +106,7 @@ cache<P>::read(const K & key)
_sizeBytes += calcSize(key, value);
_insert++;
} else {
- vespalib::Atomic::postInc(&_noneExisting);
+ _noneExisting.fetch_add(1);
}
return value;
}