From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wen Congyang Subject: [PATCH v9 06/25] tools/libxl: write checkpoint_state records into the stream Date: Wed, 30 Dec 2015 10:37:36 +0800 Message-ID: <1451443075-27428-7-git-send-email-wency@cn.fujitsu.com> References: <1451443075-27428-1-git-send-email-wency@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1451443075-27428-1-git-send-email-wency@cn.fujitsu.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen devel , Andrew Cooper , Ian Campbell , Ian Jackson , Wei Liu Cc: Lars Kurth , Changlong Xie , Wen Congyang , Gui Jianfeng , Jiang Yunhong , Dong Eddie , Shriram Rajagopalan , Yang Hongyang List-Id: xen-devel@lists.xenproject.org write checkpoint_state records into the stream, used by both primary and secondary to send colo context. Signed-off-by: Yang Hongyang Signed-off-by: Wen Congyang --- tools/libxl/libxl_internal.h | 5 ++++ tools/libxl/libxl_stream_write.c | 60 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index b473748..3cf297f 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3052,6 +3052,7 @@ struct libxl__stream_write_state { 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; /* Main stream-writing data. */ @@ -3075,6 +3076,10 @@ _hidden void libxl__stream_write_start(libxl__egc *egc, _hidden void libxl__stream_write_start_checkpoint(libxl__egc *egc, libxl__stream_write_state *stream); +_hidden void +libxl__stream_write_checkpoint_state(libxl__egc *egc, + libxl__stream_write_state *stream, + libxl_sr_checkpoint_state *srcs); _hidden void libxl__stream_write_abort(libxl__egc *egc, libxl__stream_write_state *stream, int rc); diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 538a1c6..6541399 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -98,6 +98,12 @@ static void write_checkpoint_end_record(libxl__egc *egc, static void checkpoint_end_record_done(libxl__egc *egc, libxl__stream_write_state *stream); +/* checkpoint state */ +static void write_checkpoint_state_done(libxl__egc *egc, + libxl__stream_write_state *stream); +static void checkpoint_state_done(libxl__egc *egc, + libxl__stream_write_state *stream, int rc); + /*----- Helpers -----*/ static void write_done(libxl__egc *egc, @@ -583,6 +589,21 @@ static void stream_complete(libxl__egc *egc, return; } + if (stream->in_checkpoint_state) { + assert(rc); + + /* + * If an error is encountered while in a checkpoint, pass it + * back to libxc. The failure will come back around to us via + * 1. normal stream + * libxl__xc_domain_save_done() + * 2. back_channel stream + * libxl__stream_write_abort() + */ + checkpoint_state_done(egc, stream, rc); + return; + } + stream_done(egc, stream, rc); } @@ -590,6 +611,7 @@ static void stream_done(libxl__egc *egc, libxl__stream_write_state *stream, int rc) { assert(stream->running); + assert(!stream->in_checkpoint_state); stream->running = false; if (stream->emu_carefd) @@ -650,7 +672,43 @@ static void check_all_finished(libxl__egc *egc, libxl__save_helper_inuse(&stream->shs)) return; - stream->completion_callback(egc, stream, stream->rc); + if (stream->completion_callback) + /* back channel stream doesn't have completion_callback() */ + stream->completion_callback(egc, stream, stream->rc); +} + +/*----- checkpoint state -----*/ +void libxl__stream_write_checkpoint_state(libxl__egc *egc, + libxl__stream_write_state *stream, + libxl_sr_checkpoint_state *srcs) +{ + struct libxl__sr_rec_hdr rec; + + assert(stream->running); + assert(!stream->in_checkpoint); + assert(!stream->in_checkpoint_state); + stream->in_checkpoint_state = true; + + FILLZERO(rec); + rec.type = REC_TYPE_CHECKPOINT_STATE; + rec.length = sizeof(*srcs); + + setup_write(egc, stream, "checkpoint state", &rec, + srcs, write_checkpoint_state_done); +} + +static void write_checkpoint_state_done(libxl__egc *egc, + libxl__stream_write_state *stream) +{ + checkpoint_state_done(egc, stream, 0); +} + +static void checkpoint_state_done(libxl__egc *egc, + libxl__stream_write_state *stream, int rc) +{ + assert(stream->in_checkpoint_state); + stream->in_checkpoint_state = false; + stream->checkpoint_callback(egc, stream, rc); } /* -- 2.5.0