TerribleDev/TimberWinR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed remaining memory leaks.

Browse Source
This commit is contained in:
Eric Fontana
2014-11-25 12:10:40 -05:00
parent 6df3992110
commit c67ff21859
11 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Performance1.psess Normal file
View File

@@ -0,0 +1,21 @@
<VSPerformanceSession Version="1.00">
<Options>
<CollectionMethod>Sampling</CollectionMethod>
<AllocationMethod>None</AllocationMethod>
<AddReport>true</AddReport>
<UniqueReport>Timestamp</UniqueReport>
<SamplingMethod>Cycles</SamplingMethod>
<CycleCount>10000000</CycleCount>
<PageFaultCount>10</PageFaultCount>
<SysCallCount>10</SysCallCount>
<SamplingCounter PlatformID="00000000" CounterID="0000000000000000" ReloadValue="000000000000000a" />
<RelocateBinaries>false</RelocateBinaries>
<HardwareCounters EnableHWCounters="false" />
</Options>
<PreinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PreinstrumentEvent>
<PostinstrumentEvent>
<InstrEventExclude>false</InstrEventExclude>
</PostinstrumentEvent>
</VSPerformanceSession>

4
TimberWinR.ServiceHost/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.12.0")] [assembly: AssemblyVersion("1.3.13.0")]
[assembly: AssemblyFileVersion("1.3.12.0")] [assembly: AssemblyFileVersion("1.3.13.0")]

4
TimberWinR.sln
View File

@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
chocolateyUninstall.ps1.guid = chocolateyUninstall.ps1.guid chocolateyUninstall.ps1.guid = chocolateyUninstall.ps1.guid
chocolateyUninstall.ps1.template = chocolateyUninstall.ps1.template chocolateyUninstall.ps1.template = chocolateyUninstall.ps1.template
LICENSE.txt = LICENSE.txt LICENSE.txt = LICENSE.txt
Performance1.psess = Performance1.psess
README.md = README.md README.md = README.md
timberwinr.nuspec.template = timberwinr.nuspec.template timberwinr.nuspec.template = timberwinr.nuspec.template
EndProjectSection EndProjectSection
@@ -99,4 +100,7 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal EndGlobal

1
TimberWinR/Inputs/IISW3CInputListener.cs
View File

@@ -150,6 +150,7 @@ namespace TimberWinR.Inputs
} }
// Close the recordset // Close the recordset
rs.close(); rs.close();
GC.Collect();
} }
} }
catch (Exception ex) catch (Exception ex)

9
TimberWinR/Inputs/LogsListener.cs
View File

@@ -32,7 +32,7 @@ namespace TimberWinR.Inputs
private Dictionary<string, long> _logFileSizes; private Dictionary<string, long> _logFileSizes;
public LogsListener(TimberWinR.Parser.Log arguments, CancellationToken cancelToken, int pollingIntervalInSeconds = 3) public LogsListener(TimberWinR.Parser.Log arguments, CancellationToken cancelToken)
: base(cancelToken, "Win32-FileLog") : base(cancelToken, "Win32-FileLog")
{ {
_logFileMaxRecords = new Dictionary<string, Int64>(); _logFileMaxRecords = new Dictionary<string, Int64>();
@@ -42,7 +42,7 @@ namespace TimberWinR.Inputs
_receivedMessages = 0; _receivedMessages = 0;
_arguments = arguments; _arguments = arguments;
_pollingIntervalInSeconds = pollingIntervalInSeconds; _pollingIntervalInSeconds = arguments.Interval;
foreach (string srcFile in _arguments.Location.Split(',')) foreach (string srcFile in _arguments.Location.Split(','))
{ {
@@ -146,6 +146,7 @@ namespace TimberWinR.Inputs
_logFileSizes[logName] = fi.Length; _logFileSizes[logName] = fi.Length;
} }
rsfiles.close();
foreach (string fileName in _logFileMaxRecords.Keys.ToList()) foreach (string fileName in _logFileMaxRecords.Keys.ToList())
{ {
var lastRecordNumber = _logFileMaxRecords[fileName]; var lastRecordNumber = _logFileMaxRecords[fileName];
@@ -163,6 +164,7 @@ namespace TimberWinR.Inputs
for (; !rs.atEnd(); rs.moveNext()) for (; !rs.atEnd(); rs.moveNext())
{ {
var record = rs.getRecord(); var record = rs.getRecord();
var json = new JObject(); var json = new JObject();
foreach (var field in _arguments.Fields) foreach (var field in _arguments.Fields)
{ {
@@ -187,11 +189,14 @@ namespace TimberWinR.Inputs
var lrn = (Int64)record.getValueEx("Index"); var lrn = (Int64)record.getValueEx("Index");
_logFileMaxRecords[fileName] = lrn; _logFileMaxRecords[fileName] = lrn;
GC.Collect();
} }
colMap.Clear();
// Close the recordset // Close the recordset
rs.close(); rs.close();
rs = null; rs = null;
GC.Collect();
} }
} }
catch (Exception ex) catch (Exception ex)

1
TimberWinR/Inputs/WindowsEvtInputListener.cs
View File

@@ -157,6 +157,7 @@ namespace TimberWinR.Inputs
// Close the recordset // Close the recordset
rs.close(); rs.close();
rs = null; rs = null;
GC.Collect();
} }
} }
catch (System.Threading.ThreadAbortException tex) catch (System.Threading.ThreadAbortException tex)

