Merge #9387: [Refactor] RAII of libevent stuff using unique ptrs with deleters

05a55a6 Added EVENT_CFLAGS to test makefile to explicitly include libevent headers. (Karl-Johan Alm)
280a559 Added some simple tests for the RAII-style events. (Karl-Johan Alm)
7f7f102 Switched bitcoin-cli.cpp to use RAII unique pointers with deleters. (Karl-Johan Alm)
e5534d2 Added std::unique_ptr<> wrappers with deleters for libevent modules. (Karl-Johan Alm)
This commit is contained in:
Wladimir J. van der Laan
2017-01-05 11:10:40 +01:00
5 changed files with 160 additions and 22 deletions
+88
View File
@@ -0,0 +1,88 @@
// Copyright (c) 2016 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 <event2/event.h>
#include <map>
#include <stdlib.h>
#include "support/events.h"
#include "test/test_bitcoin.h"
#include <vector>
#include <boost/test/unit_test.hpp>
static std::map<void*, short> tags;
static std::map<void*, uint16_t> orders;
static uint16_t tagSequence = 0;
static void* tag_malloc(size_t sz) {
void* mem = malloc(sz);
if (!mem) return mem;
tags[mem]++;
orders[mem] = tagSequence++;
return mem;
}
static void tag_free(void* mem) {
tags[mem]--;
orders[mem] = tagSequence++;
free(mem);
}
BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
BOOST_AUTO_TEST_CASE(raii_event_creation)
{
event_set_mem_functions(tag_malloc, realloc, tag_free);
void* base_ptr = NULL;
{
auto base = obtain_event_base();
base_ptr = (void*)base.get();
BOOST_CHECK(tags[base_ptr] == 1);
}
BOOST_CHECK(tags[base_ptr] == 0);
void* event_ptr = NULL;
{
auto base = obtain_event_base();
auto event = obtain_event(base.get(), -1, 0, NULL, NULL);
base_ptr = (void*)base.get();
event_ptr = (void*)event.get();
BOOST_CHECK(tags[base_ptr] == 1);
BOOST_CHECK(tags[event_ptr] == 1);
}
BOOST_CHECK(tags[base_ptr] == 0);
BOOST_CHECK(tags[event_ptr] == 0);
event_set_mem_functions(malloc, realloc, free);
}
BOOST_AUTO_TEST_CASE(raii_event_order)
{
event_set_mem_functions(tag_malloc, realloc, tag_free);
void* base_ptr = NULL;
void* event_ptr = NULL;
{
auto base = obtain_event_base();
auto event = obtain_event(base.get(), -1, 0, NULL, NULL);
base_ptr = (void*)base.get();
event_ptr = (void*)event.get();
// base should have allocated before event
BOOST_CHECK(orders[base_ptr] < orders[event_ptr]);
}
// base should be freed after event
BOOST_CHECK(orders[base_ptr] > orders[event_ptr]);
event_set_mem_functions(malloc, realloc, free);
}
BOOST_AUTO_TEST_SUITE_END()