ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/multifd: Move trace_multifd_send|recv() 

Move them into fill/unfill of packets.  With that, we can further cleanup
the send/recv thread procedure, and remove one more temp var.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240202102857.110210-12-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Peter Xu 2024-02-02 18:28:45 +08:00
parent db7e1cc510
commit 8a9ef17380
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/multifd.c
View File

@ -291,6 +291,9 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)
p->packets_sent++; p->packets_sent++;
p->total_normal_pages += pages->num; p->total_normal_pages += pages->num;
trace_multifd_send(p->id, p->packet_num, pages->num, p->flags,
p->next_packet_size);
} }
static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
@ -341,6 +344,9 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
p->packets_recved++; p->packets_recved++;
p->total_normal_pages += p->normal_num; p->total_normal_pages += p->normal_num;
trace_multifd_recv(p->id, p->packet_num, p->normal_num, p->flags,
p->next_packet_size);
if (p->normal_num == 0) { if (p->normal_num == 0) {
return 0; return 0;
} }
@ -704,7 +710,6 @@ static void *multifd_send_thread(void *opaque)
qemu_mutex_lock(&p->mutex); qemu_mutex_lock(&p->mutex);
if (qatomic_read(&p->pending_job)) { if (qatomic_read(&p->pending_job)) {
uint64_t packet_num = p->packet_num;
MultiFDPages_t *pages = p->pages; MultiFDPages_t *pages = p->pages;
if (use_zero_copy_send) { if (use_zero_copy_send) {
@ -722,8 +727,6 @@ static void *multifd_send_thread(void *opaque)
} }
multifd_send_fill_packet(p); multifd_send_fill_packet(p);
trace_multifd_send(p->id, packet_num, pages->num, p->flags,
p->next_packet_size);
if (use_zero_copy_send) { if (use_zero_copy_send) {
/* Send header first, without zerocopy */ /* Send header first, without zerocopy */
@ -1123,8 +1126,6 @@ static void *multifd_recv_thread(void *opaque)
flags = p->flags; flags = p->flags;
/* recv methods don't know how to handle the SYNC flag */ /* recv methods don't know how to handle the SYNC flag */
p->flags &= ~MULTIFD_FLAG_SYNC; p->flags &= ~MULTIFD_FLAG_SYNC;
trace_multifd_recv(p->id, p->packet_num, p->normal_num, flags,
p->next_packet_size);
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
if (p->normal_num) { if (p->normal_num) {