summaryrefslogtreecommitdiff
path: root/storage/innobase/trx
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-04-23 13:15:54 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-04-23 13:15:54 +0300
commitde942c9f618b590a01a7960c171d7e50e435708f (patch)
tree7b5d50f1087e88d4cf9c4fa6ee2575be704991d9 /storage/innobase/trx
parent6c64101bf06c24d090ec55cc4fc0b54af2ebc1b3 (diff)
downloadmariadb-git-de942c9f618b590a01a7960c171d7e50e435708f.tar.gz
MDEV-15983 Reduce fil_system.mutex contention further
fil_space_t::n_pending_ops, n_pending_ios: Use a combination of fil_system.mutex and atomic memory access for protection. fil_space_t::release(): Replaces fil_space_release(). Does not acquire fil_system.mutex. fil_space_t::release_for_io(): Replaces fil_space_release_for_io(). Does not acquire fil_system.mutex.
Diffstat (limited to 'storage/innobase/trx')
-rw-r--r--storage/innobase/trx/trx0undo.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc
index f5984de02b9..ee9f4ec7dd8 100644
--- a/storage/innobase/trx/trx0undo.cc
+++ b/storage/innobase/trx/trx0undo.cc
@@ -1699,7 +1699,7 @@ trx_undo_truncate_tablespace(
/* Step-1: Truncate tablespace. */
if (!fil_truncate_tablespace(
space, SRV_UNDO_TABLESPACE_SIZE_IN_PAGES)) {
- fil_space_release(space);
+ space->release();
return false;
}
@@ -1763,7 +1763,7 @@ trx_undo_truncate_tablespace(
rseg->needs_purge = false;
}
mtr_commit(&mtr);
- fil_space_release(space);
+ space->release();
return true;
}