oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

client/Internal: move CLIENT_MAX_* to class Client

This commit is contained in:
Max Kellermann 2019-04-03 21:28:46 +02:00
parent 38298e0cd8
commit 772aa4f165
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/Client.hxx
View File

@ -83,6 +83,8 @@ public:
TagMask tag_mask = TagMask::All(); TagMask tag_mask = TagMask::All();
private: private:
static constexpr size_t MAX_SUBSCRIPTIONS = 16;
/** /**
* A list of channel names this client is subscribed to. * A list of channel names this client is subscribed to.
*/ */
@ -94,6 +96,8 @@ private:
*/ */
unsigned num_subscriptions = 0; unsigned num_subscriptions = 0;
static constexpr size_t MAX_MESSAGES = 64;
/** /**
* A list of messages this client has received. * A list of messages this client has received.
*/ */

3
src/client/Internal.hxx
View File

@ -24,9 +24,6 @@
#include <chrono> #include <chrono>
static constexpr unsigned CLIENT_MAX_SUBSCRIPTIONS = 16;
static constexpr unsigned CLIENT_MAX_MESSAGES = 64;
extern std::chrono::steady_clock::duration client_timeout; extern std::chrono::steady_clock::duration client_timeout;
extern size_t client_max_command_list_size; extern size_t client_max_command_list_size;
extern size_t client_max_output_buffer_size; extern size_t client_max_output_buffer_size;

6
src/client/Subscribe.cxx
View File

@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "Internal.hxx" #include "Client.hxx"
#include "Partition.hxx" #include "Partition.hxx"
#include "Idle.hxx" #include "Idle.hxx"
@ -31,7 +31,7 @@ Client::Subscribe(const char *channel) noexcept
if (!client_message_valid_channel_name(channel)) if (!client_message_valid_channel_name(channel))
return Client::SubscribeResult::INVALID; return Client::SubscribeResult::INVALID;
if (num_subscriptions >= CLIENT_MAX_SUBSCRIPTIONS) if (num_subscriptions >= MAX_SUBSCRIPTIONS)
return Client::SubscribeResult::FULL; return Client::SubscribeResult::FULL;
auto r = subscriptions.insert(channel); auto r = subscriptions.insert(channel);
@ -75,7 +75,7 @@ Client::UnsubscribeAll() noexcept
bool bool
Client::PushMessage(const ClientMessage &msg) noexcept Client::PushMessage(const ClientMessage &msg) noexcept
{ {
if (messages.size() >= CLIENT_MAX_MESSAGES || if (messages.size() >= MAX_MESSAGES ||
!IsSubscribed(msg.GetChannel())) !IsSubscribed(msg.GetChannel()))
return false; return false;