3
TimberWinR/Outputs/Elasticsearch.cs
View File

@@ -133,6 +133,7 @@ namespace TimberWinR.Outputs
else else
{ {
_sentMessages++; _sentMessages++;
GC.Collect();
} }
}); });
} }
@@ -142,6 +143,7 @@ namespace TimberWinR.Outputs
Interlocked.Increment(ref _errorCount); Interlocked.Increment(ref _errorCount);
} }
} }
GC.Collect();
} }
else else
{ {
@@ -159,6 +161,7 @@ namespace TimberWinR.Outputs
} }
} }
} }
GC.Collect();
System.Threading.Thread.Sleep(_interval); System.Threading.Thread.Sleep(_interval);
} }
} }

2
TimberWinR/Outputs/Redis.cs
View File

@@ -198,6 +198,7 @@ namespace TimberWinR.Outputs
} }
} }
client.EndPipe(); client.EndPipe();
GC.Collect();
break; break;
} }
else else
@@ -216,6 +217,7 @@ namespace TimberWinR.Outputs
} }
} }
} }
GC.Collect();
System.Threading.Thread.Sleep(_interval); System.Threading.Thread.Sleep(_interval);
} }
} }

2
TimberWinR/Outputs/Stdout.cs
View File

@@ -48,7 +48,7 @@ namespace TimberWinR.Outputs
JObject[] messages; JObject[] messages;
lock (_locker) lock (_locker)
{ {
messages = _jsonQueue.Take(1).ToArray(); messages = _jsonQueue.Take(_jsonQueue.Count).ToArray();
_jsonQueue.RemoveRange(0, messages.Length); _jsonQueue.RemoveRange(0, messages.Length);
} }

3
TimberWinR/Parser.cs
View File

@@ -262,6 +262,8 @@ namespace TimberWinR.Parser
public bool SplitLongLines { get; set; } public bool SplitLongLines { get; set; }
[JsonProperty(PropertyName = "fields")] [JsonProperty(PropertyName = "fields")]
public List<Field> Fields { get; set; } public List<Field> Fields { get; set; }
[JsonProperty(PropertyName = "interval")]
public int Interval { get; set; }
public Log() public Log()
{ {
@@ -269,6 +271,7 @@ namespace TimberWinR.Parser
Fields.Add(new Field("LogFilename", "string")); Fields.Add(new Field("LogFilename", "string"));
Fields.Add(new Field("Index", "integer")); Fields.Add(new Field("Index", "integer"));
Fields.Add(new Field("Text", "string")); Fields.Add(new Field("Text", "string"));
Interval = 30;
} }
public void Validate() public void Validate()

2
chocolateyUninstall.ps1.template
View File

@@ -1,7 +1,7 @@
$packageName = 'TimberWinR-${version}' # arbitrary name for the package, used in messages $packageName = 'TimberWinR-${version}' # arbitrary name for the package, used in messages
$installerType = 'msi' #only one of these: exe, msi, msu $installerType = 'msi' #only one of these: exe, msi, msu
$url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi' # download url $url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi' # download url
$silentArgs = '{ABD20B9E-8628-40AD-AB11-5BD4356F9D94} /quiet' $silentArgs = '{B60FDD3E-615F-42C1-B587-6B46D262EF15} /quiet'
$validExitCodes = @(0) #please insert other valid exit codes here, exit codes for ms http://msdn.microsoft.com/en-us/library/aa368542(VS.85).aspx $validExitCodes = @(0) #please insert other valid exit codes here, exit codes for ms http://msdn.microsoft.com/en-us/library/aa368542(VS.85).aspx
UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes