From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Ian Campbell <ian.campbell@citrix.com>
Cc: Ross Lagerwall <ross.lagerwall@citrix.com>,
Wei Liu <wei.liu2@citrix.com>,
Yang Hongyang <yanghy@cn.fujitsu.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Xen-devel <xen-devel@lists.xen.org>
Subject: Re: [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
Date: Tue, 16 Jun 2015 16:28:11 +0100 [thread overview]
Message-ID: <5580408B.9000408@citrix.com> (raw)
In-Reply-To: <1434466626.13744.208.camel@citrix.com>
On 16/06/15 15:57, Ian Campbell wrote:
> On Mon, 2015-06-15 at 14:44 +0100, Andrew Cooper wrote:
>> From: Ross Lagerwall <ross.lagerwall@citrix.com>
>>
>> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> CC: Ian Campbell <Ian.Campbell@citrix.com>
>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>> CC: Wei Liu <wei.liu2@citrix.com>
>> ---
>> tools/libxl/Makefile | 2 +-
>> tools/libxl/libxl_internal.h | 33 +++
>> tools/libxl/libxl_stream_write.c | 536 ++++++++++++++++++++++++++++++++++++++
>> 3 files changed, 570 insertions(+), 1 deletion(-)
>> create mode 100644 tools/libxl/libxl_stream_write.c
>>
>> diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
>> index ca0ae3e..63e32f7 100644
>> --- a/tools/libxl/Makefile
>> +++ b/tools/libxl/Makefile
>> @@ -94,7 +94,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \
>> libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
>> libxl_internal.o libxl_utils.o libxl_uuid.o \
>> libxl_json.o libxl_aoutils.o libxl_numa.o libxl_vnuma.o \
>> - libxl_stream_read.o \
>> + libxl_stream_read.o libxl_stream_write.o \
>> libxl_save_callout.o _libxl_save_msgs_callout.o \
>> libxl_convert_callout.o \
>> libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y)
>> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
>> index 5482950..82cd792 100644
>> --- a/tools/libxl/libxl_internal.h
>> +++ b/tools/libxl/libxl_internal.h
>> @@ -2868,6 +2868,38 @@ typedef void libxl__domain_suspend_cb(libxl__egc*,
>> typedef void libxl__save_device_model_cb(libxl__egc*,
>> libxl__domain_suspend_state*, int rc);
>>
>> +/* State for writing a libxl migration v2 stream */
>> +typedef struct libxl__stream_write_state libxl__stream_write_state;
>> +
>> +struct libxl__stream_write_state {
>> + /* filled by the user */
>> + libxl__ao *ao;
>> + int fd;
>> + uint32_t domid;
>> + void (*completion_callback)(libxl__egc *egc,
>> + libxl__domain_suspend_state *dss,
>> + int rc);
>> + /* Private */
>> + int rc;
>> + int joined_rc;
>> + size_t padding;
>> + bool running;
>> + libxl__datacopier_state dc;
>> +};
>> +
>> +_hidden void libxl__stream_write_start(libxl__egc *egc,
>> + libxl__stream_write_state *stream);
>> +
>> +_hidden void libxl__stream_write_abort(libxl__egc *egc,
>> + libxl__stream_write_state *stream,
>> + int rc);
>> +
>> +static inline bool libxl__stream_write_inuse(
>> + const libxl__stream_write_state *stream)
>> +{
>> + return stream->running;
>> +}
>> +
>> typedef struct libxl__logdirty_switch {
>> const char *cmd;
>> const char *cmd_path;
>> @@ -2907,6 +2939,7 @@ struct libxl__domain_suspend_state {
>> /* private for libxl__domain_save_device_model */
>> libxl__save_device_model_cb *save_dm_callback;
>> libxl__datacopier_state save_dm_datacopier;
>> + libxl__stream_write_state sws;
>> };
>>
>>
>> diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c
>> new file mode 100644
>> index 0000000..856d72e
>> --- /dev/null
>> +++ b/tools/libxl/libxl_stream_write.c
>> @@ -0,0 +1,536 @@
>> +/*
>> + * Copyright (C) 2015 Citrix Ltd.
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU Lesser General Public License as published
>> + * by the Free Software Foundation; version 2.1 only. with the special
>> + * exception on linking described in file LICENSE.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU Lesser General Public License for more details.
>> + */
>> +
>> +#include "libxl_osdeps.h" /* must come before any other headers */
>> +
>> +#include "libxl_internal.h"
>> +
>> +/*
>> + * Infrastructure for writing a domain to a libxl migration v2 stream.
>> + *
>> + * Entry points from outside:
>> + * - libxl__stream_write_start()
>> + * - Start writing a stream from the start.
>> + *
>> + * In normal operation, there are two tasks running at once; this stream
>> + * processing, and the the libxl-save-helper. check_stream_finished() is used
> "the the".
>
>> + * to join all the tasks in both success and error cases.
>> + *
>> + * Nomenclature for event callbacks:
>> + * - $FOO_done(): Completion callback for $FOO
>> + * - write_$FOO(): Set up writing a $FOO
> Set up or actually write?
Set up the dc to write $FOO
The write doesn't actually happen until we get the dc callback.
>
>> +
>> +void libxl__stream_write_start(libxl__egc *egc,
>> + libxl__stream_write_state *stream)
>> +{
>> + libxl__datacopier_state *dc = &stream->dc;
>> + STATE_AO_GC(stream->ao);
>> + struct libxl_sr_hdr hdr = { 0 };
>> + int ret = 0;
>> +
>> + assert(!stream->running);
>> + stream->running = true;
>> +
>> + memset(dc, 0, sizeof(*dc));
> Please use the _init()
_init() is already called for us.
>
>
>> +static void check_stream_finished(libxl__egc *egc,
>> + libxl__domain_suspend_state *dss,
>> + int rc, const char *what)
>> +{
>> + libxl__stream_write_state *stream = &dss->sws;
>> + STATE_AO_GC(dss->ao);
>> +
>> + LOG(INFO, "Task '%s' joining (rc %d)", what, rc);
>> +
>> + if (rc && !stream->joined_rc) {
>> + bool skip = false;
>> + /* First reported failure from joining tasks. Tear everything down */
>> + stream->joined_rc = rc;
>
> This (not just this, but a bunch of the preceeding helpers) all looks
> rather familiar, can it be shared to some extent?
The types are all different, including the signature of the eventual
callback to use. As COLO gets built on top, I expect these to diverge
further.
~Andrew
next prev parent reply other threads:[~2015-06-16 15:28 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-15 13:44 [PATCH 00/27] Libxl migration v2 Andrew Cooper
2015-06-15 13:44 ` [PATCH 01/27] tools/libxl: Fix libxl__ev_child_inuse() check for not-yet-initialised children Andrew Cooper
2015-06-16 13:21 ` Ian Campbell
2015-06-16 13:36 ` Andrew Cooper
2015-06-16 13:47 ` Ian Jackson
2015-06-16 14:05 ` Andrew Cooper
2015-06-16 15:26 ` Ian Campbell
2015-06-16 15:24 ` Ian Campbell
2015-06-16 13:39 ` Ian Jackson
2015-06-15 13:44 ` [PATCH 02/27] tools/libxc: Always compile the compat qemu variables into xc_sr_context Andrew Cooper
2015-06-16 13:22 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 03/27] tools/libxl: Stash all restore parameters in domain_create_state Andrew Cooper
2015-06-16 13:37 ` Ian Campbell
2015-06-16 14:09 ` Andrew Cooper
2015-06-18 2:32 ` Yang Hongyang
2015-06-15 13:44 ` [PATCH 04/27] tools/xl: Mandatory flag indicating the format of the migration stream Andrew Cooper
2015-06-16 13:39 ` Ian Campbell
2015-06-16 14:10 ` Andrew Cooper
2015-06-15 13:44 ` [PATCH 05/27] tools/libxl: Introduce ROUNDUP() Andrew Cooper
2015-06-16 13:39 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 06/27] libxl: cancellation: Preparations for save/restore cancellation Andrew Cooper
2015-06-15 13:44 ` [PATCH 07/27] libxl: cancellation: Handle SIGTERM in save/restore helper Andrew Cooper
2015-06-15 13:44 ` [PATCH 08/27] tools/libxl: Extra APIs for the save helper Andrew Cooper
2015-06-16 13:50 ` Ian Campbell
2015-06-16 15:03 ` Andrew Cooper
2015-06-15 13:44 ` [PATCH 09/27] tools/libxl: Pass restore_fd as a parameter to libxl__xc_domain_restore() Andrew Cooper
2015-06-16 13:53 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 10/27] docs: Libxl migration v2 stream specification Andrew Cooper
2015-06-16 13:58 ` Ian Campbell
2015-07-08 13:49 ` Andrew Cooper
2015-07-08 13:58 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 11/27] tools/python: Libxc migration v2 infrastructure Andrew Cooper
2015-06-16 14:01 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 12/27] tools/python: Libxl " Andrew Cooper
2015-06-15 13:44 ` [PATCH 13/27] tools/python: Verification utility for v2 stream spec compliance Andrew Cooper
2015-06-15 13:44 ` [PATCH 14/27] tools/python: Conversion utility for legacy migration streams Andrew Cooper
2015-06-16 14:01 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 15/27] tools/libxl: Migration v2 stream format Andrew Cooper
2015-06-16 14:04 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 16/27] tools/libxl: Infrastructure for reading a libxl migration v2 stream Andrew Cooper
2015-06-16 14:31 ` Ian Campbell
2015-06-16 15:01 ` Andrew Cooper
2015-06-16 15:35 ` Ian Campbell
2015-06-16 15:46 ` Andrew Cooper
2015-06-17 3:09 ` Wen Congyang
2015-06-17 10:15 ` Ian Campbell
2015-06-17 10:49 ` Wen Congyang
2015-06-17 10:55 ` Ian Campbell
2015-06-17 6:03 ` Wen Congyang
2015-06-17 9:47 ` Andrew Cooper
2015-06-17 7:57 ` Wen Congyang
2015-06-17 9:50 ` Andrew Cooper
2015-06-17 10:01 ` Wen Congyang
2015-06-17 10:48 ` Andrew Cooper
2015-06-15 13:44 ` [PATCH 17/27] tools/libxl: Support converting a legacy stream to a " Andrew Cooper
2015-06-16 14:38 ` Ian Campbell
2015-06-16 15:13 ` Andrew Cooper
2015-06-16 15:38 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 18/27] tools/libxl: Convert a legacy stream if needed Andrew Cooper
2015-06-15 13:44 ` [PATCH 19/27] tools/libxc+libxl+xl: Restore v2 streams Andrew Cooper
2015-06-16 14:53 ` Ian Campbell
2015-06-16 15:23 ` Andrew Cooper
2015-06-16 15:39 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream Andrew Cooper
2015-06-16 14:57 ` Ian Campbell
2015-06-16 15:28 ` Andrew Cooper [this message]
2015-06-17 1:31 ` Yang Hongyang
2015-06-17 9:51 ` Andrew Cooper
2015-06-17 1:39 ` Wen Congyang
2015-06-17 2:24 ` Wen Congyang
2015-06-17 7:38 ` Yang Hongyang
2015-06-17 10:14 ` Wen Congyang
2015-07-10 10:55 ` Ian Campbell
2015-07-10 11:03 ` Andrew Cooper
2015-07-10 11:05 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 21/27] tools/libxc+libxl+xl: Save v2 streams Andrew Cooper
2015-06-16 14:59 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 22/27] docs/libxl: [RFC] Introduce CHECKPOINT_END to support migration v2 remus streams Andrew Cooper
2015-06-16 15:00 ` Ian Campbell
2015-06-16 15:30 ` Andrew Cooper
2015-06-17 3:30 ` Wen Congyang
2015-06-15 13:44 ` [PATCH 23/27] tools/libxl: [RFC] Write checkpoint records into the stream Andrew Cooper
2015-06-16 15:03 ` Ian Campbell
2015-06-16 15:53 ` Andrew Cooper
2015-06-17 7:30 ` Ian Campbell
2015-06-17 9:55 ` Andrew Cooper
2015-06-18 3:13 ` Wen Congyang
2015-06-18 9:44 ` Andrew Cooper
2015-06-15 13:44 ` [PATCH 24/27] tools/libx{c, l}: [RFC] Introduce restore_callbacks.checkpoint() Andrew Cooper
2015-06-16 2:23 ` Yang Hongyang
2015-06-17 8:20 ` Yang Hongyang
2015-06-15 13:44 ` [PATCH 25/27] tools/libxl: [RFC] Handle checkpoint records in a libxl migration v2 stream Andrew Cooper
2015-06-17 7:28 ` Wen Congyang
2015-06-15 13:44 ` [PATCH 26/27] tools/libxc: Drop all XG_LIBXL_HVM_COMPAT code from libxc Andrew Cooper
2015-06-16 15:03 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 27/27] tools/libxl: Drop all knowledge of toolstack callbacks Andrew Cooper
2015-06-16 15:04 ` Ian Campbell
2015-06-16 15:06 ` Andrew Cooper
2015-06-17 10:14 ` Ian Campbell
2015-06-17 10:43 ` Andrew Cooper
2015-06-17 10:53 ` Ian Campbell
2015-06-16 2:21 ` [PATCH 00/27] Libxl migration v2 Yang Hongyang
2015-06-17 1:55 ` Wen Congyang
2015-06-17 9:45 ` Andrew Cooper
2015-07-02 7:33 ` Yang Hongyang
2015-07-02 9:26 ` Andrew Cooper
2015-07-02 9:33 ` Yang Hongyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5580408B.9000408@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ross.lagerwall@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=yanghy@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.