消息队列加入条件编译

wukan1986 · wukan1986 · commit 6ea5a466b6f1 · 2015-04-24T20:22:16.000+08:00
diff --git a/QuantBox_Queue/QuantBox_Queue.vcxproj b/QuantBox_Queue/QuantBox_Queue.vcxproj
@@ -94,7 +94,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>C:\Program Files\SmartQuant Ltd\OpenQuant 2014\XAPI\TongShi\x86</OutDir>
+    <OutDir>C:\Program Files\SmartQuant Ltd\OpenQuant 2014\XAPI\CTP\x86</OutDir>
     <TargetName>QuantBox_Queue_x86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -124,7 +124,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\include\ZeroMQ\libzmq\include;..\include\ZeroMQ\czmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -227,6 +227,7 @@
     <ClInclude Include="..\include\QueueHeader.h" />
     <ClInclude Include="..\include\QueueStruct.h" />
     <ClInclude Include="MsgQueue.h" />
+    <ClInclude Include="RemoteQueue.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
@@ -259,6 +260,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug64|Win32'">Use</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">Use</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="RemoteQueue.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
diff --git a/QuantBox_Queue/QuantBox_Queue.vcxproj.filters b/QuantBox_Queue/QuantBox_Queue.vcxproj.filters
@@ -45,6 +45,9 @@
     <ClInclude Include="..\include\QueueEnum.h">
       <Filter>include</Filter>
     </ClInclude>
+    <ClInclude Include="RemoteQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -59,5 +62,8 @@
     <ClCompile Include="MsgQueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="RemoteQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/QuantBox_Queue/RemoteQueue.cpp b/QuantBox_Queue/RemoteQueue.cpp
@@ -4,10 +4,12 @@
 
 CRemoteQueue::CRemoteQueue(char* address) :CMsgQueue()
 {
-	m_ctx = nullptr;
 	m_pubisher = nullptr;
 
 	strncpy(m_Address, address, sizeof(m_Address));
+#ifdef _REMOTE
+	m_ctx = nullptr;
+#endif
 }
 
 
@@ -18,9 +20,11 @@ CRemoteQueue::~CRemoteQueue()
 
 void CRemoteQueue::RunInThread()
 {
+#ifdef _REMOTE
 	m_ctx = zctx_new();
 	m_pubisher = zsocket_new(m_ctx, ZMQ_PUB);
 	int port = zsocket_bind(m_pubisher, m_Address);
+#endif
 
 	while (m_bRunning)
 	{
@@ -39,24 +43,26 @@ void CRemoteQueue::RunInThread()
 		}
 	}
 
+#ifdef _REMOTE
 	if (m_ctx)
 	{
 		zctx_destroy(&m_ctx);
 		m_ctx = nullptr;
 	}
-
+#endif
 	// �����߳�
 	m_hThread = nullptr;
 	m_bRunning = false;
 }
 
 void CRemoteQueue::Output(ResponeItem* pItem)
 {
+#ifdef _REMOTE
 	// ��������
 	if (pItem->ptr1 && pItem->size1>0)
 	{
 		int ret = zsocket_sendmem(m_pubisher, pItem->ptr1, pItem->size1, ZFRAME_DONTWAIT);
 	}
-	
+#endif	
 	return;
 }
diff --git a/QuantBox_Queue/RemoteQueue.h b/QuantBox_Queue/RemoteQueue.h
@@ -2,8 +2,10 @@
 #include "MsgQueue.h"
 
 // ��Ҫ��zmq��czmq��Ŀ¼��Additional Include Directories������
+#ifdef _REMOTE
 #include "zmq.h"
 #include "czmq.h"
+#endif
 
 #ifdef _WIN64
 #else
@@ -22,9 +24,12 @@ class DLL_PUBLIC CRemoteQueue :
 	virtual void Output(ResponeItem* pItem);
 
 private:
-	zctx_t*		m_ctx;
+
 	void*		m_pubisher;
 
 	char		m_Address[1024];
+#ifdef _REMOTE
+	zctx_t*		m_ctx;
+#endif
 };
 

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,12 @@`
`4`	`4`
`5`	`5`	`CRemoteQueue::CRemoteQueue(char* address) :CMsgQueue()`
`6`	`6`	`{`
`7`		`- m_ctx = nullptr;`
`8`	`7`	`m_pubisher = nullptr;`
`9`	`8`
`10`	`9`	`strncpy(m_Address, address, sizeof(m_Address));`
	`10`	`+#ifdef _REMOTE`
	`11`	`+ m_ctx = nullptr;`
	`12`	`+#endif`
`11`	`13`	`}`
`12`	`14`
`13`	`15`
`@@ -18,9 +20,11 @@ CRemoteQueue::~CRemoteQueue()`
`18`	`20`
`19`	`21`	`void CRemoteQueue::RunInThread()`
`20`	`22`	`{`
	`23`	`+#ifdef _REMOTE`
`21`	`24`	`m_ctx = zctx_new();`
`22`	`25`	`m_pubisher = zsocket_new(m_ctx, ZMQ_PUB);`
`23`	`26`	`int port = zsocket_bind(m_pubisher, m_Address);`
	`27`	`+#endif`
`24`	`28`
`25`	`29`	`while (m_bRunning)`
`26`	`30`	`{`
`@@ -39,24 +43,26 @@ void CRemoteQueue::RunInThread()`
`39`	`43`	`}`
`40`	`44`	`}`
`41`	`45`
	`46`	`+#ifdef _REMOTE`
`42`	`47`	`if (m_ctx)`
`43`	`48`	`{`
`44`	`49`	`zctx_destroy(&m_ctx);`
`45`	`50`	`m_ctx = nullptr;`
`46`	`51`	`}`
`47`		`-`
	`52`	`+#endif`
`48`	`53`	`// 清理线程`
`49`	`54`	`m_hThread = nullptr;`
`50`	`55`	`m_bRunning = false;`
`51`	`56`	`}`
`52`	`57`
`53`	`58`	`void CRemoteQueue::Output(ResponeItem* pItem)`
`54`	`59`	`{`
	`60`	`+#ifdef _REMOTE`
`55`	`61`	`// 发送数据`
`56`	`62`	`if (pItem->ptr1 && pItem->size1>0)`
`57`	`63`	`{`
`58`	`64`	`int ret = zsocket_sendmem(m_pubisher, pItem->ptr1, pItem->size1, ZFRAME_DONTWAIT);`
`59`	`65`	`}`
`60`		`-`
	`66`	`+#endif`
`61`	`67`	`return;`
`62`	`68`	`}`