mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
progressmeter: protect with a mutex
Progressmeter is protected by the AioContext mutex, which is taken by the block jobs and their caller (like blockdev). We would like to remove the dependency of block layer code on the AioContext mutex, since most drivers and the core I/O code are already not relying on it. Create a new C file to implement the ProgressMeter API, but keep the struct as public, to avoid forcing allocation on the heap. Also add a mutex to be able to provide an accurate snapshot of the progress values to the caller. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <20210614081130.22134-5-eesposit@redhat.com> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
parent
c02b83ed1f
commit
a7b4f8fc09
7 changed files with 122 additions and 26 deletions
|
@ -900,6 +900,7 @@ static void common_block_job_cb(void *opaque, int ret)
|
|||
|
||||
static void run_block_job(BlockJob *job, Error **errp)
|
||||
{
|
||||
uint64_t progress_current, progress_total;
|
||||
AioContext *aio_context = blk_get_aio_context(job->blk);
|
||||
int ret = 0;
|
||||
|
||||
|
@ -908,9 +909,11 @@ static void run_block_job(BlockJob *job, Error **errp)
|
|||
do {
|
||||
float progress = 0.0f;
|
||||
aio_poll(aio_context, true);
|
||||
if (job->job.progress.total) {
|
||||
progress = (float)job->job.progress.current /
|
||||
job->job.progress.total * 100.f;
|
||||
|
||||
progress_get_snapshot(&job->job.progress, &progress_current,
|
||||
&progress_total);
|
||||
if (progress_total) {
|
||||
progress = (float)progress_current / progress_total * 100.f;
|
||||
}
|
||||
qemu_progress_print(progress, 0);
|
||||
} while (!job_is_ready(&job->job) && !job_is_completed(&job->job));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue