Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

advio: add file size to log output

Browse source
This commit is contained in:
Steffen Vogel 2017-06-17 18:50:18 +02:00
parent 88057e8feb
commit ec48dbd5ef
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/advio.c
View file

@ -83,7 +83,7 @@ static char * advio_human_size(double s, char *buf, size_t len)
i++;
}
snprintf(buf, len, "%.2f %s", s, units[i]);
snprintf(buf, len, "%.*f %s", i ? 2 : 0, s, units[i]);
return buf;
}
@ -292,6 +292,9 @@ int aupload(AFILE *af, int resume)
long pos, end;
double total_bytes = 0, total_time = 0;
char buf[2][32];
pos = aftell(af);
fseek(af->file, 0, SEEK_END);
end = aftell(af);
@ -301,11 +304,15 @@ int aupload(AFILE *af, int resume)
if (end == af->uploaded)
return 0;
info("Resume upload of %s from offset %lu", af->uri, af->uploaded);
char *size_human = advio_human_size(end - af->uploaded, buf[0], sizeof(buf[0]));
info("Resume upload of %s of %s from offset %lu", af->uri, size_human, af->uploaded);
curl_easy_setopt(af->curl, CURLOPT_RESUME_FROM, af->uploaded);
}
else {
info("Start upload of %s", af->uri);
char *size_human = advio_human_size(end, buf[0], sizeof(buf[0]));
info("Start upload of %s of %s", af->uri, size_human);
curl_easy_setopt(af->curl, CURLOPT_RESUME_FROM, 0);
}
@ -322,9 +329,6 @@ int aupload(AFILE *af, int resume)
sha1sum(af->file, af->hash);
double total_bytes = 0, total_time = 0;
char buf[2][32];
curl_easy_getinfo(af->curl, CURLINFO_SIZE_UPLOAD, &total_bytes);
curl_easy_getinfo(af->curl, CURLINFO_TOTAL_TIME, &total_time);