MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-10 22:18:54 +02:00
Code Issues Releases Wiki Activity

ircd: Upgrade various templates with argument deduction.

Browse source
This commit is contained in:
Jason Volk 2019-03-02 12:33:32 -08:00
parent a21e03df27
commit 47bcfaecb4
8 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ircd/ctx.cc
View file

@ -1865,7 +1865,7 @@ ircd::ctx::ole::init::init()
ircd::ctx::ole::init::~init()
noexcept
{
std::unique_lock<decltype(mutex)> lock(mutex);
std::unique_lock lock(mutex);
termination = true;
cond.notify_all();
cond.wait(lock, []
@ -1927,7 +1927,7 @@ ircd::ctx::ole::push(closure &&func)
if(unlikely(threads.size() < size_t(thread_max)))
threads.emplace_back(&worker);
const std::lock_guard<decltype(mutex)> lock(mutex);
const std::lock_guard lock(mutex);
queue.emplace_back(std::move(func));
cond.notify_all();
}
@ -1944,7 +1944,7 @@ noexcept try
}
catch(const interrupted &)
{
std::unique_lock<decltype(mutex)> lock(mutex);
std::unique_lock lock(mutex);
const auto it(std::find_if(begin(threads), end(threads), []
(const auto &thread)
{
@ -1961,7 +1961,7 @@ catch(const interrupted &)
ircd::ctx::ole::closure
ircd::ctx::ole::pop()
{
std::unique_lock<decltype(mutex)> lock(mutex);
std::unique_lock lock(mutex);
cond.wait(lock, []
{
if(!queue.empty())

22
ircd/db.cc
View file

@ -416,7 +416,7 @@ ircd::db::resume(database &d)
{
assert(d.d);
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(write_mutex)> lock{write_mutex};
const std::lock_guard lock{write_mutex};
const auto errors
{
db::errors(d)
@ -538,7 +538,7 @@ ircd::db::checkpoint(database &d)
name(d)
};
const std::lock_guard<decltype(write_mutex)> lock{write_mutex};
const std::lock_guard lock{write_mutex};
const ctx::uninterruptible::nothrow ui;
const auto seqnum
{
@ -1363,7 +1363,7 @@ ircd::db::database::~database()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::unique_lock<decltype(write_mutex)> lock{write_mutex};
const std::unique_lock lock{write_mutex};
log::info
{
log, "'%s': closing database @ `%s'...",
@ -5239,7 +5239,7 @@ ircd::db::sort(column &column,
opts.allow_write_stall = now;
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(write_mutex)> lock{write_mutex};
const std::lock_guard lock{write_mutex};
log::debug
{
log, "'%s':'%s' @%lu FLUSH (sort) %s %s",
@ -5278,7 +5278,7 @@ ircd::db::compact(column &column,
continue;
const ctx::uninterruptible ui;
const std::lock_guard<decltype(write_mutex)> lock
const std::lock_guard lock
{
write_mutex
};
@ -5433,7 +5433,7 @@ ircd::db::ingest(column &column,
{ std::string{path} }
};
const std::lock_guard<decltype(write_mutex)> lock{write_mutex};
const std::lock_guard lock{write_mutex};
const ctx::uninterruptible::nothrow ui;
throw_on_error
{
@ -5450,7 +5450,7 @@ ircd::db::del(column &column,
database::column &c(column);
auto opts(make_opts(sopts));
const std::lock_guard<decltype(write_mutex)> lock{write_mutex};
const std::lock_guard lock{write_mutex};
const ctx::uninterruptible::nothrow ui;
log::debug
{
@ -5475,7 +5475,7 @@ ircd::db::del(column &column,
database::column &c(column);
auto opts(make_opts(sopts));
const std::lock_guard<decltype(write_mutex)> lock{write_mutex};
const std::lock_guard lock{write_mutex};
const ctx::uninterruptible::nothrow ui;
log::debug
{
@ -5502,7 +5502,7 @@ ircd::db::write(column &column,
database::column &c(column);
auto opts(make_opts(sopts));
const std::lock_guard<decltype(write_mutex)> lock{write_mutex};
const std::lock_guard lock{write_mutex};
const ctx::uninterruptible::nothrow ui;
log::debug
{
@ -6333,7 +6333,7 @@ ircd::db::for_each(const rocksdb::Cache &cache,
// C-style callback for RocksDB, we have to make use of this function
// exclusive for different contexts.
thread_local ctx::mutex mutex;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
thread_local rocksdb::Cache *_cache;
_cache = const_cast<rocksdb::Cache *>(&cache);
@ -6869,7 +6869,7 @@ ircd::db::commit(database &d,
ircd::timer timer;
#endif
const std::lock_guard<decltype(write_mutex)> lock{write_mutex};
const std::lock_guard lock{write_mutex};
const ctx::uninterruptible ui;
throw_on_error
{

44
ircd/db_env.cc
View file

@ -1299,7 +1299,7 @@ ircd::db::database::env::writable_file::Close()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
if(!fd)
return Status::OK();
@ -1347,7 +1347,7 @@ ircd::db::database::env::writable_file::Flush()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1396,7 +1396,7 @@ ircd::db::database::env::writable_file::Sync()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1441,7 +1441,7 @@ ircd::db::database::env::writable_file::Fsync()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1487,7 +1487,7 @@ ircd::db::database::env::writable_file::RangeSync(uint64_t offset,
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1551,7 +1551,7 @@ ircd::db::database::env::writable_file::Truncate(uint64_t size)
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1605,7 +1605,7 @@ ircd::db::database::env::writable_file::InvalidateCache(size_t offset,
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1663,7 +1663,7 @@ noexcept try
{
assert(!opts.direct);
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1726,7 +1726,7 @@ noexcept try
{
assert(!opts.direct);
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1792,7 +1792,7 @@ ircd::db::database::env::writable_file::Allocate(uint64_t offset,
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1851,7 +1851,7 @@ ircd::db::database::env::writable_file::PrepareWrite(size_t offset,
noexcept
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1945,7 +1945,7 @@ ircd::db::database::env::writable_file::GetPreallocationStatus(size_t *const blo
noexcept
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
*block_size = this->preallocation_block_size;
*last_allocated_block = this->preallocation_last_block;
@ -1969,7 +1969,7 @@ ircd::db::database::env::writable_file::SetPreallocationBlockSize(size_t size)
noexcept
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -1989,7 +1989,7 @@ ircd::db::database::env::writable_file::GetFileSize()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -2169,7 +2169,7 @@ ircd::db::database::env::writable_file_direct::Close()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
if(!fd)
return Status::OK();
@ -2225,7 +2225,7 @@ ircd::db::database::env::writable_file_direct::Truncate(uint64_t size)
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -2279,7 +2279,7 @@ ircd::db::database::env::writable_file_direct::Append(const Slice &s)
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
if(!aligned(logical_offset) || !aligned(data(s)))
log::dwarning
@ -2364,7 +2364,7 @@ ircd::db::database::env::writable_file_direct::PositionedAppend(const Slice &s,
noexcept
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -2390,7 +2390,7 @@ ircd::db::database::env::writable_file_direct::GetFileSize()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
#ifdef RB_DEBUG_DB_ENV
log::debug
@ -2857,7 +2857,7 @@ ircd::db::database::env::sequential_file::Read(size_t length,
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::unique_lock<decltype(mutex)> lock
const std::unique_lock lock
{
mutex, std::try_to_lock
};
@ -2946,7 +2946,7 @@ ircd::db::database::env::sequential_file::PositionedRead(uint64_t offset,
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::unique_lock<decltype(mutex)> lock
const std::unique_lock lock
{
mutex, std::try_to_lock
};
@ -3031,7 +3031,7 @@ ircd::db::database::env::sequential_file::Skip(uint64_t size)
noexcept
{
const ctx::uninterruptible::nothrow ui;
const std::unique_lock<decltype(mutex)> lock
const std::unique_lock lock
{
mutex, std::try_to_lock
};

2
ircd/m.cc
View file

@ -789,7 +789,7 @@ ircd::m::sync::item::poll(data &data,
const m::event &event)
try
{
const scope_restore<decltype(data.event)> theirs
const scope_restore theirs
{
data.event, &event
};

2
modules/client/sync/presence.cc
View file

@ -91,7 +91,7 @@ ircd::m::sync::presence_polylog(data &data)
// Lock the json::stack for the append operations. This mutex will only be
// contended during a json::stack flush to the client; not during database
// queries leading to this.
const std::lock_guard<decltype(mutex)> l{mutex};
const std::lock_guard l{mutex};
ret = true;
json::stack::object object

6
modules/client/sync/rooms.cc
View file

@ -134,7 +134,7 @@ bool
ircd::m::sync::_rooms_polylog(data &data,
const string_view &membership)
{
const scope_restore<decltype(data.membership)> theirs
const scope_restore theirs
{
data.membership, membership
};
@ -189,7 +189,7 @@ bool
ircd::m::sync::_rooms_polylog_room(data &data,
const m::room &room)
{
const scope_restore<decltype(data.room)> theirs
const scope_restore theirs
{
data.room, &room
};
@ -209,7 +209,7 @@ ircd::m::sync::_rooms_polylog_room(data &data,
head_idx(std::nothrow, room)
};
const scope_restore<decltype(data.room_head)> their_head
const scope_restore their_head
{
data.room_head, room_head
};

2
modules/client/sync/rooms/state.cc
View file

@ -116,7 +116,7 @@ ircd::m::sync::room_state_polylog_events(data &data)
if(unlikely(!event.valid))
return;
const std::lock_guard<decltype(mutex)> lock{mutex};
const std::lock_guard lock{mutex};
array.append(event);
ret = true;
}};

8
modules/vm.cc
View file

@ -154,12 +154,12 @@ ircd::m::vm::eval__commit_room(eval &eval,
// Set a member pointer to the json::iov currently being composed. This
// allows other parallel evals to have deep access to exactly what this
// eval is attempting to do.
const scope_restore<decltype(eval.issue)> eval_issue
const scope_restore eval_issue
{
eval.issue, &event
};
const scope_restore<decltype(eval.room_id)> eval_room_id
const scope_restore eval_room_id
{
eval.room_id, room.room_id
};
@ -440,7 +440,7 @@ try
// allows other parallel evals to have deep access to exactly what this
// eval is working on.
assert(!eval.event_);
const scope_restore<decltype(eval.event_)> eval_event
const scope_restore eval_event
{
eval.event_, &event
};
@ -694,7 +694,7 @@ ircd::m::vm::_write(eval &eval,
};
// Expose to eval interface
const scope_restore<decltype(eval.txn)> eval_txn
const scope_restore eval_txn
{
eval.txn, &txn
};