proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-20 07:52:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1042 from pwkelley/progress_cb

Browse Source 
Fix bytes_received in fetch tests - we weren't calling the callback
This commit is contained in:
Philip Kelley 2012-11-02 11:42:45 -07:00
commit 1e99ce9ac7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/transports/smart_protocol.c
View File

@ -371,7 +371,7 @@ struct network_packetsize_payload
git_transfer_progress_callback callback; git_transfer_progress_callback callback;
void *payload; void *payload;
git_transfer_progress *stats; git_transfer_progress *stats;
git_off_t last_fired_bytes; size_t last_fired_bytes;
}; };
static void network_packetsize(int received, void *payload) static void network_packetsize(int received, void *payload)
@ -402,12 +402,18 @@ int git_smart__download_pack(
int error = -1; int error = -1;
struct network_packetsize_payload npp = {0}; struct network_packetsize_payload npp = {0};
memset(stats, 0, sizeof(git_transfer_progress));
if (progress_cb) { if (progress_cb) {
npp.callback = progress_cb; npp.callback = progress_cb;
npp.payload = progress_payload; npp.payload = progress_payload;
npp.stats = stats; npp.stats = stats;
t->packetsize_cb = &network_packetsize; t->packetsize_cb = &network_packetsize;
t->packetsize_payload = &npp; t->packetsize_payload = &npp;
/* We might have something in the buffer already from negotiate_fetch */
if (t->buffer.offset > 0)
t->packetsize_cb(t->buffer.offset, t->packetsize_payload);
} }
if (git_buf_joinpath(&path, git_repository_path(repo), "objects/pack") < 0) if (git_buf_joinpath(&path, git_repository_path(repo), "objects/pack") < 0)
@ -416,9 +422,6 @@ int git_smart__download_pack(
if (git_indexer_stream_new(&idx, git_buf_cstr(&path), progress_cb, progress_payload) < 0) if (git_indexer_stream_new(&idx, git_buf_cstr(&path), progress_cb, progress_payload) < 0)
goto on_error; goto on_error;
git_buf_free(&path);
memset(stats, 0, sizeof(git_transfer_progress));
/* /*
* If the remote doesn't support the side-band, we can feed * If the remote doesn't support the side-band, we can feed
* the data directly to the indexer. Otherwise, we need to * the data directly to the indexer. Otherwise, we need to
@ -428,8 +431,7 @@ int git_smart__download_pack(
if (no_sideband(t, idx, buf, stats) < 0) if (no_sideband(t, idx, buf, stats) < 0)
goto on_error; goto on_error;
git_indexer_stream_free(idx); goto on_success;
return 0;
} }
do { do {
@ -466,11 +468,16 @@ int git_smart__download_pack(
if (git_indexer_stream_finalize(idx, stats) < 0) if (git_indexer_stream_finalize(idx, stats) < 0)
goto on_error; goto on_error;
git_indexer_stream_free(idx); on_success:
return 0; error = 0;
on_error: on_error:
git_buf_free(&path); git_buf_free(&path);
git_indexer_stream_free(idx); git_indexer_stream_free(idx);
/* Trailing execution of progress_cb, if necessary */
if (npp.callback && npp.stats->received_bytes > npp.last_fired_bytes)
npp.callback(npp.stats, npp.payload);
return error; return error;
} }