[libvirt] [PATCH C#] Always close connections and free domains
Matthias Bolte
matthias.bolte at googlemail.com
Thu Oct 28 10:37:18 UTC 2010
Also free the unmanaged authDataPtr in the virConnectOpenAuth
examples.
---
examples/MonoDevelop/virConnectOpen/MainWindow.cs | 10 ++++++++++
.../MonoDevelop/virConnectOpenAuth/MainWindow.cs | 20 +++++++++++++-------
examples/VisualStudio/virConnectOpen/Form1.cs | 10 ++++++++++
examples/VisualStudio/virConnectOpenAuth/Form1.cs | 16 +++++++++++-----
4 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/examples/MonoDevelop/virConnectOpen/MainWindow.cs b/examples/MonoDevelop/virConnectOpen/MainWindow.cs
index 849f99f..0abae49 100644
--- a/examples/MonoDevelop/virConnectOpen/MainWindow.cs
+++ b/examples/MonoDevelop/virConnectOpen/MainWindow.cs
@@ -25,19 +25,29 @@ public partial class MainWindow : Gtk.Window
protected virtual void OnButton1Clicked (object sender, System.EventArgs e)
{
+ StoragePoolListStore.Clear ();
+
IntPtr conn = Connect.Open(entry1.Text);
if (conn != IntPtr.Zero)
{
int numOfStoragePools = Connect.NumOfStoragePools(conn);
if (numOfStoragePools == -1)
+ {
ShowError("Unable to get the number of storage pools");
+ goto cleanup;
+ }
string[] storagePoolsNames = new string[numOfStoragePools];
int listStoragePools = Connect.ListStoragePools(conn, ref storagePoolsNames, numOfStoragePools);
if (listStoragePools == -1)
+ {
ShowError("Unable to list storage pools");
+ goto cleanup;
+ }
foreach (string storagePoolName in storagePoolsNames)
AddStoragePoolInTreeView(storagePoolName);
+ cleanup:
+ Connect.Close(conn);
}
else
{
diff --git a/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs b/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs
index 996a417..d02acd4 100644
--- a/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs
+++ b/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs
@@ -43,8 +43,12 @@ public partial class MainWindow : Gtk.Window
Application.Quit ();
a.RetVal = true;
}
+
protected virtual void OnButton1Clicked (object sender, System.EventArgs e)
{
+ // Remove all items
+ domainListStore.Clear ();
+
// Fill a structure to pass username and password to callbacks
AuthData authData = new AuthData { password = entry3.Text, user_name = entry2.Text };
IntPtr authDataPtr = Marshal.AllocHGlobal(Marshal.SizeOf(authData));
@@ -64,7 +68,8 @@ public partial class MainWindow : Gtk.Window
// Request the connection
IntPtr conn = Connect.OpenAuth(entry1.Text, ref auth, 0);
-
+ Marshal.FreeHGlobal(authDataPtr);
+
if (conn != IntPtr.Zero)
{
// Get the number of defined (not running) domains
@@ -73,7 +78,7 @@ public partial class MainWindow : Gtk.Window
if (Connect.ListDefinedDomains(conn, ref definedDomainNames, numOfDefinedDomains) == -1)
{
ShowError("Unable to list defined domains");
- return;
+ goto cleanup;
}
// Add the domain names to the listbox
@@ -88,7 +93,7 @@ public partial class MainWindow : Gtk.Window
if (Connect.ListDomains(conn, runningDomainIDs, numOfRunningDomain) == -1)
{
ShowError("Unable to list running domains");
- return;
+ goto cleanup;
}
// Add the domain names to the listbox
@@ -98,16 +103,19 @@ public partial class MainWindow : Gtk.Window
if (domainPtr == IntPtr.Zero)
{
ShowError("Unable to lookup domains by id");
- return;
+ goto cleanup;
}
string domainName = Domain.GetName(domainPtr);
+ Domain.Free(domainPtr);
if (string.IsNullOrEmpty(domainName))
{
ShowError("Unable to get domain name");
- return;
+ goto cleanup;
}
AddDomainInTreeView(domainName);
}
+
+ cleanup:
Connect.Close(conn);
}
else
@@ -156,7 +164,5 @@ public partial class MainWindow : Gtk.Window
}
return 0;
}
-
-
}
diff --git a/examples/VisualStudio/virConnectOpen/Form1.cs b/examples/VisualStudio/virConnectOpen/Form1.cs
index 870b83d..240aaaa 100644
--- a/examples/VisualStudio/virConnectOpen/Form1.cs
+++ b/examples/VisualStudio/virConnectOpen/Form1.cs
@@ -27,18 +27,28 @@ namespace virConnectOpen
private void btnConnect_Click(object sender, EventArgs e)
{
+ lbStoragePool.Items.Clear();
+
IntPtr conn = Connect.Open(tbURI.Text);
if (conn != IntPtr.Zero)
{
int numOfStoragePools = Connect.NumOfStoragePools(conn);
if (numOfStoragePools == -1)
+ {
ShowError("Unable to get the number of storage pools");
+ goto cleanup;
+ }
string[] storagePoolsNames = new string[numOfStoragePools];
int listStoragePools = Connect.ListStoragePools(conn, ref storagePoolsNames, numOfStoragePools);
if (listStoragePools == -1)
+ {
ShowError("Unable to list storage pools");
+ goto cleanup;
+ }
foreach (string storagePoolName in storagePoolsNames)
lbStoragePool.Items.Add(storagePoolName);
+ cleanup:
+ Connect.Close(conn);
}
else
{
diff --git a/examples/VisualStudio/virConnectOpenAuth/Form1.cs b/examples/VisualStudio/virConnectOpenAuth/Form1.cs
index 7901c27..87634a0 100644
--- a/examples/VisualStudio/virConnectOpenAuth/Form1.cs
+++ b/examples/VisualStudio/virConnectOpenAuth/Form1.cs
@@ -44,6 +44,8 @@ namespace virConnectOpenAuth
private void btnConnect_Click(object sender, EventArgs e)
{
+ lbDomains.Items.Clear();
+
// Fill a structure to pass username and password to callbacks
AuthData authData = new AuthData { password = tbPassword.Text, user_name = tbUsername.Text };
IntPtr authDataPtr = Marshal.AllocHGlobal(Marshal.SizeOf(authData));
@@ -62,6 +64,7 @@ namespace virConnectOpenAuth
// Request the connection
IntPtr conn = Connect.OpenAuth(tbURI.Text, ref auth, 0);
+ Marshal.FreeHGlobal(authDataPtr);
if (conn != IntPtr.Zero)
{
@@ -70,9 +73,9 @@ namespace virConnectOpenAuth
string[] definedDomainNames = new string[numOfDefinedDomains];
if (Connect.ListDefinedDomains(conn, ref definedDomainNames, numOfDefinedDomains) == -1)
{
- MessageBox.Show("Unable to list defined domains", "List defined domains failed", MessageBoxButtons.OK,
+ MessageBox.Show("Unable to list defined domains", "List defined domains failed", MessageBoxButtons.OK,
MessageBoxIcon.Error);
- return;
+ goto cleanup;
}
// Add the domain names to the listbox
@@ -86,7 +89,7 @@ namespace virConnectOpenAuth
{
MessageBox.Show("Unable to list running domains", "List running domains failed", MessageBoxButtons.OK,
MessageBoxIcon.Error);
- return;
+ goto cleanup;
}
// Add the domain names to the listbox
@@ -97,17 +100,20 @@ namespace virConnectOpenAuth
{
MessageBox.Show("Unable to lookup domains by id", "Lookup domain failed", MessageBoxButtons.OK,
MessageBoxIcon.Error);
- return;
+ goto cleanup;
}
string domainName = Domain.GetName(domainPtr);
+ Domain.Free(domainPtr);
if (string.IsNullOrEmpty(domainName))
{
MessageBox.Show("Unable to get domain name", "Get domain name failed", MessageBoxButtons.OK,
MessageBoxIcon.Error);
- return;
+ goto cleanup;
}
lbDomains.Items.Add(domainName);
}
+
+ cleanup:
Connect.Close(conn);
}
else
--
1.7.0.4
More information about the libvir-list
mailing list