From patchwork Mon Mar 27 09:06:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Otto X-Patchwork-Id: 9645753 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AAA46602BF for ; Mon, 27 Mar 2017 09:20:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A192A2815E for ; Mon, 27 Mar 2017 09:20:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 966A428236; Mon, 27 Mar 2017 09:20:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CE5B52815E for ; Mon, 27 Mar 2017 09:20:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csQnN-0000sD-Q7; Mon, 27 Mar 2017 09:18:37 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csQnM-0000rv-31 for xen-devel@lists.xenproject.org; Mon, 27 Mar 2017 09:18:36 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id F1/28-21675-BE8D8D85; Mon, 27 Mar 2017 09:18:35 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOIsWRWlGSWpSXmKPExsXSmNjwSffVjRs RBgvaNSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oy5J9+wF9zyrfgyPaSB8ZtFFyMXh5DAEiaJ G0f2s3QxcnKwCPhInO7oYgRJsAj8Z5JYdusYM0iCTUBdYvuijewgtoiAksS9VZOZQIqYBQ4yS pw5fxisSFggSeL6o9esEJNUJe6eByni5OAVcJG4s20zI4gtISAncfNcJ1g9J1D82MVDbCC2kI CzxLXDvVA1xRKdV3ewQNghEl97r7BC2DoSL36sZ4Ow4yX2758NNJ8DyDaReDDFEyIsKtF9+Bn YAxIC8xklzrc1sk1gFF7AyLCKUaM4tagstUjX0FgvqSgzPaMkNzEzR9fQwEwvN7W4ODE9NScx qVgvOT93EyMwQBmAYAfjl2UBhxglOZiURHk/nL4RIcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC1 /A6UE6wKDU9tSItMwcYKzBpCQ4eJRHeBpA0b3FBYm5xZjpE6hSjopQ4ryZIQgAkkVGaB9cGi8 9LjLJSwryMQIcI8RSkFuVmlqDKv2IU52BUEuZNBJnCk5lXAjf9FdBiJqDFh+eDLS5JREhJNTB OevEl792PaycrDbf9Pcv5WuGW4Nd6j2eT9C9zf7jialnDddVz+c5dYQWix+e9ZtRS2Tfrjcyb Dvm/ZQmTMnSVrst5vatY+yv935tF+dtkWv8s0bvjkrFlxa7AM83mJ3drn41RvR4r8HVWytXSo 3KWe+2t9/cEndJnEzl+74lJ99vKs7oh84vmKrEUZyQaajEXFScCAGr0tKfKAgAA X-Env-Sender: jtotto@uwaterloo.ca X-Msg-Ref: server-13.tower-27.messagelabs.com!1490606313!84393349!1 X-Originating-IP: [129.97.128.242] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20987 invoked from network); 27 Mar 2017 09:18:34 -0000 Received: from mailchk-m06.uwaterloo.ca (HELO mailchk-m06.uwaterloo.ca) (129.97.128.242) by server-13.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 27 Mar 2017 09:18:34 -0000 Received: from eagle.uwaterloo.ca (cs-auth-dc-129-97-60-142.dynamic.uwaterloo.ca [129.97.60.142]) (authenticated bits=0) by mailchk-m06.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id v2R97DTX023326 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NO); Mon, 27 Mar 2017 05:16:57 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 mailchk-m06.uwaterloo.ca v2R97DTX023326 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uwaterloo.ca; s=default; t=1490606310; bh=K9WradIqbWlKAzr0oFEXUaW+M/Q8B/yB4D/uphlZgNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jCd2L0puZpzG2gwQ1iythM42M9f35y7AieZFWBiz1kOo0ym7wyJMMqu8VdCdFsr9z OUk6Si4lBV3vWHqIEbHUqjnBclWUV82Sn+83U70i/+Jjo2YJ3ux2tXErEmcIKFoTEf 0m4GnjGjv3pZ8ApJGOQWEditqb9s1Cu0OKFKYTi4= From: Joshua Otto To: xen-devel@lists.xenproject.org Date: Mon, 27 Mar 2017 05:06:29 -0400 Message-Id: <1490605592-12189-18-git-send-email-jtotto@uwaterloo.ca> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490605592-12189-1-git-send-email-jtotto@uwaterloo.ca> References: <1490605592-12189-1-git-send-email-jtotto@uwaterloo.ca> X-UUID: 139be562-bb62-402e-b681-f84ee124d8cb X-Miltered: at mailchk-m06 with ID 58D8D641.001 by Joe's j-chkmail (http://j-chkmail.ensmp.fr)! X-Virus-Scanned: clamav-milter 0.99.2 at mailchk-m06 X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mailchk-m06.uwaterloo.ca [129.97.128.141]); Mon, 27 Mar 2017 05:18:30 -0400 (EDT) Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, czylin@uwaterloo.ca, Joshua Otto , imhy.yang@gmail.com, hjarmstr@uwaterloo.ca Subject: [Xen-devel] [PATCH RFC 17/20] libxl/libxl_stream_read.c: track callback chains with an explicit phase X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP As the previous patch did for libxl_stream_write, do for libxl_stream_read. libxl_stream_read already has a notion of phase for its record-buffering behaviour - this is combined with the callback chain phase. Again, this is done to support the addition of a new callback chain for postcopy live migration. No functional change. Signed-off-by: Joshua Otto --- tools/libxl/libxl_internal.h | 7 ++-- tools/libxl/libxl_stream_read.c | 83 +++++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e99d2ef..c754706 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3123,9 +3123,7 @@ struct libxl__stream_read_state { /* Private */ int rc; bool running; - bool in_checkpoint; bool sync_teardown; /* Only used to coordinate shutdown on error path. */ - bool in_checkpoint_state; libxl__save_helper_state shs; libxl__conversion_helper_state chs; @@ -3135,8 +3133,9 @@ struct libxl__stream_read_state { LIBXL_STAILQ_HEAD(, libxl__sr_record_buf) record_queue; /* NOGC */ enum { SRS_PHASE_NORMAL, - SRS_PHASE_BUFFERING, - SRS_PHASE_UNBUFFERING, + SRS_PHASE_CHECKPOINT_BUFFERING, + SRS_PHASE_CHECKPOINT_UNBUFFERING, + SRS_PHASE_CHECKPOINT_STATE } phase; bool recursion_guard; diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index 89c2f21..4cb553e 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -29,14 +29,15 @@ * processed, and all records will be processed in queue order. * * Internal states: - * running phase in_ record incoming - * checkpoint _queue _record + * running phase record incoming + * _queue _record * - * Undefined undef undef undef undef undef - * Idle false undef false 0 0 - * Active true NORMAL false 0/1 0/partial - * Active true BUFFERING true any 0/partial - * Active true UNBUFFERING true any 0 + * Undefined undef undef undef undef + * Idle false undef 0 0 + * Active true NORMAL 0/1 0/partial + * Active true CHECKPOINT_BUFFERING any 0/partial + * Active true CHECKPOINT_UNBUFFERING any 0 + * Active true CHECKPOINT_STATE 0/1 0/partial * * While reading data from the stream, 'dc' is active and a callback * is expected. Most actions in process_record() start a callback of @@ -48,12 +49,12 @@ * Records are read one at time and immediately processed. (The * record queue will not contain more than a single record.) * - * PHASE_BUFFERING: + * PHASE_CHECKPOINT_BUFFERING: * This phase is used in checkpointed streams, when libxc signals * the presence of a checkpoint in the stream. Records are read and * buffered until a CHECKPOINT_END record has been read. * - * PHASE_UNBUFFERING: + * PHASE_CHECKPOINT_UNBUFFERING: * Once a CHECKPOINT_END record has been read, all buffered records * are processed. * @@ -172,6 +173,12 @@ static void checkpoint_state_done(libxl__egc *egc, /*----- Helpers -----*/ +static inline bool stream_in_checkpoint(libxl__stream_read_state *stream) +{ + return stream->phase == SRS_PHASE_CHECKPOINT_BUFFERING || + stream->phase == SRS_PHASE_CHECKPOINT_UNBUFFERING; +} + /* Helper to set up reading some data from the stream. */ static int setup_read(libxl__stream_read_state *stream, const char *what, void *ptr, size_t nr_bytes, @@ -210,7 +217,6 @@ void libxl__stream_read_init(libxl__stream_read_state *stream) stream->rc = 0; stream->running = false; - stream->in_checkpoint = false; stream->sync_teardown = false; FILLZERO(stream->dc); FILLZERO(stream->hdr); @@ -297,10 +303,9 @@ void libxl__stream_read_start_checkpoint(libxl__egc *egc, libxl__stream_read_state *stream) { assert(stream->running); - assert(!stream->in_checkpoint); + assert(stream->phase == SRS_PHASE_NORMAL); - stream->in_checkpoint = true; - stream->phase = SRS_PHASE_BUFFERING; + stream->phase = SRS_PHASE_CHECKPOINT_BUFFERING; /* * Libxc has handed control of the fd to us. Start reading some @@ -392,6 +397,7 @@ static void stream_continue(libxl__egc *egc, switch (stream->phase) { case SRS_PHASE_NORMAL: + case SRS_PHASE_CHECKPOINT_STATE: /* * Normal phase (regular migration or restore from file): * @@ -416,9 +422,9 @@ static void stream_continue(libxl__egc *egc, } break; - case SRS_PHASE_BUFFERING: { + case SRS_PHASE_CHECKPOINT_BUFFERING: { /* - * Buffering phase (checkpointed streams only): + * Buffering phase: * * logically: * do { read_record(); } while ( not CHECKPOINT_END ); @@ -431,8 +437,6 @@ static void stream_continue(libxl__egc *egc, libxl__sr_record_buf *rec = LIBXL_STAILQ_LAST( &stream->record_queue, libxl__sr_record_buf, entry); - assert(stream->in_checkpoint); - if (!rec || (rec->hdr.type != REC_TYPE_CHECKPOINT_END)) { setup_read_record(egc, stream); break; @@ -442,19 +446,18 @@ static void stream_continue(libxl__egc *egc, * There are now some number of buffered records, with a * CHECKPOINT_END at the end. Start processing them all. */ - stream->phase = SRS_PHASE_UNBUFFERING; + stream->phase = SRS_PHASE_CHECKPOINT_UNBUFFERING; } /* FALLTHROUGH */ - case SRS_PHASE_UNBUFFERING: + case SRS_PHASE_CHECKPOINT_UNBUFFERING: /* - * Unbuffering phase (checkpointed streams only): + * Unbuffering phase: * * logically: * do { process_record(); } while ( not CHECKPOINT_END ); * * Process all records collected during the buffering phase. */ - assert(stream->in_checkpoint); while (process_record(egc, stream)) ; /* @@ -625,7 +628,7 @@ static bool process_record(libxl__egc *egc, break; case REC_TYPE_CHECKPOINT_END: - if (!stream->in_checkpoint) { + if (!stream_in_checkpoint(stream)) { LOG(ERROR, "Unexpected CHECKPOINT_END record in stream"); rc = ERROR_FAIL; goto err; @@ -634,7 +637,7 @@ static bool process_record(libxl__egc *egc, break; case REC_TYPE_CHECKPOINT_STATE: - if (!stream->in_checkpoint_state) { + if (stream->phase != SRS_PHASE_CHECKPOINT_STATE) { LOG(ERROR, "Unexpected CHECKPOINT_STATE record in stream"); rc = ERROR_FAIL; goto err; @@ -743,7 +746,12 @@ static void stream_complete(libxl__egc *egc, { assert(stream->running); - if (stream->in_checkpoint) { + switch (stream->phase) { + case SRS_PHASE_NORMAL: + stream_done(egc, stream, rc); + break; + case SRS_PHASE_CHECKPOINT_BUFFERING: + case SRS_PHASE_CHECKPOINT_UNBUFFERING: assert(rc); /* @@ -752,10 +760,8 @@ static void stream_complete(libxl__egc *egc, * libxl__xc_domain_restore_done() */ checkpoint_done(egc, stream, rc); - return; - } - - if (stream->in_checkpoint_state) { + break; + case SRS_PHASE_CHECKPOINT_STATE: assert(rc); /* @@ -767,10 +773,8 @@ static void stream_complete(libxl__egc *egc, * libxl__stream_read_abort() */ checkpoint_state_done(egc, stream, rc); - return; + break; } - - stream_done(egc, stream, rc); } static void checkpoint_done(libxl__egc *egc, @@ -778,18 +782,17 @@ static void checkpoint_done(libxl__egc *egc, { int ret; - assert(stream->in_checkpoint); + assert(stream_in_checkpoint(stream)); if (rc == 0) ret = XGR_CHECKPOINT_SUCCESS; - else if (stream->phase == SRS_PHASE_BUFFERING) + else if (stream->phase == SRS_PHASE_CHECKPOINT_BUFFERING) ret = XGR_CHECKPOINT_FAILOVER; else ret = XGR_CHECKPOINT_ERROR; stream->checkpoint_callback(egc, stream, ret); - stream->in_checkpoint = false; stream->phase = SRS_PHASE_NORMAL; } @@ -799,8 +802,7 @@ static void stream_done(libxl__egc *egc, libxl__sr_record_buf *rec, *trec; assert(stream->running); - assert(!stream->in_checkpoint); - assert(!stream->in_checkpoint_state); + assert(stream->phase == SRS_PHASE_NORMAL); stream->running = false; if (stream->incoming_record) @@ -955,9 +957,8 @@ void libxl__stream_read_checkpoint_state(libxl__egc *egc, libxl__stream_read_state *stream) { assert(stream->running); - assert(!stream->in_checkpoint); - assert(!stream->in_checkpoint_state); - stream->in_checkpoint_state = true; + assert(stream->phase == SRS_PHASE_NORMAL); + stream->phase = SRS_PHASE_CHECKPOINT_STATE; setup_read_record(egc, stream); } @@ -965,8 +966,8 @@ void libxl__stream_read_checkpoint_state(libxl__egc *egc, static void checkpoint_state_done(libxl__egc *egc, libxl__stream_read_state *stream, int rc) { - assert(stream->in_checkpoint_state); - stream->in_checkpoint_state = false; + assert(stream->phase == SRS_PHASE_CHECKPOINT_STATE); + stream->phase = SRS_PHASE_NORMAL; stream->checkpoint_callback(egc, stream, rc); }