kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

core: fix blob size cache, and reenable hash and blob size caches

Browse source
This commit is contained in:
moneromooo-monero 2017-04-03 22:19:57 +01:00
parent c9063c0b8f
commit 5b63246813
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cryptonote_basic/cryptonote_basic.h
View file

@ -208,7 +208,7 @@ namespace cryptonote
void invalidate_hashes(); void invalidate_hashes();
bool is_hash_valid() const { return hash_valid.load(std::memory_order_acquire); } bool is_hash_valid() const { return hash_valid.load(std::memory_order_acquire); }
void set_hash_valid(bool v) const { hash_valid.store(v,std::memory_order_release); } void set_hash_valid(bool v) const { hash_valid.store(v,std::memory_order_release); }
bool is_blob_size_valid() const { return hash_valid.load(std::memory_order_acquire); } bool is_blob_size_valid() const { return blob_size_valid.load(std::memory_order_acquire); }
void set_blob_size_valid(bool v) const { blob_size_valid.store(v,std::memory_order_release); } void set_blob_size_valid(bool v) const { blob_size_valid.store(v,std::memory_order_release); }
BEGIN_SERIALIZE_OBJECT() BEGIN_SERIALIZE_OBJECT()

6
src/cryptonote_basic/cryptonote_format_utils.cpp
View file

@ -658,8 +658,6 @@ namespace cryptonote
//--------------------------------------------------------------- //---------------------------------------------------------------
bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t* blob_size) bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t* blob_size)
{ {
return calculate_transaction_hash(t, res, blob_size);
#if 0
if (t.is_hash_valid()) if (t.is_hash_valid())
{ {
#ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK #ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK
@ -690,7 +688,6 @@ namespace cryptonote
t.set_blob_size_valid(true); t.set_blob_size_valid(true);
} }
return true; return true;
#endif
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t& blob_size) bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t& blob_size)
@ -736,8 +733,6 @@ namespace cryptonote
//--------------------------------------------------------------- //---------------------------------------------------------------
bool get_block_hash(const block& b, crypto::hash& res) bool get_block_hash(const block& b, crypto::hash& res)
{ {
return calculate_block_hash(b, res);
#if 0
if (b.is_hash_valid()) if (b.is_hash_valid())
{ {
#ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK #ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK
@ -754,7 +749,6 @@ namespace cryptonote
b.hash = res; b.hash = res;
b.set_hash_valid(true); b.set_hash_valid(true);
return true; return true;
#endif
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
crypto::hash get_block_hash(const block& b) crypto::hash get_block_hash(const block& b)