external
/
uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enabled send queue fixes. This will more aggressively prevent unimportant messages (like searches) to be forwarded to slow clients that cannot swallow what is sent to it. This should reduce memory usage somewhat on really large hubs.

This commit is contained in:
Jan Vidar Krey 2009-07-19 02:31:23 +02:00
parent 4a173bf066
commit 927faf70fc
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/route.c
View File

@ -57,9 +57,7 @@ int route_message(struct hub_info* hub, struct user* u, struct adc_message* msg)
return 0; return 0;
} }
static inline size_t get_max_send_queue(struct hub_info* hub)
#if 0
static size_t get_max_send_queue(struct hub_info* hub)
{ {
/* TODO: More dynamic send queue limit, for instance: /* TODO: More dynamic send queue limit, for instance:
* return MAX(hub->config->max_send_buffer, (hub->config->max_recv_buffer * hub_get_user_count(hub))); * return MAX(hub->config->max_send_buffer, (hub->config->max_recv_buffer * hub_get_user_count(hub)));
@ -67,7 +65,7 @@ static size_t get_max_send_queue(struct hub_info* hub)
return hub->config->max_send_buffer; return hub->config->max_send_buffer;
} }
static size_t get_max_send_queue_soft(struct hub_info* hub) static inline size_t get_max_send_queue_soft(struct hub_info* hub)
{ {
return hub->config->max_send_buffer_soft; return hub->config->max_send_buffer_soft;
} }
@ -77,21 +75,19 @@ static size_t get_max_send_queue_soft(struct hub_info* hub)
* -1 if send queue is overflowed * -1 if send queue is overflowed
* 0 if soft send queue is overflowed (not implemented at the moment) * 0 if soft send queue is overflowed (not implemented at the moment)
*/ */
static int check_send_queue(struct user* user, struct adc_message* msg) static inline int check_send_queue(struct hub_info* hub, struct user* user, struct adc_message* msg)
{ {
if (user_flag_get(user, flag_user_list)) if (user_flag_get(user, flag_user_list))
return 1; return 1;
if ((user->net.send_queue->size + msg->length) > get_max_send_queue(user->hub)) if ((user->net.send_queue->size + msg->length) > get_max_send_queue(hub))
return -1; return -1;
if (user->net.send_queue->size > get_max_send_queue_soft(user->hub) && msg->priority < 0) if (user->net.send_queue->size > get_max_send_queue_soft(hub) && msg->priority < 0)
return 0; return 0;
return 1; return 1;
} }
#endif
int route_to_user(struct hub_info* hub, struct user* user, struct adc_message* msg) int route_to_user(struct hub_info* hub, struct user* user, struct adc_message* msg)
{ {
@ -101,17 +97,18 @@ int route_to_user(struct hub_info* hub, struct user* user, struct adc_message* m
free(data); free(data);
#endif #endif
int empty = hub_sendq_is_empty(user->net.send_queue); if (hub_sendq_is_empty(user->net.send_queue))
hub_sendq_add(user->net.send_queue, msg);
if (empty)
{ {
/* Perform oportunistic write */ /* Perform oportunistic write */
hub_sendq_add(user->net.send_queue, msg);
handle_net_write(user); handle_net_write(user);
} }
else else
{ {
user_net_io_want_write(user); if (check_send_queue(hub, user, msg) >= 0)
{
user_net_io_want_write(user);
}
} }
return 1; return 1;
} }