xenstored now supports multiple concurrent transactions per

connection, plus interleaving of transactional and
non-transactional accesses. A transaction identifier is added
to the xsd_sockmsg header structure (0 means 'not in context
of a transaction'). The user and kernel xs interfaces accept
a pointer to a transaction handle where appropriate --
currently this is directly cast to an integer identifier in
the client library / kernel driver, but will allow for keeping
extra dynamic client-side state in future if we need to.

The transaction mutex has now gone. It's replaced with a
read-write mutex, but this is only acquired for exclusive
access during suspend/resume, to ensure there are no in-progress
transactions.

Signed-off-by: Keir Fraser <keir@xensource.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h
index c50936f1bc..600e95a6f8 100644
--- a/tools/xenstore/xenstored_core.h
+++ b/tools/xenstore/xenstored_core.h
@@ -71,9 +71,13 @@ struct connection
 	/* Buffered output data */
 	struct list_head out_list;
 
-	/* My transaction, if any. */
+	/* Transaction context for current request (NULL if none). */
 	struct transaction *transaction;
 
+	/* List of in-progress transactions. */
+	struct list_head transaction_list;
+	u32 next_transaction_id;
+
 	/* The domain I'm associated with, if any. */
 	struct domain *domain;