Re: [libvirt] PATCH: 13/25: Remove global state from XM driver

The 'xm' driver currently keeps all its state in a global static variables. Not cool, since we access this from all sorts of places and its hard to guarentee thread safety. So we move the state into the virConnect object. This will increase memory usage if a single process has multiple Xen connections open though. Undecided whether this is a big problem or not. If so, I'll can try and redo the next thread locking patch to use a lock over the existing global state.

typedef struct _xenUnifiedPrivate *xenUnifiedPrivatePtr; diff --git a/src/xm_internal.c b/src/xm_internal.c

@@ -615,14 +586,12 @@ xenXMOpen (virConnectPtr conn ATTRIBUTE_ * Free the config files in the cache if this is the * last connection */

-int xenXMClose(virConnectPtr conn ATTRIBUTE_UNUSED) { - nconnections--; - if (nconnections <= 0) { - virHashFree(nameConfigMap, NULL); - nameConfigMap = NULL; - virHashFree(configCache, xenXMConfigFree); - configCache = NULL; - } +int xenXMClose(virConnectPtr conn) {

+ xenUnifiedPrivatePtr priv = conn->privateData; + + virHashFree(priv->nameConfigMap, NULL); + virHashFree(priv->configCache, xenXMConfigFree); + return (0); } @@ -631,6 +600,7 @@ int xenXMClose(virConnectPtr conn ATTRIB * VCPUs and memory. */ int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) { + xenUnifiedPrivatePtr priv; const char *filename; xenXMConfCachePtr entry; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { @@ -642,10 +612,12 @@ int xenXMDomainGetInfo(virDomainPtr doma if (domain->id != -1) return (-1); - if (!(filename = virHashLookup(nameConfigMap, domain->name))) + priv = domain->conn->privateData; + + if (!(filename = virHashLookup(priv->nameConfigMap, domain->name))) return (-1); - if (!(entry = virHashLookup(configCache, filename))) + if (!(entry = virHashLookup(priv->configCache, filename))) return (-1); memset(info, 0, sizeof(virDomainInfo)); @@ -1310,6 +1282,7 @@ no_memory: * domain, suitable for later feeding for virDomainCreateXML */ char *xenXMDomainDumpXML(virDomainPtr domain, int flags) { + xenUnifiedPrivatePtr priv = domain->conn->privateData;