Skip to content

E
et

老鱼er / et
与 Fork 源项目一致

从无法访问的项目Fork

通知 10
Star 1
Fork 0
E
et

体验新版 GitCode，发现更多精彩内容 >>

提交 250ea7fa 编写于 作者: T tanghai
浏览文件
操作

1.使用ConcurrentQueue 代替 BlockingCollection, TNet性能有所提升 

2.ENet windows上编译成x64
上级 e59cd1c0
隐藏空白更改
内联 并排
Showing with 160 addition and 246 deletion
CSharp/App/Editor/Editor.csproj
浏览文件 @ 250ea7fa
......@@ -57,6 +57,45 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\Bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>..\..\Bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.Prism.Composition">
<HintPath>..\..\packages\Prism.Composition.5.0.0\lib\NET45\Microsoft.Practices.Prism.Composition.dll</HintPath>
......
CSharp/CSharp.sln
浏览文件 @ 250ea7fa
......@@ -55,274 +55,66 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|Any CPU.ActiveCfg = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|Any CPU.Build.0 = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|Mixed Platforms.Build.0 = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|Win32.ActiveCfg = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|Win32.Build.0 = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|x64.ActiveCfg = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|x64.Build.0 = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|x86.ActiveCfg = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|x86.Build.0 = Debug|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|Any CPU.ActiveCfg = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|Any CPU.Build.0 = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|Mixed Platforms.ActiveCfg = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|Mixed Platforms.Build.0 = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|Win32.ActiveCfg = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|Win32.Build.0 = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|x64.ActiveCfg = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|x64.Build.0 = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|x86.ActiveCfg = Release|x86
{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}.Release|x86.Build.0 = Release|x86
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|Win32.ActiveCfg = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|Win32.Build.0 = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|x64.ActiveCfg = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|x64.Build.0 = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|x86.ActiveCfg = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Debug|x86.Build.0 = Debug|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|Any CPU.Build.0 = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|Win32.ActiveCfg = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|Win32.Build.0 = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|x64.ActiveCfg = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|x64.Build.0 = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|x86.ActiveCfg = Release|Any CPU
{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}.Release|x86.Build.0 = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Win32.ActiveCfg = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|Win32.Build.0 = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|x64.ActiveCfg = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|x64.Build.0 = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|x86.ActiveCfg = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Debug|x86.Build.0 = Debug|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|Any CPU.Build.0 = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|Win32.ActiveCfg = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|Win32.Build.0 = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|x64.ActiveCfg = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|x64.Build.0 = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|x86.ActiveCfg = Release|Any CPU
{6CD185D1-08E0-4729-A999-2D5B57BA8193}.Release|x86.Build.0 = Release|Any CPU
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Any CPU.ActiveCfg = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Any CPU.Build.0 = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Win32.ActiveCfg = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Win32.Build.0 = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x64.ActiveCfg = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x64.Build.0 = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x86.ActiveCfg = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x86.Build.0 = Debug|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Any CPU.ActiveCfg = Debug|x64
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Any CPU.Build.0 = Debug|x64
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|Any CPU.ActiveCfg = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|Any CPU.Build.0 = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|Mixed Platforms.Build.0 = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|Win32.ActiveCfg = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|Win32.Build.0 = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x64.ActiveCfg = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x64.Build.0 = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.ActiveCfg = Release|Win32
{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.Build.0 = Release|Win32
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Win32.ActiveCfg = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Win32.Build.0 = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|x64.ActiveCfg = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|x64.Build.0 = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|x86.ActiveCfg = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|x86.Build.0 = Debug|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.Build.0 = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Win32.ActiveCfg = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Win32.Build.0 = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|x64.ActiveCfg = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|x64.Build.0 = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|x86.ActiveCfg = Release|Any CPU
{F06B995E-6508-4C5C-A396-554316C9215D}.Release|x86.Build.0 = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Win32.ActiveCfg = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Win32.Build.0 = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|x64.ActiveCfg = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|x64.Build.0 = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|x86.ActiveCfg = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|x86.Build.0 = Debug|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Any CPU.Build.0 = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Win32.ActiveCfg = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Win32.Build.0 = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|x64.ActiveCfg = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|x64.Build.0 = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|x86.ActiveCfg = Release|Any CPU
{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|x86.Build.0 = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Win32.ActiveCfg = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|Win32.Build.0 = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|x64.ActiveCfg = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|x64.Build.0 = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|x86.ActiveCfg = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Debug|x86.Build.0 = Debug|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Any CPU.Build.0 = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Win32.ActiveCfg = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|Win32.Build.0 = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|x64.ActiveCfg = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|x64.Build.0 = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|x86.ActiveCfg = Release|Any CPU
{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}.Release|x86.Build.0 = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Win32.ActiveCfg = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Win32.Build.0 = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|x64.ActiveCfg = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|x64.Build.0 = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|x86.ActiveCfg = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|x86.Build.0 = Debug|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Any CPU.Build.0 = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Win32.ActiveCfg = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Win32.Build.0 = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|x64.ActiveCfg = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|x64.Build.0 = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|x86.ActiveCfg = Release|Any CPU
{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|x86.Build.0 = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Win32.ActiveCfg = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Win32.Build.0 = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|x64.ActiveCfg = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|x64.Build.0 = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|x86.ActiveCfg = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|x86.Build.0 = Debug|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Any CPU.Build.0 = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Win32.ActiveCfg = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Win32.Build.0 = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|x64.ActiveCfg = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|x64.Build.0 = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|x86.ActiveCfg = Release|Any CPU
{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|x86.Build.0 = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Win32.ActiveCfg = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Win32.Build.0 = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x64.ActiveCfg = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x64.Build.0 = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x86.ActiveCfg = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x86.Build.0 = Debug|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Any CPU.Build.0 = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Win32.ActiveCfg = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Win32.Build.0 = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x64.ActiveCfg = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x64.Build.0 = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x86.ActiveCfg = Release|Any CPU
{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x86.Build.0 = Release|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Win32.ActiveCfg = Debug|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|x64.ActiveCfg = Debug|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|x86.ActiveCfg = Debug|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Any CPU.Build.0 = Release|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Win32.ActiveCfg = Release|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|x64.ActiveCfg = Release|Any CPU
{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|x86.ActiveCfg = Release|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Win32.ActiveCfg = Debug|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x64.ActiveCfg = Debug|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x86.ActiveCfg = Debug|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Any CPU.Build.0 = Release|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Win32.ActiveCfg = Release|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x64.ActiveCfg = Release|Any CPU
{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x86.ActiveCfg = Release|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Win32.ActiveCfg = Debug|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|x64.ActiveCfg = Debug|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|x86.ActiveCfg = Debug|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.Build.0 = Release|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Win32.ActiveCfg = Release|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|x64.ActiveCfg = Release|Any CPU
{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|x86.ActiveCfg = Release|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Win32.ActiveCfg = Debug|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|x64.ActiveCfg = Debug|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|x86.ActiveCfg = Debug|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.Build.0 = Release|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Win32.ActiveCfg = Release|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|x64.ActiveCfg = Release|Any CPU
{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -344,4 +136,7 @@ Global
{1888D319-0495-43F3-BA8D-163EC20D9437} = {F13D0B3D-5B4F-452A-9378-0FD39555371D}
{47A7404D-F501-43C5-8183-4B4E9E8C24B2} = {F13D0B3D-5B4F-452A-9378-0FD39555371D}
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal
CSharp/Platform/ENet/ENet.vcxproj
浏览文件 @ 250ea7fa
......@@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C9992B7C-313E-4C9F-A954-640D01EDFB58}</ProjectGuid>
......@@ -25,6 +33,13 @@
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
......@@ -32,15 +47,28 @@
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
......@@ -50,11 +78,21 @@
<TargetExt>.dll</TargetExt>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetExt>.dll</TargetExt>
<TargetName>$(ProjectName)</TargetName>
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)\Platform\;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)\Bin\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\Bin\Release\</OutDir>
<IntDir>$(SolutionDir)\Temp\Release\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
......@@ -86,6 +124,37 @@
<PreserveSbr>true</PreserveSbr>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;ENET_DLL;ENET_BUILDING_LIB</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<FunctionLevelLinking>false</FunctionLevelLinking>
<BrowseInformation>true</BrowseInformation>
<CallingConvention>Cdecl</CallingConvention>
<CompileAsManaged>false</CompileAsManaged>
<DisableSpecificWarnings>4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>wsock32.lib;Ws2_32.lib;Winmm.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<CLRSupportLastError>Enabled</CLRSupportLastError>
</Link>
<ProjectReference>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<Bscmake>
<PreserveSbr>true</PreserveSbr>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
......@@ -103,6 +172,23 @@
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;ENET_DLL;ENET_BUILDING_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>false</CompileAsManaged>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>wsock32.lib;Ws2_32.lib;Winmm.lib</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<CLRSupportLastError>Enabled</CLRSupportLastError>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="callbacks.c" />
<ClCompile Include="compress.c" />
......
CSharp/Platform/TNet/TPoller.cs
浏览文件 @ 250ea7fa
......@@ -7,37 +7,30 @@ namespace TNet
public class TPoller: IPoller
{
// 线程同步队列,发送接收socket回调都放到该队列,由poll线程统一执行
private readonly BlockingCollection<Action> blockingCollection = new BlockingCollection<Action>();
private readonly ConcurrentQueue<Action> concurrentQueue = new ConcurrentQueue<Action>();
private readonly Queue<Action> localQueue = new Queue<Action>();
public void Add(Action action)
{
this.blockingCollection.Add(action);
this.concurrentQueue.Enqueue(action);
}
public void Run(int timeout)
{
// 处理读写线程的回调
Action action;
if (!this.blockingCollection.TryTake(out action, timeout))
{
return;
}
var queue = new Queue<Action>();
queue.Enqueue(action);
while (true)
{
if (!this.blockingCollection.TryTake(out action, 0))
Action action;
if (!this.concurrentQueue.TryDequeue(out action))
{
break;
}
queue.Enqueue(action);
localQueue.Enqueue(action);
}
while (queue.Count > 0)
while (localQueue.Count > 0)
{
Action a = queue.Dequeue();
Action a = localQueue.Dequeue();
a();
}
}
......
CSharp/Platform/UNet/UNet.csproj
浏览文件 @ 250ea7fa
......@@ -20,6 +20,8 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......
CSharp/Platform/UNet/UPoller.cs
浏览文件 @ 250ea7fa
......@@ -22,7 +22,10 @@ namespace UNet
private readonly USocket acceptor = new USocket(IntPtr.Zero);
private readonly BlockingCollection<Action> blockingCollection = new BlockingCollection<Action>();
// 线程同步队列,发送接收socket回调都放到该队列,由poll线程统一执行
private readonly ConcurrentQueue<Action> concurrentQueue = new ConcurrentQueue<Action>();
private readonly Queue<Action> localQueue = new Queue<Action>();
private ENetEvent eNetEventCache;
......@@ -160,29 +163,24 @@ namespace UNet
public void Add(Action action)
{
this.blockingCollection.Add(action);
this.concurrentQueue.Enqueue(action);
}
private void OnEvents(int timeout)
private void OnEvents()
{
// 处理读写线程的回调
Action action;
if (!this.blockingCollection.TryTake(out action, timeout))
{
return;
}
var queue = new Queue<Action>();
queue.Enqueue(action);
while (this.blockingCollection.TryTake(out action, 0))
while (true)
{
queue.Enqueue(action);
Action action;
if (!this.concurrentQueue.TryDequeue(out action))
{
break;
}
localQueue.Enqueue(action);
}
while (queue.Count > 0)
while (localQueue.Count > 0)
{
Action a = queue.Dequeue();
Action a = localQueue.Dequeue();
a();
}
}
......@@ -200,7 +198,7 @@ namespace UNet
throw new ArgumentOutOfRangeException(string.Format("timeout: {0}", timeout));
}
this.OnEvents(timeout);
this.OnEvents();
if (this.Service() < 0)
{
......
CSharp/Test/UNetTest/UNetTest.csproj
浏览文件 @ 250ea7fa
......@@ -21,6 +21,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或