implab/ImplabNet Commit - r255:b00441e04738

Adde workaround to the behaviour of the logical operations stack in conjuction...

cin -

r255:b00441e04738 v3

parent child

Context file:

r255:b00441e04738

Collapse all files

Implab.sln created 644 +37 0

@@ -0,0 +1,37
	1
	2	Microsoft Visual Studio Solution File, Format Version 12.00
	3	# Visual Studio 15
	4	VisualStudioVersion = 15.0.27428.2005
	5	MinimumVisualStudioVersion = 10.0.40219.1
	6	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Implab", "Implab\Implab.csproj", "{FF2052B6-9C8F-4022-A347-F07ABF635885}"
	7	EndProject
	8	Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Implab.Test", "Implab.Test\Implab.Test.csproj", "{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}"
	9	EndProject
	10	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Playground", "Implab.Playground\Implab.Playground.csproj", "{100DFEB0-75BE-436F-ADDF-1F46EF433F46}"
	11	EndProject
	12	Global
	13	GlobalSection(SolutionConfigurationPlatforms) = preSolution
	14	Debug\|Any CPU = Debug\|Any CPU
	15	Release\|Any CPU = Release\|Any CPU
	16	EndGlobalSection
	17	GlobalSection(ProjectConfigurationPlatforms) = postSolution
	18	{FF2052B6-9C8F-4022-A347-F07ABF635885}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
	19	{FF2052B6-9C8F-4022-A347-F07ABF635885}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
	20	{FF2052B6-9C8F-4022-A347-F07ABF635885}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
	21	{FF2052B6-9C8F-4022-A347-F07ABF635885}.Release\|Any CPU.Build.0 = Release\|Any CPU
	22	{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
	23	{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
	24	{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
	25	{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}.Release\|Any CPU.Build.0 = Release\|Any CPU
	26	{100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
	27	{100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
	28	{100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
	29	{100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Release\|Any CPU.Build.0 = Release\|Any CPU
	30	EndGlobalSection
	31	GlobalSection(SolutionProperties) = preSolution
	32	HideSolutionNode = FALSE
	33	EndGlobalSection
	34	GlobalSection(ExtensibilityGlobals) = postSolution
	35	SolutionGuid = {36D837FC-4CDD-4AEA-87BF-F130FEB22E02}
	36	EndGlobalSection
	37	EndGlobal

Implab.Playground/App.config +1 -1

             <?xml version="1.0" encoding="utf-8"?>
             <configuration>
                 <startup>
-                    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+                    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
                 </startup>
             </configuration>

Implab.Playground/Implab.Playground.csproj +1 -1

             <?xml version="1.0" encoding="utf-8"?>
             <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
               <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
               <PropertyGroup>
                 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
                 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
                 <ProjectGuid>{100DFEB0-75BE-436F-ADDF-1F46EF433F46}</ProjectGuid>
                 <OutputType>Exe</OutputType>
                 <AppDesignerFolder>Properties</AppDesignerFolder>
                 <RootNamespace>Implab.Playground</RootNamespace>
                 <AssemblyName>Implab.Playground</AssemblyName>
-                <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+                <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
                 <FileAlignment>512</FileAlignment>
                 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
                 <TargetFrameworkProfile />
               </PropertyGroup>
               <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
                 <PlatformTarget>AnyCPU</PlatformTarget>
                 <DebugSymbols>true</DebugSymbols>
                 <DebugType>full</DebugType>
                 <Optimize>false</Optimize>
                 <OutputPath>bin\Debug\</OutputPath>
                 <DefineConstants>DEBUG;TRACE</DefineConstants>
                 <ErrorReport>prompt</ErrorReport>
                 <WarningLevel>4</WarningLevel>
               </PropertyGroup>
               <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
                 <PlatformTarget>AnyCPU</PlatformTarget>
                 <DebugType>pdbonly</DebugType>
                 <Optimize>true</Optimize>
                 <OutputPath>bin\Release\</OutputPath>
                 <DefineConstants>TRACE</DefineConstants>
                 <ErrorReport>prompt</ErrorReport>
                 <WarningLevel>4</WarningLevel>
                 <Prefer32Bit>true</Prefer32Bit>
                 <DebugSymbols>true</DebugSymbols>
               </PropertyGroup>
               <ItemGroup>
                 <Reference Include="System" />
                 <Reference Include="System.Core" />
                 <Reference Include="System.Xml.Linq" />
                 <Reference Include="System.Data.DataSetExtensions" />
                 <Reference Include="Microsoft.CSharp" />
                 <Reference Include="System.Data" />
                 <Reference Include="System.Net.Http" />
                 <Reference Include="System.Xml" />
               </ItemGroup>
               <ItemGroup>
                 <Compile Include="Program.cs" />
                 <Compile Include="Properties\AssemblyInfo.cs" />
               </ItemGroup>
               <ItemGroup>
                 <None Include="App.config" />
               </ItemGroup>
               <ItemGroup>
                 <ProjectReference Include="..\Implab\Implab.csproj">
                   <Project>{f550f1f8-8746-4ad0-9614-855f4c4b7f05}</Project>
                   <Name>Implab</Name>
                 </ProjectReference>
               </ItemGroup>
               <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
               <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
                    Other similar extension points exist, see Microsoft.Common.targets.
               <Target Name="BeforeBuild">
               </Target>
               <Target Name="AfterBuild">
               </Target>
               -->
             </Project>

Implab.Playground/Program.cs +29 -66

@@ -1,92 +1,55
1	using Implab.~~Formats.Json~~;	1	using Implab.Diagnostics;
		2	using Implab.Formats.Json;
2	using Implab.Parallels;	3	using Implab.Parallels;
3	using Implab.Xml;	4	using Implab.Xml;
4	using System;	5	using System;
5	using System.Collections.Concurrent;	6	using System.Collections.Concurrent;
6	using System.Collections.Generic;	7	using System.Collections.Generic;
7	using System.IO;	8	using System.IO;
8	using System.Linq;	9	using System.Linq;
9	using System.Text;	10	using System.Text;
10	using System.Threading;	11	using System.Threading;
11	using System.Threading.Tasks;	12	using System.Threading.Tasks;
12	using System.Xml;	13	using System.Xml;
13	using System.Xml.Serialization;	14	using System.Xml.Serialization;
14		15
15	namespace Implab.Playground {	16	namespace Implab.Playground {
		17	using System.Diagnostics;
		18	using System.Runtime.Remoting.Messaging;
		19	using static Trace<Program>;
		20
16	public class Program {	21	public class Program {
17		22
18	static void EnqueueRange<T>(ConcurrentQueue<T> q, T[] data, int offset, int len) {	23	static void Main(string[] args) {
19	for (var i = offset; i < offset + len; i++)	24	var listener = new SimpleTraceListener(Console.Out);
20	q.Enqueue(data[i]);	25
21	}	26	var source = Trace<Program>.TraceSource;
		27	source.Switch.Level = SourceLevels.All;
22		28
23	static bool TryDequeueRange<T>(ConcurrentQueue<T> q,T[] buffer,int offset, int len, out int actual) {	29	source.Listeners.Add(listener);
24	actual = 0;	30
25	T res;	31	var t = Environment.TickCount;
26	while(q.TryDequeue(out res)) {
27	buffer[offset + actual] = res;
28	actual++;
29	if (actual == len)
30	break;
31	}
32	return actual != 0;
33	}
34		32
35	static void EnqueueRange<T>(SimpleAsyncQueue<T> q, T[] data, int offset, int len) {	33	Main().Wait();
36	for (var i = offset; i < offset + len; i++)	34
37	q.Enqueue(data[i]);	35	Console.WriteLine($"Done: {Environment.TickCount - t} ms");
		36	Console.ReadKey();
38	}	37	}
39		38
40	static bool TryDequeueRange<T>(SimpleAsyncQueue<T> q, T[] buffer, int offset, int len, out int actual) {	39	static async Task Main() {
41	actual = 0;	40	using (LogicalOperation(nameof(Main))) {
42	T ~~res~~;	41	Log("Start");
43	while (q.TryDequeue(out res)) {	42	await SomeAsync();
44	buffer[offset + actual] = res;	43	Log("End");
45	actual++;
46	if (actual == len)
47	break;
48	}
49	return actual != 0;
50	}
51
52	static void EnqueueRange<T>(AsyncQueue<T> q, T[] data, int offset, int len) {
53	for (var i = offset; i < offset + len; i++)
54	q.Enqueue(data[i]);
55	}
56
57	static bool TryDequeueRange<T>(AsyncQueue<T> q, T[] buffer, int offset, int len, out int actual) {
58	actual = 0;
59	T res;
60	while (q.TryDequeue(out res)) {
61	buffer[offset + actual] = res;
62	actual++;
63	if (actual == len)
64	break;
65	}
66	return actual != 0;
67	}
68
69
70	/*static void EnqueueRange<T>(AsyncQueue<T> q, T[] data, int offset, int len) {
71	q.EnqueueRange(data, offset, len);
72	}
73
74	static bool TryDequeueRange<T>(AsyncQueue<T> q, T[] buffer, int offset, int len, out int actual) {
75	return q.TryDequeueRange(buffer, offset, len, out actual);
76	}*/
77
78
79	static void Main(string[] args) {
80
81	var t = Environment.TickCount;
82	using (var reader = JsonReader.Create("e:\\citylots.json")) {
83	while (reader.Read()) {
84	}	44	}
85	}	45	}
86		46
87	Console.WriteLine($"JsonReader: {Environment.TickCount - t} ms");	47	static async Task SomeAsync() {
88		48	using (LogicalOperation(nameof(SomeAsync))) {
89	Console.WriteLine("done");	49	Log("Do prepare");
		50	await Task.Yield();
		51	Log("Yield");
90	}	52	}
91	}	53	}
92	}	54	}
		55	}

Implab.Test/Implab.Test.csproj +2 -1

             <Project Sdk="Microsoft.NET.Sdk">
               <PropertyGroup>
-                <TargetFramework>netcoreapp2.0</TargetFramework>
+                <TargetFramework>net46</TargetFramework>
+                <FrameworkPathOverride Condition="'$(TargetFramework)'=='net45' and '$(OSTYPE)'=='linux'">/usr/lib/mono/4.5/</FrameworkPathOverride>
                 <IsPackable>false</IsPackable>
               </PropertyGroup>
               <ItemGroup>
                 <ProjectReference Include="../Implab/Implab.csproj" />
                 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
                 <PackageReference Include="xunit" Version="2.3.1" />
                 <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
                 <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
               </ItemGroup>
             </Project>

Implab/Diagnostics/Trace.cs +14 -9

             using System;
             using System.Collections.Generic;
             using System.Diagnostics;
             using System.Linq;
             using System.Text;
+            using System.Threading;
             using System.Threading.Tasks;
             namespace Implab.Diagnostics {
                 public static class Trace<T> {
-                    readonly static TraceSource _traceSource = new TraceSource(typeof(T).Name);
+                    public static TraceSource TraceSource { get; } = new TraceSource(typeof(T).Name);
-                    public static TraceSource TraceSource {
+            #if NETFX_TRACE_BUG
-                        get { return _traceSource; }
+                    readonly static AsyncLocal<object> m_currentOperation = new AsyncLocal<object>();
+            #endif
                     /// <summary>
                     /// Starts the logical operation nested to the current operation nested to the current one.
                     /// </summary>
-                    [Conditional("TRACE")]
                     public static void StartLogicalOperation() {
                         Trace.CorrelationManager.StartLogicalOperation();
                     }
                     /// <summary>
                     /// Starts the logical operation with the specified name, this name is usefull in logs.
                     /// </summary>
                     /// <param name="name">Name.</param>
-                    [Conditional("TRACE")]
+            #if NETFX_TRACE_BUG
-                    public static void StartLogicalOperation(string name) {
+                    public static void StartLogicalOperation(object name) {
+                        m_currentOperation.Value = name;
                         Trace.CorrelationManager.StartLogicalOperation(name);
                     }
+            #else
+                    public static void StartLogicalOperation(object name) {
+                        Trace.CorrelationManager.StartLogicalOperation(name);
+                    }
+            #endif
                     /// <summary>
                     /// Ends the logical operation and restores the previous one.
                     /// </summary>
-                    [Conditional("TRACE")]
                     public static void StopLogicalOperation() {
                         Trace.CorrelationManager.StopLogicalOperation();
                     }
                     /// <summary>
                     /// Writes an informational message.
                     /// </summary>
                     /// <param name="format">Format.</param>
                     /// <param name="arguments">Arguments.</param>
                     [Conditional("TRACE")]
                     public static void Log(string format, params object[] arguments) {
                         TraceSource.TraceEvent(TraceEventType.Information, 0, format, arguments);
                     }
                     /// <summary>
                     /// Writes a warning message.
                     /// </summary>
                     /// <param name="format">Format.</param>
                     /// <param name="arguments">Arguments.</param>
                     [Conditional("TRACE")]
                     public static void Warn(string format, params object[] arguments) {
                         TraceSource.TraceEvent(TraceEventType.Warning, 0, format, arguments);
                     }
                     [Conditional("TRACE")]
                     public static void Error(string format, params object[] arguments) {
                         TraceSource.TraceEvent(TraceEventType.Error, 0, format, arguments);
                     }
                     [Conditional("TRACE")]
                     public static void Error(Exception err) {
                         TraceSource.TraceData(TraceEventType.Error, 0, err);
                     }
                     /// <summary>
                     /// This method save the current activity, and transfers to the specified activity,
                     /// emits <see cref="TraceEventType.Start"/> and returns a scope of the new
                     /// activity.
                     /// </summary>
                     /// <param name="activityName">The name of the new activity/</param>
                     /// <param name="activityId">The identifier of the activity to which
                     /// the control will be transferred</param>
                     /// <returns>A scope of the new activity, dispose it to transfer
                     /// the control back to the original activity.</returns>
                     public static ActivityScope TransferActivity(string activityName, Guid activityId) {
                         var prev = Trace.CorrelationManager.ActivityId;
                         TraceSource.TraceTransfer(0, "Transfer", activityId);
                         Trace.CorrelationManager.ActivityId = activityId;
                         TraceSource.TraceEvent(TraceEventType.Start, 0, activityName);
                         return new ActivityScope(TraceSource, prev, 0, activityName);
                     }
                     /// <summary>
                     /// Emits <see cref="TraceEventType.Start"/> and returns a scope of the
                     /// activity.
                     /// </summary>
                     /// <param name="activityName">The name of the activity to start</param>
                     /// <returns>A scope of the new activity, dispose it to emit
                     /// <see cref="TraceEventType.Stop"/> for the current activity.</returns>
                     public static ActivityScope StartActivity(string activityName) {
                         if (Trace.CorrelationManager.ActivityId == Guid.Empty)
                             Trace.CorrelationManager.ActivityId = Guid.NewGuid();
                         var prev = Trace.CorrelationManager.ActivityId;
                         TraceSource.TraceEvent(TraceEventType.Start, 0, activityName);
                         return new ActivityScope(TraceSource, prev, 0, activityName);
                     }
                     /// <summary>
                     /// Creates new <see cref="LogicalOperation(string)"/> and calls
                     /// to <see cref="CorrelationManager.StartLogicalOperation(object)"/>
                     /// passing the created operation as identity. Calls
                     /// <see cref="TraceSource.TraceData(TraceEventType, int, object)"/>
                     /// to notify listeners on operation start.
                     /// </summary>
                     /// <param name="name">The name of the logical operation.</param>
                     /// <returns>Logical operation scope, disposing it will stop
                     /// logical operation and notify trace listeners.</returns>
                     public static LogicalOperationScope LogicalOperation(string name) {
                         var operation = new LogicalOperation(name);
                         TraceSource.TraceData(TraceEventType.Information, TraceEventCodes.StartLogicalOperation, operation);
-                        Trace.CorrelationManager.StartLogicalOperation(operation);
+                        StartLogicalOperation(operation);
                         return new LogicalOperationScope(TraceSource, operation);
                     }
                 }
             }

Implab/Implab.csproj +3 -2

             <Project Sdk="Microsoft.NET.Sdk">
               <PropertyGroup>
                 <Authors>Sergey Smirnov</Authors>
                 <Title>Implab library</Title>
                 <Description>Provides some helper clesses like XML serialization helpers, JSON XML reader,
                 JSON pull-parser, ECMA-style promises, lightweight synchonization routines Signal
                 and SharedLock, Trace helpers on top of System.Diagnostics, ObjectPool etc.
                 </Description>
                 <Copyright>2012-2018 Sergey Smirnov</Copyright>
                 <LicenseUrl>https://opensource.org/licenses/BSD-2-Clause</LicenseUrl>
                 <ProjectUrl>https://implab.org</ProjectUrl>
                 <RepositoryUrl>https://hg.implab.org/pub/ImplabNet/</RepositoryUrl>
-                <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+                <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
-                <FrameworkPathOverride Condition="'$(TargetFramework)'=='net45' and '$(OSTYPE)'=='linux'">/usr/lib/mono/4.5/</FrameworkPathOverride>
+                <FrameworkPathOverride Condition="'$(TargetFramework)'=='net46' and '$(OSTYPE)'=='linux'">/usr/lib/mono/4.5/</FrameworkPathOverride>
+                <DefineConstants Condition="'$(TargetFramework)'=='net46'">NETFX_TRACE_BUG;$(DefineConstants)</DefineConstants>
               </PropertyGroup>
             </Project>

General Comments 3

sergey

|

Auto status change to "Under Review"

sergey

|

ok, latest stable version should be in default

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages