From c93cd90db12fa4f6568eb3e67957a0a6c475dc2b Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 28 Dec 2018 16:30:27 -0800 Subject: [PATCH] ircd::aio: Simplify stats. --- include/ircd/fs/aio.h | 14 -------------- ircd/aio.cc | 5 ----- modules/console.cc | 12 ------------ 3 files changed, 31 deletions(-) diff --git a/include/ircd/fs/aio.h b/include/ircd/fs/aio.h index bb1501de6..2a93db9aa 100644 --- a/include/ircd/fs/aio.h +++ b/include/ircd/fs/aio.h @@ -42,16 +42,6 @@ namespace ircd::fs::aio /// Statistics structure. /// -/// Subtract complete from requests to get the count of requests pending -/// "in flight." Subtract errors from complete to only get the count of -/// fully successful operations. complete will always eventually match -/// up with requests. -/// -/// Subtract complete_bytes from requests_bytes to get the total bytes -/// currently pending "in flight." Subtract errors_bytes from response_bytes -/// to only get bytes successfully read or written. complete_bytes will -/// always eventually match up with requests_bytes. -/// struct ircd::fs::aio::stats { uint32_t requests {0}; ///< count of requests created @@ -80,10 +70,6 @@ struct ircd::fs::aio::stats uint32_t max_requests {0}; ///< maximum observed pending requests uint32_t max_reads {0}; ///< maximum observed pending reads uint32_t max_writes {0}; ///< maximum observed pending write - - uint32_t maxed_submits {0}; ///< number of submits at threshold - uint32_t single_submits {0}; ///< number of submits of just one - uint32_t chased_submits {0}; ///< number of submits via chase }; struct ircd::fs::aio::init diff --git a/ircd/aio.cc b/ircd/aio.cc index b694ebff0..893871853 100644 --- a/ircd/aio.cc +++ b/ircd/aio.cc @@ -588,10 +588,7 @@ ircd::fs::aio::system::chase() noexcept { if(qcount) - { flush(); - stats.chased_submits++; - } } /// The flusher submits all queued requests and resets the count. @@ -605,8 +602,6 @@ noexcept try syscall(idp, qcount, queue.data()); - stats.maxed_submits += qcount >= size_t(max_submit); - stats.single_submits += qcount == 1; stats.cur_submits += qcount; stats.cur_queued -= qcount; stats.submits++; diff --git a/modules/console.cc b/modules/console.cc index 0e45a7130..31d53cace 100644 --- a/modules/console.cc +++ b/modules/console.cc @@ -907,18 +907,6 @@ console_cmd__aio(opt &out, const string_view &line) << std::setw(9) << std::right << s.submits << std::endl; - out << std::setw(12) << std::left << "submits max" - << std::setw(9) << std::right << s.maxed_submits - << std::endl; - - out << std::setw(12) << std::left << "submits one" - << std::setw(9) << std::right << s.single_submits - << std::endl; - - out << std::setw(12) << std::left << "submits chs" - << std::setw(9) << std::right << s.chased_submits - << std::endl; - return true; }