esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2025-06-26 21:13:13 +00:00
Code Issues Projects Releases Wiki Activity

mem leak

Browse Source
This commit is contained in:
Ahmed Zamil
2020-12-11 01:17:15 +03:00
parent c68b58c3a2
commit b61df304ea
9 changed files with 110 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Esiur/Data/AutoList.cs
View File

@ -62,17 +62,20 @@ namespace Esiur.Data
public void Sort()
{
lock(syncRoot)
list.Sort();
}
public void Sort(IComparer<T> comparer)
{
list.Sort(comparer);
lock (syncRoot)
list.Sort(comparer);
}
public void Sort(Comparison<T> comparison)
{
list.Sort(comparison);
lock (syncRoot)
list.Sort(comparison);
}
public IEnumerable<T> Where(Func<T, bool> predicate)

4
Esiur/Esiur.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<Description>Distributed Resources Platform</Description>
<Copyright>Ahmed Kh. Zamil</Copyright>
<PackageLicenseUrl>https://github.com/Esiur/Esiur-dotnet/blob/master/LICENSE</PackageLicenseUrl>
@ -52,7 +52,7 @@
<ItemGroup>
<PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
<PackageReference Include="System.Interactive.Async" Version="4.1.1" />
<PackageReference Include="System.Interactive.Async" Version="5.0.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageReference Include="System.Net.Security" Version="4.3.2" />

11
Esiur/Net/IIP/DistributedConnection.cs
View File

