ssb: Don't schedule duplicate history stream requests for the same account. Changes how we schedule idle work. Let's see if this is better.
All checks were successful
Build Tilde Friends / Build-All (push) Successful in 22m35s
All checks were successful
Build Tilde Friends / Build-All (push) Successful in 22m35s
This commit is contained in:
50
src/ssb.c
50
src/ssb.c
@ -261,6 +261,7 @@ typedef struct _tf_ssb_connection_message_request_t
|
||||
|
||||
typedef struct _tf_ssb_connection_scheduled_t
|
||||
{
|
||||
char key[k_id_base64_len];
|
||||
tf_ssb_scheduled_callback_t* callback;
|
||||
void* user_data;
|
||||
} tf_ssb_connection_scheduled_t;
|
||||
@ -595,24 +596,55 @@ static void _tf_ssb_connection_dispatch_scheduled(tf_ssb_connection_t* connectio
|
||||
{
|
||||
while (((connection->active_write_count == 0 && connection->read_back_pressure == 0) || connection->closing) && connection->scheduled_count && connection->scheduled)
|
||||
{
|
||||
tf_ssb_connection_scheduled_t scheduled = connection->scheduled[0];
|
||||
memmove(connection->scheduled, connection->scheduled + 1, sizeof(tf_ssb_connection_scheduled_t) * (connection->scheduled_count - 1));
|
||||
int index = uv_hrtime() % connection->scheduled_count;
|
||||
tf_ssb_connection_scheduled_t scheduled = connection->scheduled[index];
|
||||
if (index != connection->scheduled_count - 1)
|
||||
{
|
||||
memmove(connection->scheduled + index, connection->scheduled + index + 1, sizeof(tf_ssb_connection_scheduled_t) * (connection->scheduled_count - index - 1));
|
||||
}
|
||||
connection->scheduled_count--;
|
||||
tf_trace_begin(connection->ssb->trace, "scheduled callback");
|
||||
PRE_CALLBACK(connection->ssb, scheduled.callback);
|
||||
scheduled.callback(connection, scheduled.user_data);
|
||||
scheduled.callback(connection, false, scheduled.user_data);
|
||||
POST_CALLBACK(connection->ssb, scheduled.callback);
|
||||
tf_trace_end(connection->ssb->trace);
|
||||
}
|
||||
}
|
||||
|
||||
void tf_ssb_connection_schedule_idle(tf_ssb_connection_t* connection, tf_ssb_scheduled_callback_t* callback, void* user_data)
|
||||
static int _tf_ssb_connection_scheduled_compare(const void* a, const void* b)
|
||||
{
|
||||
connection->scheduled = tf_resize_vec(connection->scheduled, sizeof(tf_ssb_connection_scheduled_t) * (connection->scheduled_count + 1));
|
||||
connection->scheduled[connection->scheduled_count++] = (tf_ssb_connection_scheduled_t) {
|
||||
.callback = callback,
|
||||
.user_data = user_data,
|
||||
};
|
||||
const char* key = a;
|
||||
const tf_ssb_connection_scheduled_t* scheduled = b;
|
||||
return strcmp(key, scheduled->key);
|
||||
}
|
||||
|
||||
void tf_ssb_connection_schedule_idle(tf_ssb_connection_t* connection, const char* key, tf_ssb_scheduled_callback_t* callback, void* user_data)
|
||||
{
|
||||
int index = tf_util_insert_index(key, connection->scheduled, connection->scheduled_count, sizeof(tf_ssb_connection_scheduled_t), _tf_ssb_connection_scheduled_compare);
|
||||
if (index != connection->scheduled_count && strcmp(key, connection->scheduled[index].key) == 0)
|
||||
{
|
||||
tf_ssb_connection_scheduled_t scheduled = connection->scheduled[index];
|
||||
connection->scheduled[index].callback = callback;
|
||||
connection->scheduled[index].user_data = user_data;
|
||||
|
||||
tf_trace_begin(connection->ssb->trace, "scheduled callback (skip)");
|
||||
PRE_CALLBACK(connection->ssb, scheduled.callback);
|
||||
scheduled.callback(connection, true, scheduled.user_data);
|
||||
POST_CALLBACK(connection->ssb, scheduled.callback);
|
||||
tf_trace_end(connection->ssb->trace);
|
||||
}
|
||||
else
|
||||
{
|
||||
connection->scheduled = tf_resize_vec(connection->scheduled, sizeof(tf_ssb_connection_scheduled_t) * (connection->scheduled_count + 1));
|
||||
memmove(connection->scheduled + index + 1, connection->scheduled + index, sizeof(tf_ssb_connection_scheduled_t) * (connection->scheduled_count - index));
|
||||
connection->scheduled[index] = (tf_ssb_connection_scheduled_t) {
|
||||
.callback = callback,
|
||||
.user_data = user_data,
|
||||
};
|
||||
snprintf(connection->scheduled[index].key, sizeof(connection->scheduled[index].key), "%s", key);
|
||||
connection->scheduled_count++;
|
||||
}
|
||||
|
||||
uv_async_send(&connection->scheduled_async);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user