mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 13:03:17 +01:00
2be67c7605
86b47fa741408b061ab0bda784b8678bfd7dfa88 speed up Unserialize_impl for prevector (Akio Nakamura) Pull request description: The unserializer for prevector uses `resize()` for reserve the area, but it's prefer to use `reserve()` because `resize()` have overhead to call its constructor many times. However, `reserve()` does not change the value of `_size` (a private member of prevector). This PR make the logic of read from stream to callback function, and prevector handles initilizing new values with that call-back and ajust the value of `_size`. The changes are as follows: 1. prevector.h Add a public member function named 'append'. This function has 2 params, number of elemenst to append and call-back function that initilizing new appended values. 2. serialize.h In the following two function: - `Unserialize_impl(Stream& is, prevector<N, T>& v, const unsigned char&)` - `Unserialize_impl(Stream& is, prevector<N, T>& v, const V&)` Make a callback function from each original logic of reading values from stream, and call prevector's `append()`. 3. test/prevector_tests.cpp Add a test for `append()`. ## A benchmark result is following: [Machine] MacBook Pro (macOS 10.13.3/i7 2.2GHz/mem 16GB/SSD) [result] DeserializeAndCheckBlockTest => 22% faster DeserializeBlockTest => 29% faster [before PR] # Benchmark, evals, iterations, total, min, max, median DeserializeAndCheckBlockTest, 60, 160, 94.4901, 0.0094644, 0.0104715, 0.0098339 DeserializeBlockTest, 60, 130, 65.0964, 0.00800362, 0.00895134, 0.00824187 [After PR] # Benchmark, evals, iterations, total, min, max, median DeserializeAndCheckBlockTest, 60, 160, 77.1597, 0.00767013, 0.00858959, 0.00805757 DeserializeBlockTest, 60, 130, 49.9443, 0.00613926, 0.00691187, 0.00635527 ACKs for top commit: laanwj: utACK 86b47fa741408b061ab0bda784b8678bfd7dfa88 Tree-SHA512: 62ea121ccd45a306fefc67485a1b03a853435af762607dae2426a87b15a3033d802c8556e1923727ddd1023a1837d0e5f6720c2c77b38196907e750e15fbb902
296 lines
9.0 KiB
C++
296 lines
9.0 KiB
C++
// Copyright (c) 2015 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <vector>
|
|
#include "prevector.h"
|
|
|
|
#include "reverse_iterator.h"
|
|
#include "serialize.h"
|
|
#include "streams.h"
|
|
|
|
#include "test/test_dash.h"
|
|
|
|
#include <boost/test/unit_test.hpp>
|
|
|
|
BOOST_FIXTURE_TEST_SUITE(PrevectorTests, TestingSetup)
|
|
|
|
template<unsigned int N, typename T>
|
|
class prevector_tester {
|
|
typedef std::vector<T> realtype;
|
|
realtype real_vector;
|
|
realtype real_vector_alt;
|
|
|
|
typedef prevector<N, T> pretype;
|
|
pretype pre_vector;
|
|
pretype pre_vector_alt;
|
|
|
|
typedef typename pretype::size_type Size;
|
|
bool passed = true;
|
|
FastRandomContext rand_cache;
|
|
uint256 rand_seed;
|
|
|
|
|
|
template <typename A, typename B>
|
|
void local_check_equal(A a, B b)
|
|
{
|
|
local_check(a == b);
|
|
}
|
|
void local_check(bool b)
|
|
{
|
|
passed &= b;
|
|
}
|
|
void test() {
|
|
const pretype& const_pre_vector = pre_vector;
|
|
local_check_equal(real_vector.size(), pre_vector.size());
|
|
local_check_equal(real_vector.empty(), pre_vector.empty());
|
|
for (Size s = 0; s < real_vector.size(); s++) {
|
|
local_check(real_vector[s] == pre_vector[s]);
|
|
local_check(&(pre_vector[s]) == &(pre_vector.begin()[s]));
|
|
local_check(&(pre_vector[s]) == &*(pre_vector.begin() + s));
|
|
local_check(&(pre_vector[s]) == &*((pre_vector.end() + s) - real_vector.size()));
|
|
}
|
|
// local_check(realtype(pre_vector) == real_vector);
|
|
local_check(pretype(real_vector.begin(), real_vector.end()) == pre_vector);
|
|
local_check(pretype(pre_vector.begin(), pre_vector.end()) == pre_vector);
|
|
size_t pos = 0;
|
|
for (const T& v : pre_vector) {
|
|
local_check(v == real_vector[pos++]);
|
|
}
|
|
for (const T& v : reverse_iterate(pre_vector)) {
|
|
local_check(v == real_vector[--pos]);
|
|
}
|
|
for (const T& v : const_pre_vector) {
|
|
local_check(v == real_vector[pos++]);
|
|
}
|
|
for (const T& v : reverse_iterate(const_pre_vector)) {
|
|
local_check(v == real_vector[--pos]);
|
|
}
|
|
CDataStream ss1(SER_DISK, 0);
|
|
CDataStream ss2(SER_DISK, 0);
|
|
ss1 << real_vector;
|
|
ss2 << pre_vector;
|
|
local_check_equal(ss1.size(), ss2.size());
|
|
for (Size s = 0; s < ss1.size(); s++) {
|
|
local_check_equal(ss1[s], ss2[s]);
|
|
}
|
|
}
|
|
|
|
public:
|
|
void resize(Size s) {
|
|
real_vector.resize(s);
|
|
local_check_equal(real_vector.size(), s);
|
|
pre_vector.resize(s);
|
|
local_check_equal(pre_vector.size(), s);
|
|
test();
|
|
}
|
|
|
|
void reserve(Size s) {
|
|
real_vector.reserve(s);
|
|
local_check(real_vector.capacity() >= s);
|
|
pre_vector.reserve(s);
|
|
local_check(pre_vector.capacity() >= s);
|
|
test();
|
|
}
|
|
|
|
void insert(Size position, const T& value) {
|
|
real_vector.insert(real_vector.begin() + position, value);
|
|
pre_vector.insert(pre_vector.begin() + position, value);
|
|
test();
|
|
}
|
|
|
|
void insert(Size position, Size count, const T& value) {
|
|
real_vector.insert(real_vector.begin() + position, count, value);
|
|
pre_vector.insert(pre_vector.begin() + position, count, value);
|
|
test();
|
|
}
|
|
|
|
template<typename I>
|
|
void insert_range(Size position, I first, I last) {
|
|
real_vector.insert(real_vector.begin() + position, first, last);
|
|
pre_vector.insert(pre_vector.begin() + position, first, last);
|
|
test();
|
|
}
|
|
|
|
void erase(Size position) {
|
|
real_vector.erase(real_vector.begin() + position);
|
|
pre_vector.erase(pre_vector.begin() + position);
|
|
test();
|
|
}
|
|
|
|
void erase(Size first, Size last) {
|
|
real_vector.erase(real_vector.begin() + first, real_vector.begin() + last);
|
|
pre_vector.erase(pre_vector.begin() + first, pre_vector.begin() + last);
|
|
test();
|
|
}
|
|
|
|
void update(Size pos, const T& value) {
|
|
real_vector[pos] = value;
|
|
pre_vector[pos] = value;
|
|
test();
|
|
}
|
|
|
|
void push_back(const T& value) {
|
|
real_vector.push_back(value);
|
|
pre_vector.push_back(value);
|
|
test();
|
|
}
|
|
|
|
void pop_back() {
|
|
real_vector.pop_back();
|
|
pre_vector.pop_back();
|
|
test();
|
|
}
|
|
|
|
void clear() {
|
|
real_vector.clear();
|
|
pre_vector.clear();
|
|
}
|
|
|
|
void assign(Size n, const T& value) {
|
|
real_vector.assign(n, value);
|
|
pre_vector.assign(n, value);
|
|
}
|
|
|
|
Size size() {
|
|
return real_vector.size();
|
|
}
|
|
|
|
Size capacity() {
|
|
return pre_vector.capacity();
|
|
}
|
|
|
|
void shrink_to_fit() {
|
|
pre_vector.shrink_to_fit();
|
|
test();
|
|
}
|
|
|
|
void swap() {
|
|
real_vector.swap(real_vector_alt);
|
|
pre_vector.swap(pre_vector_alt);
|
|
test();
|
|
}
|
|
|
|
void move() {
|
|
real_vector = std::move(real_vector_alt);
|
|
real_vector_alt.clear();
|
|
pre_vector = std::move(pre_vector_alt);
|
|
pre_vector_alt.clear();
|
|
}
|
|
|
|
void copy() {
|
|
real_vector = real_vector_alt;
|
|
pre_vector = pre_vector_alt;
|
|
}
|
|
|
|
void resize_uninitialized(realtype values) {
|
|
size_t r = values.size();
|
|
size_t s = real_vector.size() / 2;
|
|
if (real_vector.capacity() < s + r) {
|
|
real_vector.reserve(s + r);
|
|
}
|
|
real_vector.resize(s);
|
|
pre_vector.resize_uninitialized(s);
|
|
for (auto v : values) {
|
|
real_vector.push_back(v);
|
|
}
|
|
auto p = pre_vector.size();
|
|
pre_vector.resize_uninitialized(p + r);
|
|
for (auto v : values) {
|
|
pre_vector[p] = v;
|
|
++p;
|
|
}
|
|
test();
|
|
}
|
|
|
|
~prevector_tester() {
|
|
BOOST_CHECK_MESSAGE(passed, "insecure_rand: " + rand_seed.ToString());
|
|
}
|
|
|
|
prevector_tester() {
|
|
SeedInsecureRand();
|
|
rand_seed = insecure_rand_seed;
|
|
rand_cache = insecure_rand_ctx;
|
|
}
|
|
};
|
|
|
|
BOOST_AUTO_TEST_CASE(PrevectorTestInt)
|
|
{
|
|
for (int j = 0; j < 64; j++) {
|
|
prevector_tester<8, int> test;
|
|
for (int i = 0; i < 2048; i++) {
|
|
if (InsecureRandBits(2) == 0) {
|
|
test.insert(InsecureRandRange(test.size() + 1), InsecureRand32());
|
|
}
|
|
if (test.size() > 0 && InsecureRandBits(2) == 1) {
|
|
test.erase(InsecureRandRange(test.size()));
|
|
}
|
|
if (InsecureRandBits(3) == 2) {
|
|
int new_size = std::max<int>(0, std::min<int>(30, test.size() + (InsecureRandRange(5)) - 2));
|
|
test.resize(new_size);
|
|
}
|
|
if (InsecureRandBits(3) == 3) {
|
|
test.insert(InsecureRandRange(test.size() + 1), 1 + InsecureRandBool(), InsecureRand32());
|
|
}
|
|
if (InsecureRandBits(3) == 4) {
|
|
int del = std::min<int>(test.size(), 1 + (InsecureRandBool()));
|
|
int beg = InsecureRandRange(test.size() + 1 - del);
|
|
test.erase(beg, beg + del);
|
|
}
|
|
if (InsecureRandBits(4) == 5) {
|
|
test.push_back(InsecureRand32());
|
|
}
|
|
if (test.size() > 0 && InsecureRandBits(4) == 6) {
|
|
test.pop_back();
|
|
}
|
|
if (InsecureRandBits(5) == 7) {
|
|
int values[4];
|
|
int num = 1 + (InsecureRandBits(2));
|
|
for (int k = 0; k < num; k++) {
|
|
values[k] = InsecureRand32();
|
|
}
|
|
test.insert_range(InsecureRandRange(test.size() + 1), values, values + num);
|
|
}
|
|
if (InsecureRandBits(5) == 8) {
|
|
int del = std::min<int>(test.size(), 1 + (InsecureRandBits(2)));
|
|
int beg = InsecureRandRange(test.size() + 1 - del);
|
|
test.erase(beg, beg + del);
|
|
}
|
|
if (InsecureRandBits(5) == 9) {
|
|
test.reserve(InsecureRandBits(5));
|
|
}
|
|
if (InsecureRandBits(6) == 10) {
|
|
test.shrink_to_fit();
|
|
}
|
|
if (test.size() > 0) {
|
|
test.update(InsecureRandRange(test.size()), InsecureRand32());
|
|
}
|
|
if (InsecureRandBits(10) == 11) {
|
|
test.clear();
|
|
}
|
|
if (InsecureRandBits(9) == 12) {
|
|
test.assign(InsecureRandBits(5), InsecureRand32());
|
|
}
|
|
if (InsecureRandBits(3) == 3) {
|
|
test.swap();
|
|
}
|
|
if (InsecureRandBits(4) == 8) {
|
|
test.copy();
|
|
}
|
|
if (InsecureRandBits(5) == 18) {
|
|
test.move();
|
|
}
|
|
if (InsecureRandBits(5) == 19) {
|
|
unsigned int num = 1 + (InsecureRandBits(4));
|
|
std::vector<int> values(num);
|
|
for (auto &v : values) {
|
|
v = InsecureRand32();
|
|
}
|
|
test.resize_uninitialized(values);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
BOOST_AUTO_TEST_SUITE_END()
|