Commit 30a5c887 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

job: Move progress fields to Job 



BlockJob has fields .offset and .len, which are actually misnomers today
because they are no longer tied to block device sizes, but just progress
counters. As such they make a lot of sense in generic Jobs.

This patch moves the fields to Job and renames them to .progress_current
and .progress_total to describe their function better.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 2e1795b5

block/backup.c

+4 −4
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job, 
         * offset field is an opaque progress value, it is not a disk offset.

         */

        job->bytes_read += n;

        block_job_progress_update(&job->common, n);

        job_progress_update(&job->common.job, n);

    }



out:
@@ -406,8 +406,8 @@ static void backup_incremental_init_copy_bitmap(BackupBlockJob *job) 
        bdrv_set_dirty_iter(dbi, next_cluster * job->cluster_size);

    }



    /* TODO block_job_progress_set_remaining() would make more sense */

    block_job_progress_update(&job->common,

    /* TODO job_progress_set_remaining() would make more sense */

    job_progress_update(&job->common.job,

        job->len - hbitmap_count(job->copy_bitmap) * job->cluster_size);



    bdrv_dirty_iter_free(dbi);
@@ -425,7 +425,7 @@ static void coroutine_fn backup_run(void *opaque) 
    qemu_co_rwlock_init(&job->flush_rwlock);



    nb_clusters = DIV_ROUND_UP(job->len, job->cluster_size);

    block_job_progress_set_remaining(&job->common, job->len);

    job_progress_set_remaining(&job->common.job, job->len);



    job->copy_bitmap = hbitmap_alloc(nb_clusters, 0);

    if (job->sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) {

block/commit.c

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void coroutine_fn commit_run(void *opaque) 
    if (len < 0) {

        goto out;

    }

    block_job_progress_set_remaining(&s->common, len);

    job_progress_set_remaining(&s->common.job, len);



    ret = base_len = blk_getlength(s->base);

    if (base_len < 0) {
@@ -196,7 +196,7 @@ static void coroutine_fn commit_run(void *opaque) 
            }

        }

        /* Publish progress */

        block_job_progress_update(&s->common, n);

        job_progress_update(&s->common.job, n);



        if (copy) {

            delay_ns = block_job_ratelimit_get_delay(&s->common, n);

block/mirror.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void mirror_iteration_done(MirrorOp *op, int ret) 
            bitmap_set(s->cow_bitmap, chunk_num, nb_chunks);

        }

        if (!s->initial_zeroing_ongoing) {

            block_job_progress_update(&s->common, op->bytes);

            job_progress_update(&s->common.job, op->bytes);

        }

    }

    qemu_iovec_destroy(&op->qiov);
@@ -792,7 +792,7 @@ static void coroutine_fn mirror_run(void *opaque) 
        /* cnt is the number of dirty bytes remaining and s->bytes_in_flight is

         * the number of bytes currently being processed; together those are

         * the current remaining operation length */

        block_job_progress_set_remaining(&s->common, s->bytes_in_flight + cnt);

        job_progress_set_remaining(&s->common.job, s->bytes_in_flight + cnt);



        /* Note that even when no rate limit is applied we need to yield

         * periodically with no pending I/O so that bdrv_drain_all() returns.

block/stream.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void coroutine_fn stream_run(void *opaque) 
        ret = len;

        goto out;

    }

    block_job_progress_set_remaining(&s->common, len);

    job_progress_set_remaining(&s->common.job, len);



    buf = qemu_blockalign(bs, STREAM_BUFFER_SIZE);
@@ -184,7 +184,7 @@ static void coroutine_fn stream_run(void *opaque) 
        ret = 0;



        /* Publish progress */

        block_job_progress_update(&s->common, n);

        job_progress_update(&s->common.job, n);

        if (copy) {

            delay_ns = block_job_ratelimit_get_delay(&s->common, n);

        } else {

blockjob.c

+8 −18
Original line number Diff line number Diff line
@@ -242,16 +242,6 @@ int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n) 
    return ratelimit_calculate_delay(&job->limit, n);

}



void block_job_progress_update(BlockJob *job, uint64_t done)

{

    job->offset += done;

}



void block_job_progress_set_remaining(BlockJob *job, uint64_t remaining)

{

    job->len = job->offset + remaining;

}



BlockJobInfo *block_job_query(BlockJob *job, Error **errp)

{

    BlockJobInfo *info;
@@ -263,10 +253,10 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp) 
    info = g_new0(BlockJobInfo, 1);

    info->type      = g_strdup(job_type_str(&job->job));

    info->device    = g_strdup(job->job.id);

    info->len       = job->len;

    info->busy      = atomic_read(&job->job.busy);

    info->paused    = job->job.pause_count > 0;

    info->offset    = job->offset;

    info->offset    = job->job.progress_current;

    info->len       = job->job.progress_total;

    info->speed     = job->speed;

    info->io_status = job->iostatus;

    info->ready     = job_is_ready(&job->job),
@@ -296,8 +286,8 @@ static void block_job_event_cancelled(Notifier *n, void *opaque) 


    qapi_event_send_block_job_cancelled(job_type(&job->job),

                                        job->job.id,

                                        job->len,

                                        job->offset,

                                        job->job.progress_total,

                                        job->job.progress_current,

                                        job->speed,

                                        &error_abort);

}
@@ -317,8 +307,8 @@ static void block_job_event_completed(Notifier *n, void *opaque) 


    qapi_event_send_block_job_completed(job_type(&job->job),

                                        job->job.id,

                                        job->len,

                                        job->offset,

                                        job->job.progress_total,

                                        job->job.progress_current,

                                        job->speed,

                                        !!msg,

                                        msg,
@@ -348,8 +338,8 @@ static void block_job_event_ready(Notifier *n, void *opaque) 


    qapi_event_send_block_job_ready(job_type(&job->job),

                                    job->job.id,

                                    job->len,

                                    job->offset,

                                    job->job.progress_total,

                                    job->job.progress_current,

                                    job->speed, &error_abort);

}