ft/skyscraper8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Memory optimized the FLUTE

Browse Source
This commit is contained in:
feyris-tan 2025-06-21 13:34:31 +02:00
parent 40c2ac21b6
commit c4a4887a81
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
skyscraper8/DvbNip/DvbNipReceiver.cs
View File

@ -142,27 +142,24 @@ namespace skyscraper8.DvbNip
private void TryPruneCache() private void TryPruneCache()
{ {
/*
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
List<FluteListener> staleListeners = flutes.Where(x => x.LastTouched != DateTime.MinValue) List<KeyValuePair<Tuple<IPAddress, ushort, ulong, ulong>, FluteListener>> staleListeners = flutes.Where(x => x.Value.LastTouched != DateTime.MinValue)
.Where(x => x.FileAssociation != null) .Where(x => x.Value.FileAssociation != null)
.Where(x => (now - x.LastTouched).TotalMinutes >= 1.0) .Where(x => (now - x.Value.LastTouched).TotalMinutes >= 1.0)
.Where(x => DvbNipUtilities.IsContinuousFileType(x.FileAssociation)) .Where(x => DvbNipUtilities.IsContinuousFileType(x.Value.FileAssociation))
.ToList(); .ToList();
if (staleListeners.Count > 0) if (staleListeners.Count > 0)
{ {
int prevItems = flutes.Count; int prevItems = flutes.Count;
foreach (FluteListener staleListener in staleListeners) foreach (KeyValuePair<Tuple<IPAddress, ushort, ulong, ulong>, FluteListener> staleListener in
staleListeners)
{ {
staleListener.Disabled = true; staleListener.Value.Disabled = true;
flutes.Remove(staleListener); flutes.Remove(staleListener.Key);
} }
int nowItems = flutes.Count; int nowItems = flutes.Count;
logger.DebugFormat(String.Format("Removed {0} stale segments from FLUTE cache. Cache slimmed from {1} to {2} items.", staleListeners.Count, prevItems, nowItems));
logger.DebugFormat(String.Format("Removed {0} stale segments from FLUTE cache. Cache slimmed from {1} to {2} items.", staleListeners.Count,prevItems,nowItems)); }
}*/
} }
private bool SetFileAssociations(FluteListener sourceListener, FDTInstanceType fdtAnnouncement) private bool SetFileAssociations(FluteListener sourceListener, FDTInstanceType fdtAnnouncement)

4
skyscraper8/Ietf/FLUTE/FluteListener.cs
View File

@ -38,9 +38,9 @@ namespace skyscraper8.Ietf.FLUTE
} }
if (FileAssociation != null) if (FileAssociation != null)
{ {
return String.Format("IP={0}, Port={1}, TSI={2}, TOI={3}, Filename={4}", DestinationAddress, DestinationPort, DestinationTsi, DestinationToi, FileAssociation.ContentLocation); return String.Format("Filename={4}", DestinationAddress, DestinationPort, DestinationTsi, DestinationToi, FileAssociation.ContentLocation);
} }
return String.Format("IP={0}, Port={1}, TSI={2}, TOI={3}", DestinationAddress, DestinationPort, DestinationTsi, DestinationToi); return String.Format("???");
} }
internal void PushPacket(LctFrame lctFrame) internal void PushPacket(LctFrame lctFrame)

14
skyscraper8/Skyscraper/Scraper/SkyscraperContext.cs
View File

@ -2476,11 +2476,15 @@ namespace skyscraper5.Skyscraper.Scraper
{ {
if (filetype != null) if (filetype != null)
{ {
string extension = Path.GetExtension(filetype.ContentLocation).ToLowerInvariant(); if (!filetype.ContentLocation.Equals("urn:dvb:metadata:cs:NativeIPMulticastTransportObjectTypeCS:2023:bootstrap"))
if (!DvbNipUtilities.IsContinuousFileType(extension)) {
{ string extension = Path.GetExtension(filetype.ContentLocation).ToLowerInvariant();
LogEvent(SkyscraperContextEvent.FluteFileProgress, String.Format("Filename={0}, {1}%", filetype.ContentLocation, progress)); if (!DvbNipUtilities.IsContinuousFileType(extension))
} {
LogEvent(SkyscraperContextEvent.FluteFileProgress,
String.Format("Filename={0}, {1}%", filetype.ContentLocation, progress));
}
}
} }
} }
} }