projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds writer test case for RCU
[folly.git]
/
folly
/
MicroSpinLock.h
diff --git
a/folly/MicroSpinLock.h
b/folly/MicroSpinLock.h
index ee2c4420f62a33953d68d94885708ece6cddfe0b..17d181f79dc2dfee75cd9430e21aa5c676d6b532 100644
(file)
--- a/
folly/MicroSpinLock.h
+++ b/
folly/MicroSpinLock.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
7
Facebook, Inc.
+ * Copyright 201
5-present
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-39,16
+39,14
@@
#include <array>
#include <atomic>
#include <array>
#include <atomic>
-#include <c
inttypes
>
-#include <cstd
lib
>
+#include <c
assert
>
+#include <cstd
int
>
#include <mutex>
#include <type_traits>
#include <mutex>
#include <type_traits>
-#include <boost/noncopyable.hpp>
-#include <glog/logging.h>
-
#include <folly/Portability.h>
#include <folly/Portability.h>
-#include <folly/detail/Sleeper.h>
+#include <folly/lang/Align.h>
+#include <folly/synchronization/detail/Sleeper.h>
namespace folly {
namespace folly {
@@
-86,11
+84,11
@@
struct MicroSpinLock {
sleeper.wait();
}
} while (!try_lock());
sleeper.wait();
}
} while (!try_lock());
-
DCHECK
(payload()->load() == LOCKED);
+
assert
(payload()->load() == LOCKED);
}
void unlock() {
}
void unlock() {
-
CHECK
(payload()->load() == LOCKED);
+
assert
(payload()->load() == LOCKED);
payload()->store(FREE, std::memory_order_release);
}
payload()->store(FREE, std::memory_order_release);
}
@@
-121,7
+119,7
@@
static_assert(
#define FOLLY_CACHE_LINE_SIZE 64
template <class T, size_t N>
#define FOLLY_CACHE_LINE_SIZE 64
template <class T, size_t N>
-struct
FOLLY_ALIGNED_MAX
SpinLockArray {
+struct
alignas(max_align_v)
SpinLockArray {
T& operator[](size_t i) {
return data_[i].lock;
}
T& operator[](size_t i) {
return data_[i].lock;
}
@@
-143,9
+141,8
@@
struct FOLLY_ALIGNED_MAX SpinLockArray {
// Check if T can theoretically cross a cache line.
static_assert(
// Check if T can theoretically cross a cache line.
static_assert(
- folly::max_align_v > 0 &&
- FOLLY_CACHE_LINE_SIZE % folly::max_align_v == 0 &&
- sizeof(T) <= folly::max_align_v,
+ max_align_v > 0 && FOLLY_CACHE_LINE_SIZE % max_align_v == 0 &&
+ sizeof(T) <= max_align_v,
"T can cross cache line boundaries");
char padding_[FOLLY_CACHE_LINE_SIZE];
"T can cross cache line boundaries");
char padding_[FOLLY_CACHE_LINE_SIZE];
@@
-158,4
+155,4
@@
typedef std::lock_guard<MicroSpinLock> MSLGuard;
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
-}
+}
// namespace folly