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

Better dynamic send queue handling for large hubs at the cost of more memory use.

Browse Source 
Signed-off-by: Jan Vidar Krey <janvidar@extatic.org>
This commit is contained in:
Jan Vidar Krey 2009-03-12 16:00:56 +01:00
parent 6cf6e38a60
commit 18b0dc713f
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
- Better "!stats"; can display peak and current bandwidth usage. - Better "!stats"; can display peak and current bandwidth usage.
- Added "+myip" command. - Added "+myip" command.
- Ensure super users and hub owners also have the operator flag set. - Ensure super users and hub owners also have the operator flag set.
- Better dynamic send queue handling for large hubs at the cost of more memory use.
0.2.5-3487: 0.2.5-3487:

37
src/route.c
View File

@ -80,6 +80,26 @@ static void queue_command(struct user* user, struct adc_message* msg__, int offs
} }
// #define ALWAYS_QUEUE_MESSAGES // #define ALWAYS_QUEUE_MESSAGES
static size_t get_max_send_queue(struct hub_info* hub)
{
return MAX(hub->config->max_send_buffer, (hub->config->max_recv_buffer * hub_get_user_count(hub)));
}
/*
* @return 1 if send queue is OK.
* -1 if send queue is overflowed
* 0 if soft send queue is overflowed (not implemented at the moment)
*/
static int check_send_queue(struct user* user, struct adc_message* msg)
{
if (user_flag_get(user, flag_user_list))
return 1;
if ((user->send_queue_size + msg->length) > get_max_send_queue(user->hub))
return -1;
return 1;
}
int route_to_user(struct user* user, struct adc_message* msg) int route_to_user(struct user* user, struct adc_message* msg)
{ {
@ -118,24 +138,23 @@ int route_to_user(struct user* user, struct adc_message* msg)
else else
#endif #endif
{ {
if (!user_flag_get(user, flag_user_list) && user->send_queue_size + msg->length > user->hub->config->max_send_buffer && msg->priority >= 0) ret = check_send_queue(user, msg);
if (ret == -1)
{ {
/* User is not able to swallow the data, let's cut our losses and disconnect. */ /* User is not able to swallow the data, let's cut our losses and disconnect. */
user_disconnect(user, quit_send_queue); user_disconnect(user, quit_send_queue);
return 0;
} }
else else if (ret == 1)
{
if (user->send_queue_size + msg->length > user->hub->config->max_send_buffer_soft && msg->priority >= 0)
{
/* Don't queue this message if it is low priority! */
}
else
{ {
/* queue command */
queue_command(user, msg, 0); queue_command(user, msg, 0);
if (user->ev_write) if (user->ev_write)
event_add(user->ev_write, NULL); event_add(user->ev_write, NULL);
} }
else
{
/* do not queue command as our soft-limits are exceeded */
} }
} }