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

client: fixed send buffer

Browse Source 
There is no sense in using the kernel's send buffer size (SO_SNDBUF)
for MPD's send buffer.  Convert it into a static buffer of 4 kB.
This commit is contained in:
Max Kellermann
2008-10-17 23:52:47 +02:00
parent 48c11c52ac
commit bdbccc633d
1 changed files with 4 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/client.c
View File

@@ -43,7 +43,6 @@
#define CLIENT_LIST_MODE_BEGIN "command_list_begin" #define CLIENT_LIST_MODE_BEGIN "command_list_begin"
#define CLIENT_LIST_OK_MODE_BEGIN "command_list_ok_begin" #define CLIENT_LIST_OK_MODE_BEGIN "command_list_ok_begin"
#define CLIENT_LIST_MODE_END "command_list_end" #define CLIENT_LIST_MODE_END "command_list_end"
#define CLIENT_DEFAULT_OUT_BUFFER_SIZE (4096)
#define CLIENT_TIMEOUT_DEFAULT (60) #define CLIENT_TIMEOUT_DEFAULT (60)
#define CLIENT_MAX_CONNECTIONS_DEFAULT (10) #define CLIENT_MAX_CONNECTIONS_DEFAULT (10)
#define CLIENT_MAX_COMMAND_LIST_DEFAULT (2048*1024) #define CLIENT_MAX_COMMAND_LIST_DEFAULT (2048*1024)
@@ -88,10 +87,8 @@ struct client {
size_t deferred_bytes; /* mem deferred_send consumes */ size_t deferred_bytes; /* mem deferred_send consumes */
unsigned int num; /* client number */ unsigned int num; /* client number */
char *send_buf; char send_buf[4096];
size_t send_buf_used; /* bytes used this instance */ size_t send_buf_used; /* bytes used this instance */
size_t send_buf_size; /* bytes usable this instance */
size_t send_buf_alloc; /* bytes actually allocated */
/** is this client waiting for an "idle" response? */ /** is this client waiting for an "idle" response? */
bool idle_waiting; bool idle_waiting;
@@ -108,44 +105,6 @@ static void client_write_deferred(struct client *client);
static void client_write_output(struct client *client); static void client_write_output(struct client *client);
#ifdef SO_SNDBUF
static size_t get_default_snd_buf_size(struct client *client)
{
int new_size;
socklen_t sockOptLen = sizeof(int);
if (getsockopt(client->fd, SOL_SOCKET, SO_SNDBUF,
(char *)&new_size, &sockOptLen) < 0) {
DEBUG("problem getting sockets send buffer size\n");
return CLIENT_DEFAULT_OUT_BUFFER_SIZE;
}
if (new_size > 0)
return (size_t)new_size;
DEBUG("sockets send buffer size is not positive\n");
return CLIENT_DEFAULT_OUT_BUFFER_SIZE;
}
#else /* !SO_SNDBUF */
static size_t get_default_snd_buf_size(struct client *client)
{
return CLIENT_DEFAULT_OUT_BUFFER_SIZE;
}
#endif /* !SO_SNDBUF */
static void set_send_buf_size(struct client *client)
{
size_t new_size = get_default_snd_buf_size(client);
if (client->send_buf_size != new_size) {
client->send_buf_size = new_size;
/* don't resize to get smaller, only bigger */
if (client->send_buf_alloc < new_size) {
if (client->send_buf)
free(client->send_buf);
client->send_buf = xmalloc(new_size);
client->send_buf_alloc = new_size;
}
}
}
int client_is_expired(const struct client *client) int client_is_expired(const struct client *client)
{ {
return client->fd < 0; return client->fd < 0;
@@ -196,7 +155,6 @@ static void client_init(struct client *client, int fd)
client->send_buf_used = 0; client->send_buf_used = 0;
client->permission = getDefaultPermissions(); client->permission = getDefaultPermissions();
set_send_buf_size(client);
xwrite(fd, GREETING, strlen(GREETING)); xwrite(fd, GREETING, strlen(GREETING));
} }
@@ -283,9 +241,6 @@ static void client_close(struct client *client)
client->deferred_send = NULL; client->deferred_send = NULL;
} }
if (client->send_buf)
free(client->send_buf);
SECURE("client %i: closed\n", client->num); SECURE("client %i: closed\n", client->num);
free(client); free(client);
} }
@@ -813,8 +768,8 @@ void client_write(struct client *client, const char *buffer, size_t buflen)
while (buflen > 0 && !client_is_expired(client)) { while (buflen > 0 && !client_is_expired(client)) {
size_t left; size_t left;
assert(client->send_buf_size >= client->send_buf_used); assert(client->send_buf_used < sizeof(client->send_buf));
left = client->send_buf_size - client->send_buf_used; left = sizeof(client->send_buf) - client->send_buf_used;
copylen = buflen > left ? left : buflen; copylen = buflen > left ? left : buflen;
memcpy(client->send_buf + client->send_buf_used, buffer, memcpy(client->send_buf + client->send_buf_used, buffer,
@@ -822,7 +777,7 @@ void client_write(struct client *client, const char *buffer, size_t buflen)
buflen -= copylen; buflen -= copylen;
client->send_buf_used += copylen; client->send_buf_used += copylen;
buffer += copylen; buffer += copylen;
if (client->send_buf_used >= client->send_buf_size) if (client->send_buf_used >= sizeof(client->send_buf))
client_write_output(client); client_write_output(client);
} }
} }