kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trim headers and unused code in IXUdpSocket

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-03-22 21:51:41 -07:00
parent b7e7837d76
commit f72f845ad2
5 changed files with 24 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ixbots/CMakeLists.txt
View File

@@ -36,6 +36,7 @@ set(IXBOTS_INCLUDE_DIRS
.
..
../ixcore
../ixwebsocket
../ixcobra
../ixsentry
${JSONCPP_INCLUDE_DIRS}

21
ixbots/ixbots/IXStatsdClient.cpp
View File

@@ -39,12 +39,15 @@
#include "IXStatsdClient.h"
#include <ixwebsocket/IXNetSystem.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
namespace ix
{
const uint64_t StatsdClient::_maxQueueSize = 32768;
StatsdClient::StatsdClient(const std::string& host,
int port,
const std::string& prefix)
@@ -56,18 +59,18 @@ namespace ix
_thread = std::thread([this] {
while (!_stop)
{
std::deque<std::string> staged_message_queue;
std::deque<std::string> stagedQueue;
{
std::lock_guard<std::mutex> lock(_mutex);
batching_message_queue_.swap(staged_message_queue);
_queue.swap(stagedQueue);
}
while (!staged_message_queue.empty())
while (!stagedQueue.empty())
{
auto message = staged_message_queue.front();
auto message = stagedQueue.front();
_socket.sendto(message);
staged_message_queue.pop_front();
stagedQueue.pop_front();
}
std::this_thread::sleep_for(std::chrono::seconds(1));
@@ -139,14 +142,14 @@ namespace ix
{
std::lock_guard<std::mutex> lock(_mutex);
if (batching_message_queue_.empty() ||
batching_message_queue_.back().length() > max_batching_size)
if (_queue.empty() ||
_queue.back().length() > _maxQueueSize)
{
batching_message_queue_.push_back(message);
_queue.push_back(message);
}
else
{
(*batching_message_queue_.rbegin()).append("\n").append(message);
(*_queue.rbegin()).append("\n").append(message);
}
return 0;

12
ixbots/ixbots/IXStatsdClient.h
View File

@@ -6,7 +6,6 @@
#pragma once
#include <ixwebsocket/IXNetSystem.h>
#include <ixwebsocket/IXUdpSocket.h>
#include <string>
@@ -15,9 +14,10 @@
#include <mutex>
#include <atomic>
namespace ix {
class StatsdClient {
namespace ix
{
class StatsdClient
{
public:
StatsdClient(const std::string& host="127.0.0.1",
int port=8125,
@@ -55,8 +55,8 @@ namespace ix {
std::thread _thread;
std::mutex _mutex; // for the queue
std::deque<std::string> batching_message_queue_;
const uint64_t max_batching_size = 32768;
std::deque<std::string> _queue;
static const uint64_t _maxQueueSize;
};
} // end namespace ix