From ff5051a8d15a902a154ec1d129a204f6cff3da0a Mon Sep 17 00:00:00 2001
From: Phillip Clark <cerebralkungfu@gmail.com>
Date: Wed, 16 Jun 2010 17:34:22 +0000
Subject: [PATCH] Added DefaultEmitterName to config file and hander.

git-svn-id: https://lwes.svn.sourceforge.net/svnroot/lwes/lwes-dotnet/trunk@486 a2f82657-cdd2-4550-bd36-68a8e7111808
---
 Org.Lwes/Config/LwesConfigurationSection.cs        |  14 +++
 Org.Lwes/Constants.cs                              |   2 +-
 Org.Lwes/Emitter/EventEmitter.cs                   |   3 +-
 Org.Lwes/LwesTraceListener.cs                      |  48 ++++-----
 Org.Lwes/Org.Lwes.csproj                           |   1 +
 Org.Lwes/Trace/TraceMessage.esf                    |  22 ++++
 .../Lwes-test-listener-console/Program.cs          | 111 ++++++++++++++++++++-
 bin/UpdateWixProjectWithVersion.exe                | Bin 8704 -> 8704 bytes
 bin/UpdateWixProjectWithVersion.pdb                | Bin 15872 -> 15872 bytes
 9 files changed, 171 insertions(+), 30 deletions(-)
 create mode 100644 Org.Lwes/Trace/TraceMessage.esf

diff --git a/Org.Lwes/Config/LwesConfigurationSection.cs b/Org.Lwes/Config/LwesConfigurationSection.cs
index fe17791..c224f7a 100644
--- a/Org.Lwes/Config/LwesConfigurationSection.cs
+++ b/Org.Lwes/Config/LwesConfigurationSection.cs
@@ -58,6 +58,8 @@ namespace Org.Lwes.Config
 		/// </summary>
 		public const string PropertyName_templateDBs = "templateDBs";
 
+		public const string PropertyName_defaultEmitter = "defaultEmitter";
+
 		/// <summary>
 		/// Section name used for configuring the Light Weight Event System.
 		/// </summary>
@@ -68,6 +70,18 @@ namespace Org.Lwes.Config
 		#region Properties
 
 		/// <summary>
+		/// Indicates the name of the emitter used as default.
+		/// </summary>
+		[ConfigurationProperty(PropertyName_defaultEmitter,
+			IsRequired = false,
+			DefaultValue = Constants.CDefaultEventEmitterConfigName)]
+		public string DefaultEmitterName
+		{
+			get { return (string)this[PropertyName_defaultEmitter]; }
+			set { this[PropertyName_defaultEmitter] = value; }
+		}
+
+		/// <summary>
 		/// Indicates the length of buffers used for event buffering.
 		/// </summary>
 		[ConfigurationProperty(PropertyName_bufferAllocationLength
diff --git a/Org.Lwes/Constants.cs b/Org.Lwes/Constants.cs
index a048e5a..8422faa 100644
--- a/Org.Lwes/Constants.cs
+++ b/Org.Lwes/Constants.cs
@@ -41,7 +41,7 @@ namespace Org.Lwes
 		/// <summary>
 		/// Name identifying the default event emitter in the configuration file.
 		/// </summary>
-		public static readonly string DefaultEventEmitterConfigName = "default";
+		public const string CDefaultEventEmitterConfigName = "default";
 
 		/// <summary>
 		/// IoC container key for the default IEventEmitter instance.
diff --git a/Org.Lwes/Emitter/EventEmitter.cs b/Org.Lwes/Emitter/EventEmitter.cs
index a5dec62..bc508c6 100644
--- a/Org.Lwes/Emitter/EventEmitter.cs
+++ b/Org.Lwes/Emitter/EventEmitter.cs
@@ -51,7 +51,8 @@ namespace Org.Lwes.Emitter
 			if (!IoCAdapter.TryCreateFromIoC<IEventEmitter>(Constants.DefaultEventEmitterContainerKey, out result))
 			{ // Either there isn't a default event template defined in the IoC container
 				// or there isn't an IoC container in use... fall back to configuration section.
-				result = CreateFromConfig(Constants.DefaultEventEmitterConfigName);
+				var def = LwesConfigurationSection.Current.DefaultEmitterName;
+				result = CreateFromConfig(def);
 			}
 			if (result == null)
 			{ // Not in IoC and not configured; fallback to programmatic default.
diff --git a/Org.Lwes/LwesTraceListener.cs b/Org.Lwes/LwesTraceListener.cs
index 645038c..6ae071d 100644
--- a/Org.Lwes/LwesTraceListener.cs
+++ b/Org.Lwes/LwesTraceListener.cs
@@ -225,12 +225,12 @@ namespace Org.Lwes
 								int port = (Port == 0) ? Constants.CDefaultMulticastPort : Port;
 								int ttl = (MulticastTimeToLive == 0) ? Constants.CDefaultMulticastTtl : MulticastTimeToLive;
 								emitter.InitializeAll(SupportedEncoding.Default,
-			#if DEBUG
-			 true,
-			#else
+#if DEBUG
+ true,
+#else
 									false,
-			#endif
-			 EventTemplateDB.CreateDefault(),
+#endif
+ EventTemplateDB.CreateDefault(),
 									addy,
 									port,
 									ttl,
@@ -277,10 +277,10 @@ namespace Org.Lwes
 		public override void TraceData(TraceEventCache eventCache, string source, TraceEventType eventType, int id, object data)
 		{
 			Event ev = Emitter.CreateEvent(EventName_TraceMessage);
-				ev.SetValue(AttributeName_ProcessId, eventCache.ProcessId);
-				ev.SetValue(AttributeName_ThreadId, eventCache.ThreadId);
-				ev.SetValue(AttributeName_DateTime, eventCache.DateTime.ToString("u"));
-				ev.SetValue(AttributeName_Timestamp, eventCache.Timestamp);
+			ev.SetValue(AttributeName_ProcessId, eventCache.ProcessId);
+			ev.SetValue(AttributeName_ThreadId, eventCache.ThreadId);
+			ev.SetValue(AttributeName_DateTime, eventCache.DateTime.ToString("u"));
+			ev.SetValue(AttributeName_Timestamp, eventCache.Timestamp);
 			if (eventType <= TraceEventType.Warning)
 			{
 				ev.SetValue(AttributeName_Callstack, Convert.ToString(eventCache.Callstack));
@@ -288,8 +288,8 @@ namespace Org.Lwes
 			}
 			ev.SetValue(AttributeName_Source, source);
 			ev.SetValue(AttributeName_TraceEventType, eventType.ToString());
-				ev.SetValue(AttributeName_ID, id);
-				ev.SetValue(AttributeName_Data, Convert.ToString(data));
+			ev.SetValue(AttributeName_ID, id);
+			ev.SetValue(AttributeName_Data, Convert.ToString(data));
 			_emitter.Emit(ev);
 		}
 
@@ -307,18 +307,18 @@ namespace Org.Lwes
 		public override void TraceData(TraceEventCache eventCache, string source, TraceEventType eventType, int id, params object[] data)
 		{
 			Event ev = Emitter.CreateEvent(EventName_TraceMessage);
-				ev.SetValue(AttributeName_ProcessId, eventCache.ProcessId);
-				ev.SetValue(AttributeName_ThreadId, eventCache.ThreadId);
-				ev.SetValue(AttributeName_DateTime, eventCache.DateTime.ToString("u"));
-				ev.SetValue(AttributeName_Timestamp, eventCache.Timestamp);
+			ev.SetValue(AttributeName_ProcessId, eventCache.ProcessId);
+			ev.SetValue(AttributeName_ThreadId, eventCache.ThreadId);
+			ev.SetValue(AttributeName_DateTime, eventCache.DateTime.ToString("u"));
+			ev.SetValue(AttributeName_Timestamp, eventCache.Timestamp);
 			if (eventType <= TraceEventType.Warning)
 			{
 				ev.SetValue(AttributeName_Callstack, Convert.ToString(eventCache.Callstack));
 				ev.SetValue(AttributeName_LogicalOperationStack, Convert.ToString(eventCache.LogicalOperationStack));
 			}
 			ev.SetValue(AttributeName_Source, source);
-				ev.SetValue(AttributeName_TraceEventType, eventType.ToString());
-				ev.SetValue(AttributeName_ID, id);
+			ev.SetValue(AttributeName_TraceEventType, eventType.ToString());
+			ev.SetValue(AttributeName_ID, id);
 			for (int i = 0; i < data.Length; i++)
 			{
 				ev.SetValue(String.Concat(AttributeName_Data, "_", i), Convert.ToString(data[i]));
@@ -339,10 +339,10 @@ namespace Org.Lwes
 		public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id)
 		{
 			Event ev = Emitter.CreateEvent(EventName_TraceMessage);
-				ev.SetValue(AttributeName_ProcessId, eventCache.ProcessId);
-				ev.SetValue(AttributeName_ThreadId, eventCache.ThreadId);
-				ev.SetValue(AttributeName_DateTime, eventCache.DateTime.ToString("u"));
-				ev.SetValue(AttributeName_Timestamp, eventCache.Timestamp);
+			ev.SetValue(AttributeName_ProcessId, eventCache.ProcessId);
+			ev.SetValue(AttributeName_ThreadId, eventCache.ThreadId);
+			ev.SetValue(AttributeName_DateTime, eventCache.DateTime.ToString("u"));
+			ev.SetValue(AttributeName_Timestamp, eventCache.Timestamp);
 			if (eventType <= TraceEventType.Warning)
 			{
 				ev.SetValue(AttributeName_Callstack, Convert.ToString(eventCache.Callstack));
@@ -350,7 +350,7 @@ namespace Org.Lwes
 			}
 			ev.SetValue(AttributeName_Source, source);
 			ev.SetValue(AttributeName_TraceEventType, eventType.ToString());
-				ev.SetValue(AttributeName_ID, id);
+			ev.SetValue(AttributeName_ID, id);
 			_emitter.Emit(ev);
 		}
 
@@ -377,7 +377,7 @@ namespace Org.Lwes
 			if (eventType <= TraceEventType.Warning)
 			{
 				ev.SetValue(AttributeName_Callstack, Convert.ToString(eventCache.Callstack));
-			ev.SetValue(AttributeName_LogicalOperationStack, Convert.ToString(eventCache.LogicalOperationStack));
+				ev.SetValue(AttributeName_LogicalOperationStack, Convert.ToString(eventCache.LogicalOperationStack));
 			}
 			ev.SetValue(AttributeName_Source, source);
 			ev.SetValue(AttributeName_TraceEventType, eventType.ToString());
@@ -407,7 +407,7 @@ namespace Org.Lwes
 			if (eventType <= TraceEventType.Warning)
 			{
 				ev.SetValue(AttributeName_Callstack, Convert.ToString(eventCache.Callstack));
-			ev.SetValue(AttributeName_LogicalOperationStack, Convert.ToString(eventCache.LogicalOperationStack));
+				ev.SetValue(AttributeName_LogicalOperationStack, Convert.ToString(eventCache.LogicalOperationStack));
 			}
 			ev.SetValue(AttributeName_Source, source);
 			ev.SetValue(AttributeName_TraceEventType, eventType.ToString());
diff --git a/Org.Lwes/Org.Lwes.csproj b/Org.Lwes/Org.Lwes.csproj
index cd4f0cb..b9e347c 100644
--- a/Org.Lwes/Org.Lwes.csproj
+++ b/Org.Lwes/Org.Lwes.csproj
@@ -140,6 +140,7 @@
       <LastGenOutput>AssemblyInfo.version.cs</LastGenOutput>
     </None>
     <None Include="Lwes.Org.StrongNameKey.pfx" />
+    <Content Include="Trace\TraceMessage.esf" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Org.Lwes/Trace/TraceMessage.esf b/Org.Lwes/Trace/TraceMessage.esf
new file mode 100644
index 0000000..1f9b51d
--- /dev/null
+++ b/Org.Lwes/Trace/TraceMessage.esf
@@ -0,0 +1,22 @@
+#
+# TraceMessage is an event type for trace messages emitted by dotNet apps.
+# 
+# This is a generic event type that allows trace messages written to the
+# .NET BCL's diagnostics trace framework to be emitted to LWES.
+#
+TraceMessage
+{ 
+  int32  ProcessId;             # id of the process that created the message (OS process)
+  int32  ThreadId;              # id of the thread that created the message (OS thread id)
+  string Source;                # a name used to identify the output, typically the name of the application that generated the trace message
+  string RelatedActivityID;     # application defined string (GUID) identifying the related activity
+  int32  ID;                    # identity of the event - corresponds with the trace event ID in dotNet
+  int64  Timestamp;             # local time ticks indicating when the event was generated
+  string TraceEventType;        # one of (Critical, Error, Warning, Information, Verbose, Start, Stop, Suspend, Resume, Transfer)
+
+  string LogicalOperationStack; # if present - indicates the logical operation stack
+  string Callstack;             # if present - indicates the callstack
+  
+  string Message;               # the text of the trace message
+  string Data;                  # data associated with the trace message  
+}
\ No newline at end of file
diff --git a/Test Projects/Lwes-test-listener-console/Program.cs b/Test Projects/Lwes-test-listener-console/Program.cs
index 6ce46b4..6fb98da 100644
--- a/Test Projects/Lwes-test-listener-console/Program.cs	
+++ b/Test Projects/Lwes-test-listener-console/Program.cs	
@@ -24,26 +24,59 @@ namespace Org.Lwes.Tests
 
 	using Org.Lwes;
 	using Org.Lwes.Listener;
+	using System.Text.RegularExpressions;
+	using System.Collections.Specialized;
+	using System.IO;
 
 	class Program
 	{
-		#region Methods
-
 		static void Main(string[] args)
 		{
+			var arguments = new Arguments(args);
+
 			bool userChoseToExit = false;
 			int eventCount = 0, incomingCount = 0;
 			Event mostRecent = default(Event);
+			SimpleLockFreeQueue<Event> writeQ = null;
+			var fileName = arguments["f"];
+
+			if (!String.IsNullOrEmpty(fileName))
+			{
+				writeQ = new SimpleLockFreeQueue<Event>();
+				var dir = Path.GetDirectoryName(fileName);
+				if (!String.IsNullOrEmpty(dir) && !Directory.Exists(dir))
+				{
+					Directory.CreateDirectory(dir);
+				}
+
+				// Start the file writer...
+				ThreadPool.QueueUserWorkItem(new WaitCallback((s) =>
+				{					
+					using (var f = File.CreateText(fileName))
+					{
+						while (!userChoseToExit)
+						{
+							Event ev;
+							while (writeQ.TryDequeue(out ev))
+							{
+								f.Write(ev.ToString(true));
+							}
+							Thread.Sleep(200);
+						}
+					}
+				}));
+			}
 
 			using (IEventListener listener = EventListener.CreateDefault())
 			{
 				Console.WriteLine("LWES EventListener -\r\n  This console will continue to queue and print LWES events until\r\n  the user types 'exit' followed by a carriage return.");
 
-				listener.OnEventArrived += (sender, ev)	=>
+				listener.OnEventArrived += (sender, ev) =>
 					{
 						Thread.MemoryBarrier();
 						mostRecent = ev;
 						Thread.MemoryBarrier();
+						if (writeQ != null) writeQ.Enqueue(ev);
 						Interlocked.Increment(ref incomingCount);
 					};
 
@@ -75,8 +108,78 @@ namespace Org.Lwes.Tests
 			Thread.Sleep(200);
 			Console.WriteLine("Final event count: {0}", incomingCount.ToString("N0"));
 			Thread.Sleep(2000);
+		}		
+	}
+
+	public class Arguments
+	{
+		StringDictionary _params;
+
+		public Arguments(string[] args)
+		{
+			_params = new StringDictionary();
+			Regex spliter = new Regex(@"^-{1,2}|^/|=|:", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+			Regex remover = new Regex(@"^['""]?(.*?)['""]?$",	RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+			string parm = null;
+			string[] parts;
+
+			foreach (var a in args)
+			{
+				parts = spliter.Split(a, 3);
+				switch (parts.Length)
+				{
+					case 1:
+						if (parm != null)
+						{
+							if (!_params.ContainsKey(parm))
+							{
+								parts[0] = remover.Replace(parts[0], "$1");
+								_params.Add(parm, parts[0]);
+							}
+							parm = null;
+						}
+						break;
+					case 2:
+						if (parm != null)
+						{
+							if (!_params.ContainsKey(parm))
+								_params.Add(parm, "true");
+						}
+						parm = parts[1];
+						break;
+					case 3:
+						if (parm != null)
+						{
+							if (!_params.ContainsKey(parm))
+								_params.Add(parm, "true");
+						}
+						parm = parts[1];
+						if (!_params.ContainsKey(parm))
+						{
+							parts[2] = remover.Replace(parts[2], "$1");
+							_params.Add(parm, parts[2]);
+						}
+
+						parm = null;
+						break;
+				}
+			}
+
+			if (parm != null)
+			{
+				if (!_params.ContainsKey(parm))
+					_params.Add(parm, "true");
+			}
 		}
 
-		#endregion Methods
+		public string this[string Param]
+		{
+			get
+			{
+				return (_params[Param]);
+			}
+		}
 	}
+
 }
\ No newline at end of file
diff --git a/bin/UpdateWixProjectWithVersion.exe b/bin/UpdateWixProjectWithVersion.exe
index b4e50ad8a959f1034da4f1d40ee6855b8202880d..a694aa537696124a1fc81ed4e71e7410ab4c7b1e 100644
GIT binary patch
delta 87
zcwTF8X>gg)!IH!!>9eutgs_0?Nh96Yv!3`ZTA27L{z_Bx<`fYgCLNG80}wC)aVHRW
km;kXD14B@-OK={8!9)g|x!$vv+Ai0gY^1e$j#vse01_@6OaK4?

delta 87
zcwTF8X>gg)!LqYV(R*Xh31NY+kA)A1%g*&#az!;K<X4pV<`fYgCLNG80}wC)aVHRW
km;kXD14B@-OK_v^%Nr8Mt~)Nso>qP4_#L~=bHq}(0cwgLUH||9

diff --git a/bin/UpdateWixProjectWithVersion.pdb b/bin/UpdateWixProjectWithVersion.pdb
index be982efc2ded8947a6c18072c5136228754b65c6..8c9791d73eac0a1485ccb2efc0bf506c297b7803 100644
GIT binary patch
delta 140
zcwTF$X{g!2!X=T!CF#S+z`&5lU@(!vX0G?_rMAnpCmU&Pmf?EC$=)eYxucTz^k#k$
z0Wrp+%?euISefjFCrcQ_un6$~Wu07MV8t<)8K|A%Fw<m1H4&kI4TqT+81^$Uz(B+1
O2L>vPc&ssc!VLho`6dDY

delta 138
zcwTF$X{g!2!X>e@OwpT>fq|h>_vH<VW7i!QWKXL;bNr6oW*M$Gob0>1SQ=hbp4!YW
zA|S??yIDc&8!OXW?#U7cF)R%HQ@JKr7+7)aVg_nwILtKJP)$tWFcSmAekKMu*!;ji
Lg%OV>Mo+i_-RUj%

-- 
2.11.4.GIT