Author: alanmc
Date: 2008-02-02 07:25:26 -0500 (Sat, 02 Feb 2008)
New Revision: 94614
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/ClientEngine.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ConnectionManager.cs
Log:
Two more cleanups on event firing
Modified: trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/ClientEngine.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/ClientEngine.cs
2008-02-02 12:17:47 UTC (rev 94613)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/ClientEngine.cs
2008-02-02 12:25:26 UTC (rev 94614)
@@ -408,13 +408,6 @@
#region Private/Internal methods
- private void AsyncStatsUpdate(object args)
- {
- if (StatsUpdate != null)
- StatsUpdate(this, (StatsUpdateEventArgs)args);
- }
-
-
private void LogicTick(object sender, ElapsedEventArgs e)
{
tickCount++;
@@ -453,8 +446,12 @@
internal void RaiseStatsUpdate(StatsUpdateEventArgs args)
{
- if (StatsUpdate != null)
- ThreadPool.QueueUserWorkItem(new
WaitCallback(AsyncStatsUpdate), args);
+ ThreadPool.QueueUserWorkItem(delegate
+ {
+ EventHandler<StatsUpdateEventArgs> h = StatsUpdate;
+ if (h != null)
+ h(this, args);
+ });
}
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ConnectionManager.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ConnectionManager.cs
2008-02-02 12:17:47 UTC (rev 94613)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ConnectionManager.cs
2008-02-02 12:25:26 UTC (rev 94614)
@@ -900,18 +900,6 @@
-
-
- private void AsyncPeerMessageTransferred(object args)
- {
- if (this.PeerMessageTransferred != null)
- this.PeerMessageTransferred(null, (PeerMessageEventArgs)args);
- }
-
-
-
-
-
/// <summary>
/// This method is called when a connection needs to be closed and the
resources for it released.
/// </summary>
@@ -1098,10 +1086,13 @@
- internal void RaisePeerMessageTransferred(PeerMessageEventArgs
peerMessageEventArgs)
+ internal void RaisePeerMessageTransferred(PeerMessageEventArgs e)
{
- if (this.PeerMessageTransferred != null)
- ThreadPool.QueueUserWorkItem(new
WaitCallback(AsyncPeerMessageTransferred), peerMessageEventArgs);
+ ThreadPool.QueueUserWorkItem(delegate {
+ EventHandler<PeerMessageEventArgs> h = PeerMessageTransferred;
+ if (h != null)
+ h(e.TorrentManager, e);
+ });
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches