Merge pull request #9288
262ef47
BlockchainDB: remove lock/unlock methods (jeffro256)
This commit is contained in:
commit
99e33996f4
|
@ -718,41 +718,6 @@ public:
|
|||
*/
|
||||
virtual std::string get_db_name() const = 0;
|
||||
|
||||
|
||||
// FIXME: these are just for functionality mocking, need to implement
|
||||
// RAII-friendly and multi-read one-write friendly locking mechanism
|
||||
//
|
||||
// acquire db lock
|
||||
/**
|
||||
* @brief acquires the BlockchainDB lock
|
||||
*
|
||||
* This function is a stub until such a time as locking is implemented at
|
||||
* this level.
|
||||
*
|
||||
* The subclass implementation should return true unless implementing a
|
||||
* locking scheme of some sort, in which case it should return true upon
|
||||
* acquisition of the lock and block until then.
|
||||
*
|
||||
* If any of this cannot be done, the subclass should throw the corresponding
|
||||
* subclass of DB_EXCEPTION
|
||||
*
|
||||
* @return true, unless at a future time false makes sense (timeout, etc)
|
||||
*/
|
||||
virtual bool lock() = 0;
|
||||
|
||||
// release db lock
|
||||
/**
|
||||
* @brief This function releases the BlockchainDB lock
|
||||
*
|
||||
* The subclass, should it have implemented lock(), will release any lock
|
||||
* held by the calling thread. In the case of recursive locking, it should
|
||||
* release one instance of a lock.
|
||||
*
|
||||
* If any of this cannot be done, the subclass should throw the corresponding
|
||||
* subclass of DB_EXCEPTION
|
||||
*/
|
||||
virtual void unlock() = 0;
|
||||
|
||||
/**
|
||||
* @brief tells the BlockchainDB to start a new "batch" of blocks
|
||||
*
|
||||
|
|
|
@ -1688,22 +1688,6 @@ std::string BlockchainLMDB::get_db_name() const
|
|||
return std::string("lmdb");
|
||||
}
|
||||
|
||||
// TODO: this?
|
||||
bool BlockchainLMDB::lock()
|
||||
{
|
||||
LOG_PRINT_L3("BlockchainLMDB::" << __func__);
|
||||
check_open();
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO: this?
|
||||
void BlockchainLMDB::unlock()
|
||||
{
|
||||
LOG_PRINT_L3("BlockchainLMDB::" << __func__);
|
||||
check_open();
|
||||
}
|
||||
|
||||
|
||||
// The below two macros are for DB access within block add/remove, whether
|
||||
// regular batch txn is in use or not. m_write_txn is used as a batch txn, even
|
||||
// if it's only within block add/remove.
|
||||
|
|
|
@ -202,10 +202,6 @@ public:
|
|||
|
||||
virtual std::string get_db_name() const;
|
||||
|
||||
virtual bool lock();
|
||||
|
||||
virtual void unlock();
|
||||
|
||||
virtual bool block_exists(const crypto::hash& h, uint64_t *height = NULL) const;
|
||||
|
||||
virtual uint64_t get_block_height(const crypto::hash& h) const;
|
||||
|
|
|
@ -50,8 +50,6 @@ public:
|
|||
virtual std::vector<std::string> get_filenames() const override { return std::vector<std::string>(); }
|
||||
virtual bool remove_data_file(const std::string& folder) const override { return true; }
|
||||
virtual std::string get_db_name() const override { return std::string(); }
|
||||
virtual bool lock() override { return true; }
|
||||
virtual void unlock() override { }
|
||||
virtual bool batch_start(uint64_t batch_num_blocks=0, uint64_t batch_bytes=0) override { return true; }
|
||||
virtual void batch_stop() override {}
|
||||
virtual void batch_abort() override {}
|
||||
|
|
Loading…
Reference in New Issue