Skip to content

Commit ab5c154

Browse files
caozhiyicaozhiyi
committed
add win test project.
1 parent 68a57ad commit ab5c154

8 files changed

+280
-50
lines changed

‎CppNet.sln

+13
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppNet", "CppNet.vcxproj", "{E98183C7-10C3-4B1A-B8FB-D60BB6217962}"
77
EndProject
88
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppNetSev", "CppNetSev\CppNetSev.vcxproj", "{6FE7E867-AD3A-4681-A0DA-2A5E0DB16887}"
9+
ProjectSection(ProjectDependencies) = postProject
10+
{E98183C7-10C3-4B1A-B8FB-D60BB6217962} = {E98183C7-10C3-4B1A-B8FB-D60BB6217962}
11+
EndProjectSection
12+
EndProject
13+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppNetCli", "CppNetCli\CppNetCli.vcxproj", "{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}"
914
EndProject
1015
Global
1116
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,6 +36,14 @@ Global
3136
{6FE7E867-AD3A-4681-A0DA-2A5E0DB16887}.Release|x64.Build.0 = Release|x64
3237
{6FE7E867-AD3A-4681-A0DA-2A5E0DB16887}.Release|x86.ActiveCfg = Release|Win32
3338
{6FE7E867-AD3A-4681-A0DA-2A5E0DB16887}.Release|x86.Build.0 = Release|Win32
39+
{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}.Debug|x64.ActiveCfg = Debug|x64
40+
{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}.Debug|x64.Build.0 = Debug|x64
41+
{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}.Debug|x86.ActiveCfg = Debug|Win32
42+
{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}.Debug|x86.Build.0 = Debug|Win32
43+
{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}.Release|x64.ActiveCfg = Release|x64
44+
{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}.Release|x64.Build.0 = Release|x64
45+
{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}.Release|x86.ActiveCfg = Release|Win32
46+
{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}.Release|x86.Build.0 = Release|Win32
3447
EndGlobalSection
3548
GlobalSection(SolutionProperties) = preSolution
3649
HideSolutionNode = FALSE

‎CppNet.vcxproj

+7-3
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,19 @@
123123
<ClCompile Include="base\LoopBuffer.cpp" />
124124
<ClCompile Include="base\MemaryPool.cpp" />
125125
<ClCompile Include="base\TimeTool.cpp" />
126+
<None Include="net\linux\SocketImpl.cpp" />
127+
<ClCompile Include="net\win\SocketImpl.cpp" />
126128
<None Include="net\linux\AcceptSocket.cpp" />
127129
<None Include="net\linux\CEpoll.cpp" />
128130
<None Include="net\linux\LinuxFunc.cpp" />
129-
<None Include="net\linux\Socket.cpp" />
130131
<None Include="net\linux\SocketBase.cpp" />
131132
<ClCompile Include="net\CppNet.cpp" />
132133
<ClCompile Include="net\CppNetImpl.cpp" />
133134
<ClCompile Include="net\OSInfo.cpp" />
135+
<ClCompile Include="net\Socket.cpp" />
134136
<ClCompile Include="net\Timer.cpp" />
135137
<ClCompile Include="net\win\AcceptSocket.cpp" />
136138
<ClCompile Include="net\win\IOCP.cpp" />
137-
<ClCompile Include="net\win\Socket.cpp" />
138139
<ClCompile Include="net\win\SocketBase.cpp" />
139140
</ItemGroup>
140141
<ItemGroup>
@@ -153,16 +154,19 @@
153154
<ClInclude Include="base\TaskQueue.h" />
154155
<ClInclude Include="base\TimeTool.h" />
155156
<ClInclude Include="base\TSQueue.h" />
157+
<ClInclude Include="include\CppDefine.h" />
156158
<ClInclude Include="include\CppNet.h" />
159+
<ClInclude Include="include\Socket.h" />
160+
<ClInclude Include="include\Type.h" />
157161
<ClInclude Include="net\AcceptSocket.h" />
158162
<ClInclude Include="net\EventActions.h" />
159163
<ClInclude Include="net\EventHandler.h" />
160164
<ClInclude Include="net\linux\CEpoll.h" />
161165
<ClInclude Include="net\linux\LinuxFunc.h" />
162166
<ClInclude Include="net\CppNetImpl.h" />
163167
<ClInclude Include="net\OSInfo.h" />
164-
<ClInclude Include="net\Socket.h" />
165168
<ClInclude Include="net\SocketBase.h" />
169+
<ClInclude Include="net\SocketImpl.h" />
166170
<ClInclude Include="net\Timer.h" />
167171
<ClInclude Include="net\win\IOCP.h" />
168172
<ClInclude Include="net\win\WinExpendFunc.h" />

‎CppNet.vcxproj.filters

