Commit 7a0de7ae authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot 8

Use uint32_t rather than uint

Summary: Because `uint32_t` is standardized, and MSVC doesn't have `uint`.

Reviewed By: yfeldblum

Differential Revision: D3507011

fbshipit-source-id: ac0abb4ad1b2dbaa890554589817ce75abdd987e
parent 61a96501
...@@ -368,7 +368,7 @@ BENCHMARK(single_thread_posix_trywait, iters) { ...@@ -368,7 +368,7 @@ BENCHMARK(single_thread_posix_trywait, iters) {
EXPECT_EQ(sem_destroy(&sem), 0); EXPECT_EQ(sem_destroy(&sem), 0);
} }
static void contendedUse(uint n, int posters, int waiters) { static void contendedUse(uint32_t n, int posters, int waiters) {
LifoSemImpl<std::atomic> sem; LifoSemImpl<std::atomic> sem;
std::vector<std::thread> threads; std::vector<std::thread> threads;
...@@ -377,7 +377,7 @@ static void contendedUse(uint n, int posters, int waiters) { ...@@ -377,7 +377,7 @@ static void contendedUse(uint n, int posters, int waiters) {
BENCHMARK_SUSPEND { BENCHMARK_SUSPEND {
for (int t = 0; t < waiters; ++t) { for (int t = 0; t < waiters; ++t) {
threads.emplace_back([=,&sem] { threads.emplace_back([=,&sem] {
for (uint i = t; i < n; i += waiters) { for (uint32_t i = t; i < n; i += waiters) {
sem.wait(); sem.wait();
} }
}); });
...@@ -387,7 +387,7 @@ static void contendedUse(uint n, int posters, int waiters) { ...@@ -387,7 +387,7 @@ static void contendedUse(uint n, int posters, int waiters) {
while (!go.load()) { while (!go.load()) {
std::this_thread::yield(); std::this_thread::yield();
} }
for (uint i = t; i < n; i += posters) { for (uint32_t i = t; i < n; i += posters) {
sem.post(); sem.post();
} }
}); });
......
...@@ -531,56 +531,56 @@ static void runContendedReaders(size_t numOps, ...@@ -531,56 +531,56 @@ static void runContendedReaders(size_t numOps,
} }
} }
static void folly_rwspin_reads(uint numOps, static void folly_rwspin_reads(uint32_t numOps,
size_t numThreads, size_t numThreads,
bool useSeparateLocks) { bool useSeparateLocks) {
runContendedReaders<atomic, RWSpinLock, Locker>( runContendedReaders<atomic, RWSpinLock, Locker>(
numOps, numThreads, useSeparateLocks); numOps, numThreads, useSeparateLocks);
} }
static void shmtx_wr_pri_reads(uint numOps, static void shmtx_wr_pri_reads(uint32_t numOps,
size_t numThreads, size_t numThreads,
bool useSeparateLocks) { bool useSeparateLocks) {
runContendedReaders<atomic, SharedMutexWritePriority, TokenLocker>( runContendedReaders<atomic, SharedMutexWritePriority, TokenLocker>(
numOps, numThreads, useSeparateLocks); numOps, numThreads, useSeparateLocks);
} }
static void shmtx_w_bare_reads(uint numOps, static void shmtx_w_bare_reads(uint32_t numOps,
size_t numThreads, size_t numThreads,
bool useSeparateLocks) { bool useSeparateLocks) {
runContendedReaders<atomic, SharedMutexWritePriority, Locker>( runContendedReaders<atomic, SharedMutexWritePriority, Locker>(
numOps, numThreads, useSeparateLocks); numOps, numThreads, useSeparateLocks);
} }
static void shmtx_rd_pri_reads(uint numOps, static void shmtx_rd_pri_reads(uint32_t numOps,
size_t numThreads, size_t numThreads,
bool useSeparateLocks) { bool useSeparateLocks) {
runContendedReaders<atomic, SharedMutexReadPriority, TokenLocker>( runContendedReaders<atomic, SharedMutexReadPriority, TokenLocker>(
numOps, numThreads, useSeparateLocks); numOps, numThreads, useSeparateLocks);
} }
static void shmtx_r_bare_reads(uint numOps, static void shmtx_r_bare_reads(uint32_t numOps,
size_t numThreads, size_t numThreads,
bool useSeparateLocks) { bool useSeparateLocks) {
runContendedReaders<atomic, SharedMutexReadPriority, Locker>( runContendedReaders<atomic, SharedMutexReadPriority, Locker>(
numOps, numThreads, useSeparateLocks); numOps, numThreads, useSeparateLocks);
} }
static void folly_ticket_reads(uint numOps, static void folly_ticket_reads(uint32_t numOps,
size_t numThreads, size_t numThreads,
bool useSeparateLocks) { bool useSeparateLocks) {
runContendedReaders<atomic, RWTicketSpinLock64, Locker>( runContendedReaders<atomic, RWTicketSpinLock64, Locker>(
numOps, numThreads, useSeparateLocks); numOps, numThreads, useSeparateLocks);
} }
static void boost_shared_reads(uint numOps, static void boost_shared_reads(uint32_t numOps,
size_t numThreads, size_t numThreads,
bool useSeparateLocks) { bool useSeparateLocks) {
runContendedReaders<atomic, boost::shared_mutex, Locker>( runContendedReaders<atomic, boost::shared_mutex, Locker>(
numOps, numThreads, useSeparateLocks); numOps, numThreads, useSeparateLocks);
} }
static void pthrd_rwlock_reads(uint numOps, static void pthrd_rwlock_reads(uint32_t numOps,
size_t numThreads, size_t numThreads,
bool useSeparateLocks) { bool useSeparateLocks) {
runContendedReaders<atomic, PosixRWLock, Locker>( runContendedReaders<atomic, PosixRWLock, Locker>(
...@@ -649,7 +649,7 @@ static void folly_rwspin(size_t numOps, ...@@ -649,7 +649,7 @@ static void folly_rwspin(size_t numOps,
numOps, numThreads, writeFraction, useSeparateLocks); numOps, numThreads, writeFraction, useSeparateLocks);
} }
static void shmtx_wr_pri(uint numOps, static void shmtx_wr_pri(uint32_t numOps,
size_t numThreads, size_t numThreads,
double writeFraction, double writeFraction,
bool useSeparateLocks) { bool useSeparateLocks) {
...@@ -657,7 +657,7 @@ static void shmtx_wr_pri(uint numOps, ...@@ -657,7 +657,7 @@ static void shmtx_wr_pri(uint numOps,
numOps, numThreads, writeFraction, useSeparateLocks); numOps, numThreads, writeFraction, useSeparateLocks);
} }
static void shmtx_w_bare(uint numOps, static void shmtx_w_bare(uint32_t numOps,
size_t numThreads, size_t numThreads,
double writeFraction, double writeFraction,
bool useSeparateLocks) { bool useSeparateLocks) {
...@@ -665,7 +665,7 @@ static void shmtx_w_bare(uint numOps, ...@@ -665,7 +665,7 @@ static void shmtx_w_bare(uint numOps,
numOps, numThreads, writeFraction, useSeparateLocks); numOps, numThreads, writeFraction, useSeparateLocks);
} }
static void shmtx_rd_pri(uint numOps, static void shmtx_rd_pri(uint32_t numOps,
size_t numThreads, size_t numThreads,
double writeFraction, double writeFraction,
bool useSeparateLocks) { bool useSeparateLocks) {
...@@ -673,7 +673,7 @@ static void shmtx_rd_pri(uint numOps, ...@@ -673,7 +673,7 @@ static void shmtx_rd_pri(uint numOps,
numOps, numThreads, writeFraction, useSeparateLocks); numOps, numThreads, writeFraction, useSeparateLocks);
} }
static void shmtx_r_bare(uint numOps, static void shmtx_r_bare(uint32_t numOps,
size_t numThreads, size_t numThreads,
double writeFraction, double writeFraction,
bool useSeparateLocks) { bool useSeparateLocks) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment