Skip to content

Commit

Permalink
http-push: improve remote lock management
Browse files Browse the repository at this point in the history
Associate the remote locks with the remote repo, add a function to check
and refresh all current locks.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Nick Hengeveld authored and Junio C Hamano committed Mar 11, 2006
1 parent 3030baa commit 512d632
Showing 1 changed file with 76 additions and 73 deletions.
149 changes: 76 additions & 73 deletions http-push.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ struct repo
char *url;
int path_len;
struct packed_git *packs;
struct remote_lock *locks;
};

static struct repo *remote = NULL;
static struct remote_lock *remote_locks = NULL;

enum transfer_state {
NEED_PUSH,
Expand Down Expand Up @@ -135,7 +135,6 @@ struct remote_lock
char *token;
time_t start_time;
long timeout;
int active;
int refreshing;
struct remote_lock *next;
};
Expand Down Expand Up @@ -311,64 +310,69 @@ static void start_move(struct transfer_request *request)
}
}

static int refresh_lock(struct remote_lock *check_lock)
static int refresh_lock(struct remote_lock *lock)
{
struct active_request_slot *slot;
struct slot_results results;
char *if_header;
char timeout_header[25];
struct curl_slist *dav_headers = NULL;
struct remote_lock *lock;
int time_remaining;
time_t current_time;
int rc = 0;

/* Refresh all active locks if they're close to expiring */
for (lock = remote_locks; lock; lock = lock->next) {
if (!lock->active)
continue;
lock->refreshing = 1;

current_time = time(NULL);
time_remaining = lock->start_time + lock->timeout
- current_time;
if (time_remaining > LOCK_REFRESH)
continue;
if_header = xmalloc(strlen(lock->token) + 25);
sprintf(if_header, "If: (<opaquelocktoken:%s>)", lock->token);
sprintf(timeout_header, "Timeout: Second-%ld", lock->timeout);
dav_headers = curl_slist_append(dav_headers, if_header);
dav_headers = curl_slist_append(dav_headers, timeout_header);

lock->refreshing = 1;
slot = get_active_slot();
slot->results = &results;
curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url);
curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_LOCK);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

if_header = xmalloc(strlen(lock->token) + 25);
sprintf(if_header, "If: (<opaquelocktoken:%s>)", lock->token);
sprintf(timeout_header, "Timeout: Second-%ld", lock->timeout);
dav_headers = curl_slist_append(dav_headers, if_header);
dav_headers = curl_slist_append(dav_headers, timeout_header);
if (start_active_slot(slot)) {
run_active_slot(slot);
if (results.curl_result != CURLE_OK) {
fprintf(stderr, "LOCK HTTP error %ld\n",
results.http_code);
} else {
lock->start_time = time(NULL);
rc = 1;
}
}

slot = get_active_slot();
slot->results = &results;
curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url);
curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_LOCK);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
lock->refreshing = 0;
curl_slist_free_all(dav_headers);
free(if_header);

if (start_active_slot(slot)) {
run_active_slot(slot);
if (results.curl_result != CURLE_OK) {
fprintf(stderr, "Got HTTP error %ld\n", results.http_code);
lock->active = 0;
} else {
lock->active = 1;
lock->start_time = time(NULL);
return rc;
}

static void check_locks()
{
struct remote_lock *lock = remote->locks;
time_t current_time = time(NULL);
int time_remaining;

while (lock) {
time_remaining = lock->start_time + lock->timeout -
current_time;
if (!lock->refreshing && time_remaining < LOCK_REFRESH) {
if (!refresh_lock(lock)) {
fprintf(stderr,
"Unable to refresh lock for %s\n",
lock->url);
aborted = 1;
return;
}
}

lock->refreshing = 0;
curl_slist_free_all(dav_headers);
free(if_header);
lock = lock->next;
}

if (check_lock)
return check_lock->active;
else
return 0;
}

static void release_request(struct transfer_request *request)
Expand Down Expand Up @@ -396,7 +400,7 @@ static void finish_request(struct transfer_request *request)
request->slot = NULL;

/* Keep locks active */
refresh_lock(request->lock);
check_locks();

if (request->headers != NULL)
curl_slist_free_all(request->headers);
Expand Down Expand Up @@ -483,6 +487,9 @@ static void add_request(struct object *obj, struct remote_lock *lock)
struct transfer_request *request = request_queue_head;
struct packed_git *target;

/* Keep locks active */
check_locks();

/*
* Don't push the object if it's known to exist on the remote
* or is already in the request queue
Expand Down Expand Up @@ -893,7 +900,7 @@ static struct remote_lock *lock_remote(char *path, long timeout)
char *url;
char *ep;
char timeout_header[25];
struct remote_lock *lock = remote_locks;
struct remote_lock *lock = NULL;
XML_Parser parser = XML_ParserCreate(NULL);
enum XML_Status result;
struct curl_slist *dav_headers = NULL;
Expand All @@ -902,18 +909,6 @@ static struct remote_lock *lock_remote(char *path, long timeout)
url = xmalloc(strlen(remote->url) + strlen(path) + 1);
sprintf(url, "%s%s", remote->url, path);

/* Make sure the url is not already locked */
while (lock && strcmp(lock->url, url)) {
lock = lock->next;
}
if (lock) {
free(url);
if (refresh_lock(lock))
return lock;
else
return NULL;
}

/* Make sure leading directories exist for the remote ref */
ep = strchr(url + strlen(remote->url) + 11, '/');
while (ep) {
Expand Down Expand Up @@ -971,10 +966,7 @@ static struct remote_lock *lock_remote(char *path, long timeout)
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

lock = xcalloc(1, sizeof(*lock));
lock->owner = NULL;
lock->token = NULL;
lock->timeout = -1;
lock->refreshing = 0;

if (start_active_slot(slot)) {
run_active_slot(slot);
Expand Down Expand Up @@ -1016,10 +1008,9 @@ static struct remote_lock *lock_remote(char *path, long timeout)
lock = NULL;
} else {
lock->url = url;
lock->active = 1;
lock->start_time = time(NULL);
lock->next = remote_locks;
remote_locks = lock;
lock->next = remote->locks;
remote->locks = lock;
}

return lock;
Expand All @@ -1029,6 +1020,7 @@ static int unlock_remote(struct remote_lock *lock)
{
struct active_request_slot *slot;
struct slot_results results;
struct remote_lock *prev = remote->locks;
char *lock_token_header;
struct curl_slist *dav_headers = NULL;
int rc = 0;
Expand All @@ -1050,16 +1042,29 @@ static int unlock_remote(struct remote_lock *lock)
if (results.curl_result == CURLE_OK)
rc = 1;
else
fprintf(stderr, "Got HTTP error %ld\n",
fprintf(stderr, "UNLOCK HTTP error %ld\n",
results.http_code);
} else {
fprintf(stderr, "Unable to start request\n");
fprintf(stderr, "Unable to start UNLOCK request\n");
}

curl_slist_free_all(dav_headers);
free(lock_token_header);

lock->active = 0;
if (remote->locks == lock) {
remote->locks = lock->next;
} else {
while (prev && prev->next != lock)
prev = prev->next;
if (prev)
prev->next = prev->next->next;
}

if (lock->owner != NULL)
free(lock->owner);
free(lock->url);
free(lock->token);
free(lock);

return rc;
}
Expand Down Expand Up @@ -1597,18 +1602,15 @@ int main(int argc, char **argv)
struct transfer_request *next_request;
int nr_refspec = 0;
char **refspec = NULL;
struct remote_lock *ref_lock;
struct remote_lock *ref_lock = NULL;
struct rev_info revs;
int rc = 0;
int i;

setup_git_directory();
setup_ident();

remote = xmalloc(sizeof(*remote));
remote->url = NULL;
remote->path_len = 0;
remote->packs = NULL;
remote = xcalloc(sizeof(*remote), 1);

argv++;
for (i = 1; i < argc; i++, argv++) {
Expand Down Expand Up @@ -1787,6 +1789,7 @@ int main(int argc, char **argv)
if (!rc)
fprintf(stderr, " done\n");
unlock_remote(ref_lock);
check_locks();
}

cleanup:
Expand Down

0 comments on commit 512d632

Please sign in to comment.