+28-21
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
<ClCompile Include="net\win\IOCP.cpp">
4040
<Filter>net\win</Filter>
4141
</ClCompile>
42-
<ClCompile Include="net\win\Socket.cpp">
43-
<Filter>net\win</Filter>
44-
</ClCompile>
4542
<ClCompile Include="net\win\SocketBase.cpp">
4643
<Filter>net\win</Filter>
4744
</ClCompile>
@@ -51,21 +48,6 @@
5148
<ClCompile Include="net\OSInfo.cpp">
5249
<Filter>net</Filter>
5350
</ClCompile>
54-
<ClCompile Include="net\linux\AcceptSocket.cpp">
55-
<Filter>net\linux</Filter>
56-
</ClCompile>
57-
<ClCompile Include="net\linux\CEpoll.cpp">
58-
<Filter>net\linux</Filter>
59-
</ClCompile>
60-
<ClCompile Include="net\linux\Socket.cpp">
61-
<Filter>net\linux</Filter>
62-
</ClCompile>
63-
<ClCompile Include="net\linux\SocketBase.cpp">
64-
<Filter>net\linux</Filter>
65-
</ClCompile>
66-
<ClCompile Include="net\linux\LinuxFunc.cpp">
67-
<Filter>net\linux</Filter>
68-
</ClCompile>
6951
<ClCompile Include="base\Config.cpp">
7052
<Filter>base</Filter>
7153
</ClCompile>
@@ -75,6 +57,15 @@
7557
<ClCompile Include="net\CppNet.cpp">
7658
<Filter>net</Filter>
7759
</ClCompile>
60+
<ClCompile Include="net\Socket.cpp">
61+
<Filter>net</Filter>
62+
</ClCompile>
63+
<ClCompile Include="net\win\SocketImpl.cpp">
64+
<Filter>net\win</Filter>
65+
</ClCompile>
66+
<ClCompile Include="net\linux\SocketImpl.cpp">
67+
<Filter>net\linux</Filter>
68+
</ClCompile>
7869
</ItemGroup>
7970
<ItemGroup>
8071
<ClInclude Include="base\Buffer.h">
@@ -131,9 +122,6 @@
131122
<ClInclude Include="net\OSInfo.h">
132123
<Filter>net</Filter>
133124
</ClInclude>
134-
<ClInclude Include="net\Socket.h">
135-
<Filter>net</Filter>
136-
</ClInclude>
137125
<ClInclude Include="net\SocketBase.h">
138126
<Filter>net</Filter>
139127
</ClInclude>
@@ -161,5 +149,24 @@
161149
<ClInclude Include="include\CppNet.h">
162150
<Filter>include</Filter>
163151
</ClInclude>
152+
<ClInclude Include="include\CppDefine.h">
153+
<Filter>include</Filter>
154+
</ClInclude>
155+
<ClInclude Include="include\Socket.h">
156+
<Filter>include</Filter>
157+
</ClInclude>
158+
<ClInclude Include="include\Type.h">
159+
<Filter>include</Filter>
160+
</ClInclude>
161+
<ClInclude Include="net\SocketImpl.h">
162+
<Filter>net</Filter>
163+
</ClInclude>
164+
</ItemGroup>
165+
<ItemGroup>
166+
<None Include="net\linux\AcceptSocket.cpp" />
167+
<None Include="net\linux\CEpoll.cpp" />
168+
<None Include="net\linux\LinuxFunc.cpp" />
169+
<None Include="net\linux\Socket.cpp" />
170+
<None Include="net\linux\SocketBase.cpp" />
164171
</ItemGroup>
165172
</Project>

‎CppNetCli/CppNetCli.vcxproj

