sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

stats: clean up randomization code, move FastRandomContext inward

Browse Source 
We can skip the computationally expensive dice-roll if our sample rate
is zero as that means we should never send it. Also get rid of the
`FastRandomContext::operator()` that isn't used anywhere else in the
codebase.
This commit is contained in:
Kittywhiskers Van Gogh 2024-09-05 20:42:14 +00:00
parent 840241eefd
commit 4bc727cd6c
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
3 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/random.h
View File

@ -207,10 +207,6 @@ public:
return rand32() % nMax;
}
uint32_t operator()(uint32_t nMax) {
return rand32(nMax);
}
/** Generate random bytes. */
template <typename B = unsigned char>
std::vector<B> randbytes(size_t len);

46
src/statsd_client.cpp
View File

@ -37,32 +37,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <compat.h>
#include <netbase.h>
#include <random.h>
#include <util/system.h>
#include <cmath>
#include <cstdio>
#include <random>
std::unique_ptr<statsd::StatsdClient> g_stats_client;
namespace statsd {
inline bool fequal(float a, float b)
bool StatsdClient::ShouldSend(float sample_rate)
{
const float epsilon = 0.0001;
return ( fabs(a - b) < epsilon );
}
sample_rate = std::clamp(sample_rate, 0.f, 1.f);
thread_local FastRandomContext insecure_rand;
constexpr float EPSILON{0.0001f};
/* If sample rate is 1, we should always send */
if (std::fabs(sample_rate - 1.f) < EPSILON) return true;
/* If sample rate is 0, we should never send */
if (std::fabs(sample_rate) < EPSILON) return false;
inline bool should_send(float sample_rate)
{
if ( fequal(sample_rate, 1.0) )
{
return true;
}
float p = float(insecure_rand(std::numeric_limits<uint32_t>::max())) / float(std::numeric_limits<uint32_t>::max());
return sample_rate > p;
/* Sample rate is >0 and <1, roll the dice */
LOCK(cs);
return sample_rate > std::uniform_real_distribution<float>(0.f, 1.f)(insecure_rand);
}
StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
@ -144,7 +140,7 @@ int StatsdClient::timing(const std::string& key, int64_t ms, float sample_rate)
int StatsdClient::send(std::string key, int64_t value, const std::string& type, float sample_rate)
{
if (!should_send(sample_rate)) {
if (!ShouldSend(sample_rate)) {
return 0;
}
@ -154,11 +150,9 @@ int StatsdClient::send(std::string key, int64_t value, const std::string& type,
cleanup(key);
std::string buf{""};
if (fequal(sample_rate, 1.0)) {
buf = strprintf("%s%s:%d|%s", m_ns, key, value, type);
} else {
buf = strprintf("%s%s:%d|%s|@%.2f", m_ns, key, value, type, sample_rate);
std::string buf{strprintf("%s%s:%d|%s", m_ns, key, value, type)};
if (sample_rate < 1.f) {
buf += strprintf("|@%.2f", sample_rate);
}
return send(buf);
@ -166,7 +160,7 @@ int StatsdClient::send(std::string key, int64_t value, const std::string& type,
int StatsdClient::sendDouble(std::string key, double value, const std::string& type, float sample_rate)
{
if (!should_send(sample_rate)) {
if (!ShouldSend(sample_rate)) {
return 0;
}
@ -176,11 +170,9 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
cleanup(key);
std::string buf{""};
if (fequal(sample_rate, 1.0)) {
buf = strprintf("%s%s:%f|%s", m_ns, key, value, type);
} else {
buf = strprintf("%s%s:%f|%s|@%.2f", m_ns, key, value, type, sample_rate);
std::string buf{strprintf("%s%s:%f|%s", m_ns, key, value, type)};
if (sample_rate < 1.f) {
buf += strprintf("|@%.2f", sample_rate);
}
return send(buf);

20
src/statsd_client.h
View File

@ -6,6 +6,8 @@
#ifndef BITCOIN_STATSD_CLIENT_H
#define BITCOIN_STATSD_CLIENT_H
#include <random.h>
#include <threadsafety.h>
#include <util/sock.h>
#include <string>
@ -30,12 +32,12 @@ class StatsdClient {
~StatsdClient();
public:
int inc(const std::string& key, float sample_rate = 1.0);
int dec(const std::string& key, float sample_rate = 1.0);
int count(const std::string& key, int64_t value, float sample_rate = 1.0);
int gauge(const std::string& key, int64_t value, float sample_rate = 1.0);
int gaugeDouble(const std::string& key, double value, float sample_rate = 1.0);
int timing(const std::string& key, int64_t ms, float sample_rate = 1.0);
int inc(const std::string& key, float sample_rate = 1.f);
int dec(const std::string& key, float sample_rate = 1.f);
int count(const std::string& key, int64_t value, float sample_rate = 1.f);
int gauge(const std::string& key, int64_t value, float sample_rate = 1.f);
int gaugeDouble(const std::string& key, double value, float sample_rate = 1.f);
int timing(const std::string& key, int64_t ms, float sample_rate = 1.f);
public:
/**
@ -57,6 +59,12 @@ class StatsdClient {
static void cleanup(std::string& key);
private:
bool ShouldSend(float sample_rate);
private:
mutable Mutex cs;
mutable FastRandomContext insecure_rand GUARDED_BY(cs);
bool m_init{false};
SOCKET m_sock{INVALID_SOCKET};
struct sockaddr_in m_server;