@ -62,9 +62,6 @@ namespace Esiur.Net.IIP
Session session;
List<IResource> attachedResources = new List<IResource>();
AsyncReply<bool> openReply;
byte[] localPasswordOrToken;
@ -291,8 +288,8 @@ namespace Esiur.Net.IIP
void init()
{
var q = queue;
q.Then((x) =>
//var q = queue;
queue.Then((x) =>
{
if (x.Type == DistributedResourceQueueItem.DistributedResourceQueueItemType.Event)
x.Resource._EmitEventByIndex(x.Index, (object[])x.Value);
@ -308,6 +305,7 @@ namespace Esiur.Net.IIP
public override void Destroy()
{
UnsubscribeAll();
this.OnReady = null;
this.OnError = null;
base.Destroy();
@ -1146,13 +1144,14 @@ namespace Esiur.Net.IIP
Server?.Membership.Logout(session);
Warehouse.Remove(this);
ready = false;
UnsubscribeAll();
}
}
/*
public AsyncBag<T> Children<T>(IResource resource)
{
if (Codec.IsLocalResource(resource, this))
if (Codec.IsLocalReso turce(resource, this))
return (resource as DistributedResource).children.Where(x => x.GetType() == typeof(T)).Select(x => (T)x);
return null;

111
Esiur/Net/IIP/DistributedConnectionProtocol.cs
View File

@ -54,6 +54,9 @@ namespace Esiur.Net.IIP
volatile uint callbackCounter = 0;
List<IResource> subscriptions = new List<IResource>();
object subscriptionsLock = new object();
AsyncQueue<DistributedResourceQueueItem> queue = new AsyncQueue<DistributedResourceQueueItem>();
/// <summary>
@ -459,10 +462,14 @@ namespace Esiur.Net.IIP
var r = res as IResource;
// unsubscribe
r.Instance.ResourceEventOccurred -= Instance_EventOccurred;
r.Instance.CustomResourceEventOccurred -= Instance_CustomEventOccurred;
r.Instance.ResourceModified -= Instance_PropertyModified;
r.Instance.ResourceDestroyed -= Instance_ResourceDestroyed;
Unsubscribe(r);
//r.Instance.ResourceEventOccurred -= Instance_EventOccurred;
//r.Instance.CustomResourceEventOccurred -= Instance_CustomEventOccurred;
//r.Instance.ResourceModified -= Instance_PropertyModified;
//r.Instance.ResourceDestroyed -= Instance_ResourceDestroyed;
// r.Instance.Children.OnAdd -= Children_OnAdd;
// r.Instance.Children.OnRemoved -= Children_OnRemoved;
@ -471,7 +478,7 @@ namespace Esiur.Net.IIP
// Console.WriteLine("Attach {0} {1}", r.Instance.Link, r.Instance.Id);
// add it to attached resources so GC won't remove it from memory
attachedResources.Add(r);
///attachedResources.Add(r);
var link = DC.ToBytes(r.Instance.Link);
@ -501,10 +508,13 @@ namespace Esiur.Net.IIP
// subscribe
r.Instance.ResourceEventOccurred += Instance_EventOccurred;
r.Instance.CustomResourceEventOccurred += Instance_CustomEventOccurred;
r.Instance.ResourceModified += Instance_PropertyModified;
r.Instance.ResourceDestroyed += Instance_ResourceDestroyed;
//r.Instance.ResourceEventOccurred += Instance_EventOccurred;
//r.Instance.CustomResourceEventOccurred += Instance_CustomEventOccurred;
//r.Instance.ResourceModified += Instance_PropertyModified;
//r.Instance.ResourceDestroyed += Instance_ResourceDestroyed;
Subscribe(r);
//r.Instance.Children.OnAdd += Children_OnAdd;
//r.Instance.Children.OnRemoved += Children_OnRemoved;
@ -582,20 +592,25 @@ namespace Esiur.Net.IIP
{
var r = res as IResource;
// unsubscribe
r.Instance.ResourceEventOccurred -= Instance_EventOccurred;
r.Instance.CustomResourceEventOccurred -= Instance_CustomEventOccurred;
r.Instance.ResourceModified -= Instance_PropertyModified;
r.Instance.ResourceDestroyed -= Instance_ResourceDestroyed;
Unsubscribe(r);
//r.Instance.ResourceEventOccurred -= Instance_EventOccurred;
//r.Instance.CustomResourceEventOccurred -= Instance_CustomEventOccurred;
//r.Instance.ResourceModified -= Instance_PropertyModified;
//r.Instance.ResourceDestroyed -= Instance_ResourceDestroyed;
//r.Instance.Children.OnAdd -= Children_OnAdd;
//r.Instance.Children.OnRemoved -= Children_OnRemoved;
//r.Instance.Attributes.OnModified -= Attributes_OnModified;
// subscribe
r.Instance.ResourceEventOccurred += Instance_EventOccurred;
r.Instance.CustomResourceEventOccurred += Instance_CustomEventOccurred;
r.Instance.ResourceModified += Instance_PropertyModified;
r.Instance.ResourceDestroyed += Instance_ResourceDestroyed;
//r.Instance.ResourceEventOccurred += Instance_EventOccurred;
//r.Instance.CustomResourceEventOccurred += Instance_CustomEventOccurred;
//r.Instance.ResourceModified += Instance_PropertyModified;
//r.Instance.ResourceDestroyed += Instance_ResourceDestroyed;
Subscribe(r);
//r.Instance.Children.OnAdd += Children_OnAdd;
//r.Instance.Children.OnRemoved += Children_OnRemoved;
@ -621,14 +636,16 @@ namespace Esiur.Net.IIP
{
if (res != null)
{
var r = res as IResource;
r.Instance.ResourceEventOccurred -= Instance_EventOccurred;
r.Instance.CustomResourceEventOccurred -= Instance_CustomEventOccurred;
r.Instance.ResourceModified -= Instance_PropertyModified;
r.Instance.ResourceDestroyed -= Instance_ResourceDestroyed;
//var r = res as IResource;
//r.Instance.ResourceEventOccurred -= Instance_EventOccurred;
//r.Instance.CustomResourceEventOccurred -= Instance_CustomEventOccurred;
//r.Instance.ResourceModified -= Instance_PropertyModified;
//r.Instance.ResourceDestroyed -= Instance_ResourceDestroyed;
Unsubscribe(res);
// remove from attached resources
attachedResources.Remove(res);
//attachedResources.Remove(res);
// reply ok
SendReply(IIPPacket.IIPPacketAction.DetachResource, callback).Done();
@ -2190,12 +2207,60 @@ namespace Esiur.Net.IIP
return reply;
}
private void Subscribe(IResource resource)
{
lock (subscriptionsLock)
{
resource.Instance.ResourceEventOccurred += Instance_EventOccurred;
resource.Instance.CustomResourceEventOccurred += Instance_CustomEventOccurred;
resource.Instance.ResourceModified += Instance_PropertyModified;
resource.Instance.ResourceDestroyed += Instance_ResourceDestroyed;
subscriptions.Add(resource);
}
}
private void Unsubscribe(IResource resource)
{
lock (subscriptionsLock)
{
// do something with the list...
resource.Instance.ResourceEventOccurred -= Instance_EventOccurred;
resource.Instance.CustomResourceEventOccurred -= Instance_CustomEventOccurred;
resource.Instance.ResourceModified -= Instance_PropertyModified;
resource.Instance.ResourceDestroyed -= Instance_ResourceDestroyed;
subscriptions.Remove(resource);
}
}
private void UnsubscribeAll()
{
lock(subscriptionsLock)
{
foreach(var resource in subscriptions)
{
resource.Instance.ResourceEventOccurred -= Instance_EventOccurred;
resource.Instance.CustomResourceEventOccurred -= Instance_CustomEventOccurred;
resource.Instance.ResourceModified -= Instance_PropertyModified;
resource.Instance.ResourceDestroyed -= Instance_ResourceDestroyed;
}
subscriptions.Clear();
}
}
private void Instance_ResourceDestroyed(IResource resource)
{
Unsubscribe(resource);
// compose the packet
SendEvent(IIPPacket.IIPPacketEvent.ResourceDestroyed)
.AddUInt32(resource.Instance.Id)
.Done();
}
private void Instance_PropertyModified(IResource resource, string name, object newValue)