Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Name txn_test_gen threads #7461

Merged
merged 2 commits into from
Jun 4, 2019
Merged

Name txn_test_gen threads #7461

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd9508
Name txn_test_gen threads
baegjae Jun 4, 2019
03381b5
Remove log of send_transaction
baegjae Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 8 additions & 20 deletions plugins/txn_test_gen_plugin/txn_test_gen_plugin.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <eosio/txn_test_gen_plugin/txn_test_gen_plugin.hpp>
#include <eosio/chain_plugin/chain_plugin.hpp>
#include <eosio/chain/wast_to_wasm.hpp>
#include <eosio/chain/thread_utils.hpp>

#include <fc/variant.hpp>
#include <fc/io/json.hpp>
Expand Down Expand Up @@ -41,7 +42,6 @@ namespace eosio {
static appbase::abstract_plugin& _txn_test_gen_plugin = app().register_plugin<txn_test_gen_plugin>();

using namespace eosio::chain;
using io_work_t = boost::asio::executor_work_guard<boost::asio::io_context::executor_type>;

#define CALL(api_name, api_handle, call_name, INVOKE, http_response_code) \
{std::string("/v1/" #api_name "/" #call_name), \
Expand Down Expand Up @@ -100,10 +100,8 @@ struct txn_test_gen_plugin_impl {
uint64_t _total_us = 0;
uint64_t _txcount = 0;

std::shared_ptr<boost::asio::io_context> gen_ioc;
optional<io_work_t> gen_ioc_work;
uint16_t thread_pool_size;
optional<boost::asio::thread_pool> thread_pool;
fc::optional<eosio::chain::named_thread_pool> thread_pool;
std::shared_ptr<boost::asio::high_resolution_timer> timer;
name newaccountA;
name newaccountB;
Expand Down Expand Up @@ -305,25 +303,21 @@ struct txn_test_gen_plugin_impl {
batch = batch_size/2;
nonce_prefix = 0;

gen_ioc = std::make_shared<boost::asio::io_context>();
gen_ioc_work.emplace( boost::asio::make_work_guard(*gen_ioc) );
thread_pool.emplace( thread_pool_size );
for( uint16_t i = 0; i < thread_pool_size; i++ )
boost::asio::post( *thread_pool, [ioc = gen_ioc]() { ioc->run(); } );
timer = std::make_shared<boost::asio::high_resolution_timer>(*gen_ioc);
thread_pool.emplace( "txntest", thread_pool_size );
timer = std::make_shared<boost::asio::high_resolution_timer>(thread_pool->get_executor());

ilog("Started transaction test plugin; generating ${p} transactions every ${m} ms by ${t} load generation threads",
("p", batch_size) ("m", period) ("t", thread_pool_size));

boost::asio::post( *gen_ioc, [this]() {
boost::asio::post( thread_pool->get_executor(), [this]() {
arm_timer(boost::asio::high_resolution_timer::clock_type::now());
});
return "success";
}

void arm_timer(boost::asio::high_resolution_timer::time_point s) {
timer->expires_at(s + std::chrono::milliseconds(timer_timeout));
boost::asio::post( *gen_ioc, [this]() {
boost::asio::post( thread_pool->get_executor(), [this]() {
send_transaction([this](const fc::exception_ptr& e){
if (e) {
elog("pushing transaction failed: ${e}", ("e", e->to_detail_string()));
Expand Down Expand Up @@ -391,7 +385,6 @@ struct txn_test_gen_plugin_impl {
next(e.dynamic_copy_exception());
}

ilog("send ${c} transactions", ("c",trxs.size()));
push_transactions(std::move(trxs), next);
}

Expand All @@ -400,14 +393,9 @@ struct txn_test_gen_plugin_impl {
throw fc::exception(fc::invalid_operation_exception_code);
timer->cancel();
running = false;
if( gen_ioc_work )
gen_ioc_work->reset();
if( gen_ioc )
gen_ioc->stop();
if( thread_pool ) {
thread_pool->join();
if( thread_pool )
thread_pool->stop();
}

ilog("Stopping transaction generation test");

if (_txcount) {
Expand Down