+133
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<VCProjectVersion>15.0</VCProjectVersion>
23+
<ProjectGuid>{8C4CE7D6-9C74-4FEC-BEFC-EC99EA8A0D0A}</ProjectGuid>
24+
<RootNamespace>CppNetCli</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
26+
</PropertyGroup>
27+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29+
<ConfigurationType>Application</ConfigurationType>
30+
<UseDebugLibraries>true</UseDebugLibraries>
31+
<PlatformToolset>v141</PlatformToolset>
32+
<CharacterSet>MultiByte</CharacterSet>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35+
<ConfigurationType>Application</ConfigurationType>
36+
<UseDebugLibraries>false</UseDebugLibraries>
37+
<PlatformToolset>v141</PlatformToolset>
38+
<WholeProgramOptimization>true</WholeProgramOptimization>
39+
<CharacterSet>MultiByte</CharacterSet>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42+
<ConfigurationType>Application</ConfigurationType>
43+
<UseDebugLibraries>true</UseDebugLibraries>
44+
<PlatformToolset>v141</PlatformToolset>
45+
<CharacterSet>MultiByte</CharacterSet>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48+
<ConfigurationType>Application</ConfigurationType>
49+
<UseDebugLibraries>false</UseDebugLibraries>
50+
<PlatformToolset>v141</PlatformToolset>
51+
<WholeProgramOptimization>true</WholeProgramOptimization>
52+
<CharacterSet>MultiByte</CharacterSet>
53+
</PropertyGroup>
54+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
55+
<ImportGroup Label="ExtensionSettings">
56+
</ImportGroup>
57+
<ImportGroup Label="Shared">
58+
</ImportGroup>
59+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
60+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61+
</ImportGroup>
62+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
63+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64+
</ImportGroup>
65+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
66+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67+
</ImportGroup>
68+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
69+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70+
</ImportGroup>
71+
<PropertyGroup Label="UserMacros" />
72+
<PropertyGroup />
73+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
74+
<ClCompile>
75+
<WarningLevel>Level3</WarningLevel>
76+
<Optimization>Disabled</Optimization>
77+
<SDLCheck>true</SDLCheck>
78+
<ConformanceMode>true</ConformanceMode>
79+
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)net;$(SolutionDir)base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
80+
</ClCompile>
81+
<Link>
82+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
83+
<AdditionalDependencies>CppNet.lib;%(AdditionalDependencies)</AdditionalDependencies>
84+
</Link>
85+
</ItemDefinitionGroup>
86+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
87+
<ClCompile>
88+
<WarningLevel>Level3</WarningLevel>
89+
<Optimization>Disabled</Optimization>
90+
<SDLCheck>true</SDLCheck>
91+
<ConformanceMode>true</ConformanceMode>
92+
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)net;$(SolutionDir)base;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
93+
</ClCompile>
94+
<Link>
95+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
96+
<AdditionalDependencies>CppNet.lib;%(AdditionalDependencies)</AdditionalDependencies>
97+
</Link>
98+
</ItemDefinitionGroup>
99+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
100+
<ClCompile>
101+
<WarningLevel>Level3</WarningLevel>
102+
<Optimization>MaxSpeed</Optimization>
103+
<FunctionLevelLinking>true</FunctionLevelLinking>
104+
<IntrinsicFunctions>true</IntrinsicFunctions>
105+
<SDLCheck>true</SDLCheck>
106+
<ConformanceMode>true</ConformanceMode>
107+
</ClCompile>
108+
<Link>
109+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
110+
<OptimizeReferences>true</OptimizeReferences>
111+
</Link>
112+
</ItemDefinitionGroup>
113+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
114+
<ClCompile>
115+
<WarningLevel>Level3</WarningLevel>
116+
<Optimization>MaxSpeed</Optimization>
117+
<FunctionLevelLinking>true</FunctionLevelLinking>
118+
<IntrinsicFunctions>true</IntrinsicFunctions>
119+
<SDLCheck>true</SDLCheck>
120+
<ConformanceMode>true</ConformanceMode>
121+
</ClCompile>
122+
<Link>
123+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
124+
<OptimizeReferences>true</OptimizeReferences>
125+
</Link>
126+
</ItemDefinitionGroup>
127+
<ItemGroup>
128+
<ClCompile Include="CppNetClient.cpp" />
129+
</ItemGroup>
130+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
131+
<ImportGroup Label="ExtensionTargets">
132+
</ImportGroup>
133+
</Project>

‎CppNetCli/CppNetCli.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ClCompile Include="CppNetClient.cpp" />
5+
</ItemGroup>
6+
</Project>

‎CppNetCli/CppNetCli.vcxproj.user

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

‎CppNetCli/CppNetClient.cpp

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#include <iostream>
2+
#include <string>
3+
#include "CppNet.h"
4+
#include "Runnable.h"
5+
using namespace cppnet;
6+
7+
int index = 0;
8+
std::string msg = "test msg => ";
9+
10+
std::string GetMsg() {
11+
index++;
12+
return (msg + std::to_string(index));
13+
}
14+
15+
void WriteFunc(const Handle& handle, uint32_t len, uint32_t error) {
16+
std::cout << "[WriteFunc] len :" << len << std::endl;
17+
}
18+
19+
void ReadFunc(const Handle& handle, base::CBuffer* data, uint32_t len, uint32_t error) {
20+
std::cout << "[ReadFunc]" << std::endl;
21+
std::cout << *(data) << std::endl;
22+
data->Clear();
23+
std::cout << "Thread ID : " << std::this_thread::get_id() << std::endl;
24+
std::cout << "Read size : " << len << std::endl << std::endl;
25+
base::CRunnable::Sleep(1000);
26+
if (error != EVENT_ERROR_CLOSED) {
27+
auto msg = GetMsg();
28+
SyncWrite(handle, msg.c_str(), msg.length());
29+
}
30+
SyncRead(handle);
31+
}
32+
33+
void ConnectFunc(const Handle& handle, uint32_t err) {
34+
std::cout << "[ConnectFunc]" << std::endl;
35+
auto msg = GetMsg();
36+
SyncWrite(handle, msg.c_str(), msg.length());
37+
SyncRead(handle);
38+
}
39+
40+
void DisConnectionFunc(const Handle& handle, uint32_t err) {
41+
std::cout << "[DisConnectionFunc]" << std::endl;
42+
}
43+
44+
int main() {
45+
46+
cppnet::Init(1, true);
47+
48+
cppnet::SetConnectionCallback(ConnectFunc);
49+
cppnet::SetWriteCallback(WriteFunc);
50+
cppnet::SetReadCallback(ReadFunc);
51+
cppnet::SetDisconnectionCallback(DisConnectionFunc);
52+
53+
auto msg = GetMsg();
54+
Connection(8921, "192.168.1.4", msg.c_str(), msg.length());
55+
56+
//net.MainLoop();
57+
//net.Dealloc();
58+
cppnet::Join();
59+
}

0 commit comments

Comments
 (0)