From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53C4CC32750 for ; Wed, 14 Aug 2019 02:04:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EEB020844 for ; Wed, 14 Aug 2019 02:04:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EEB020844 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxids-0002o2-2a for qemu-devel@archiver.kernel.org; Tue, 13 Aug 2019 22:04:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50944) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxicQ-0001Ev-LF for qemu-devel@nongnu.org; Tue, 13 Aug 2019 22:02:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxicP-0005Ft-Fw for qemu-devel@nongnu.org; Tue, 13 Aug 2019 22:02:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37805) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxicN-0005FQ-Iv for qemu-devel@nongnu.org; Tue, 13 Aug 2019 22:02:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 183BB3082B67 for ; Wed, 14 Aug 2019 02:02:25 +0000 (UTC) Received: from localhost.localdomain (ovpn-117-78.ams2.redhat.com [10.36.117.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 255064AD; Wed, 14 Aug 2019 02:02:23 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 14 Aug 2019 04:02:13 +0200 Message-Id: <20190814020218.1868-2-quintela@redhat.com> In-Reply-To: <20190814020218.1868-1-quintela@redhat.com> References: <20190814020218.1868-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 14 Aug 2019 02:02:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/6] migration: Add traces for multifd terminate threads X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Juan Quintela --- migration/ram.c | 4 ++++ migration/trace-events | 2 ++ 2 files changed, 6 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 889148dd84..ca11d43e30 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -996,6 +996,8 @@ static void multifd_send_terminate_threads(Error *err= ) { int i; =20 + trace_multifd_send_terminate_threads(err !=3D NULL); + if (err) { MigrationState *s =3D migrate_get_current(); migrate_set_error(s, err); @@ -1254,6 +1256,8 @@ static void multifd_recv_terminate_threads(Error *e= rr) { int i; =20 + trace_multifd_recv_terminate_threads(err !=3D NULL); + if (err) { MigrationState *s =3D migrate_get_current(); migrate_set_error(s, err); diff --git a/migration/trace-events b/migration/trace-events index d8e54c367a..886ce70ca0 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -85,12 +85,14 @@ multifd_recv(uint8_t id, uint64_t packet_num, uint32_= t used, uint32_t flags, uin multifd_recv_sync_main(long packet_num) "packet num %ld" multifd_recv_sync_main_signal(uint8_t id) "channel %d" multifd_recv_sync_main_wait(uint8_t id) "channel %d" +multifd_recv_terminate_threads(bool error) "error %d" multifd_recv_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "c= hannel %d packets %" PRIu64 " pages %" PRIu64 multifd_recv_thread_start(uint8_t id) "%d" multifd_send(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t fl= ags, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " pages = %d flags 0x%x next packet size %d" multifd_send_sync_main(long packet_num) "packet num %ld" multifd_send_sync_main_signal(uint8_t id) "channel %d" multifd_send_sync_main_wait(uint8_t id) "channel %d" +multifd_send_terminate_threads(bool error) "error %d" multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "c= hannel %d packets %" PRIu64 " pages %" PRIu64 multifd_send_thread_start(uint8_t id) "%d" ram_discard_range(const char *rbname, uint64_t start, size_t len) "%s: s= tart: %" PRIx64 " %zx" --=20 2.21.0