crimson/os/seastore/transaction: fix circular dependency

transaction_interruptor includes transaction and vice verca.
With the previous commits in this PR, we can not drop transaction
from including transaction_interruptor.

* move interrupt_cond_t to transaction_interruptor.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/crimson/os/seastore/CMakeLists.txt b/src/crimson/os/seastore/CMakeLists.txt
index 97eae1d575cda1952c868c5568725bdfcfdece2d..3c82bfed1cd1d3b8ad442a858cb315617e4656ce 100644 (file)
--- a/src/crimson/os/seastore/CMakeLists.txt
+++ b/src/crimson/os/seastore/CMakeLists.txt
@@ -7,7 +7,6 @@ set(crimson_seastore_srcs
   segment_manager/block.cc
   transaction_interruptor.cc
   transaction_manager.cc
-  transaction.cc
   cache.cc
   extent_pinboard.cc
   root_block.cc

diff --git a/src/crimson/os/seastore/transaction.cc b/src/crimson/os/seastore/transaction.cc
deleted file mode 100644 (file)
index 4cab476..0000000
--- a/src/crimson/os/seastore/transaction.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "transaction.h"
-#include "crimson/common/interruptible_future.h"
-
-namespace crimson::interruptible {
-template
-thread_local interrupt_cond_t<::crimson::os::seastore::TransactionConflictCondition>
-interrupt_cond<::crimson::os::seastore::TransactionConflictCondition>;
-}

diff --git a/src/crimson/os/seastore/transaction.h b/src/crimson/os/seastore/transaction.h
index d1817b4e273d719ca68125a03d7eea84e44321ff..452f2757978394e7e37e47d1709d44fe33c96de7 100644 (file)
--- a/src/crimson/os/seastore/transaction.h
+++ b/src/crimson/os/seastore/transaction.h
@@ -14,7 +14,6 @@
 #include "crimson/os/seastore/ordering_handle.h"
 #include "crimson/os/seastore/root_block.h"
 #include "crimson/os/seastore/seastore_types.h"
-#include "crimson/os/seastore/transaction_interruptor.h"
 
 namespace crimson::os::seastore {
 

diff --git a/src/crimson/os/seastore/transaction_interruptor.cc b/src/crimson/os/seastore/transaction_interruptor.cc
index d22f760f2db25d0086b40dd75c681841e8d45dfb..6d28284a7a35be25366c851f627c6e76b75db413 100644 (file)
--- a/src/crimson/os/seastore/transaction_interruptor.cc
+++ b/src/crimson/os/seastore/transaction_interruptor.cc
@@ -5,6 +5,12 @@
 
 #include "crimson/os/seastore/transaction.h"
 
+namespace crimson::interruptible {
+template
+thread_local interrupt_cond_t<::crimson::os::seastore::TransactionConflictCondition>
+interrupt_cond<::crimson::os::seastore::TransactionConflictCondition>;
+}
+
 namespace crimson::os::seastore {
 
 bool TransactionConflictCondition::is_conflicted() const