Make function to refill http queue a callback
This eliminates the last function provided by the code using http.h as a global symbol, so it should be possible to have multiple programs using http.h in the same executable, and it also adds an argument to that callback, so that info can be passed into the callback without being global. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
45c1741235
commit
fc57b6aaa5
30
http.c
30
http.c
@ -391,13 +391,39 @@ int start_active_slot(struct active_request_slot *slot)
|
||||
}
|
||||
|
||||
#ifdef USE_CURL_MULTI
|
||||
struct fill_chain {
|
||||
void *data;
|
||||
int (*fill)(void *);
|
||||
struct fill_chain *next;
|
||||
};
|
||||
|
||||
static struct fill_chain *fill_cfg = NULL;
|
||||
|
||||
void add_fill_function(void *data, int (*fill)(void *))
|
||||
{
|
||||
struct fill_chain *new = malloc(sizeof(*new));
|
||||
struct fill_chain **linkp = &fill_cfg;
|
||||
new->data = data;
|
||||
new->fill = fill;
|
||||
new->next = NULL;
|
||||
while (*linkp)
|
||||
linkp = &(*linkp)->next;
|
||||
*linkp = new;
|
||||
}
|
||||
|
||||
void fill_active_slots(void)
|
||||
{
|
||||
struct active_request_slot *slot = active_queue_head;
|
||||
|
||||
while (active_requests < max_requests)
|
||||
if (!fill_active_slot())
|
||||
while (active_requests < max_requests) {
|
||||
struct fill_chain *fill;
|
||||
for (fill = fill_cfg; fill; fill = fill->next)
|
||||
if (fill->fill(fill->data))
|
||||
break;
|
||||
|
||||
if (!fill)
|
||||
break;
|
||||
}
|
||||
|
||||
while (slot != NULL) {
|
||||
if (!slot->in_use && slot->curl != NULL) {
|
||||
|
||||
Reference in New Issue
Block a user