From 5f00bbf08c652db6585574a120ce9f2aece105d1 Mon Sep 17 00:00:00 2001
From: Bigtan <bigtan@live.com>
Date: Fri, 21 Oct 2016 15:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=9E=90=E6=9E=84=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

简化析构函数
---
 vn.ib/vnib/vnib/vnib.h | 57 ++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/vn.ib/vnib/vnib/vnib.h b/vn.ib/vnib/vnib/vnib.h
index f316d9eb..c3283e2b 100644
--- a/vn.ib/vnib/vnib/vnib.h
+++ b/vn.ib/vnib/vnib/vnib.h
@@ -1,21 +1,21 @@
-//˵������
+//说明部分
 
-//ϵͳ
+//系统
 #include "StdAfx.h"
 #include <string>
 
 //Boost
 #define BOOST_PYTHON_STATIC_LIB
-#include <boost/python/module.hpp>	//python��װ
-#include <boost/python/def.hpp>		//python��װ
-#include <boost/python/object.hpp>	//python��װ
+#include <boost/python/module.hpp>	//python封装
+#include <boost/python/def.hpp>		//python封装
+#include <boost/python/object.hpp>	//python封装
 
-#include <boost/python/register_ptr_to_python.hpp>					//Python��װ
-#include <boost/python/suite/indexing/vector_indexing_suite.hpp>	//Python��װ
+#include <boost/python/register_ptr_to_python.hpp>					//Python封装
+#include <boost/python/suite/indexing/vector_indexing_suite.hpp>	//Python封装
 
-#include <boost/python.hpp>			//python��װ
-#include <boost/thread.hpp>			//������е��̹߳���
-#include <boost/bind.hpp>			//������е��̹߳���
+#include <boost/python.hpp>			//python封装
+#include <boost/thread.hpp>			//任务队列的线程功能
+#include <boost/bind.hpp>			//任务队列的线程功能
 
 #include <boost/shared_ptr.hpp>
 
@@ -25,31 +25,31 @@
 #include "EClientSocket.h"
 #include "EReader.h"
 
-//�����ռ�
+//命名空间
 using namespace std;
 using namespace boost::python;
 using namespace boost;
 
 
 ///-------------------------------------------------------------------------------------
-///API�еIJ������
+///API中的部分组件
 ///-------------------------------------------------------------------------------------
 
-//GILȫ�����򻯻�ȡ�ã�
-//���ڰ���C++�̻߳��GIL�����Ӷ���ֹpython����
+//GIL全局锁简化获取用，
+//用于帮助C++线程获得GIL锁，从而防止python崩溃
 class PyLock
 {
 private:
 	PyGILState_STATE gil_state;
 
 public:
-	//��ij�����������д����ö���ʱ�����GIL��
+	//在某个函数方法中创建该对象时，获得GIL锁
 	PyLock()
 	{
 		gil_state = PyGILState_Ensure();
 	};
 
-	//��ij��������ɺ����ٸö���ʱ�����GIL��
+	//在某个函数完成后销毁该对象时，解放GIL锁
 	~PyLock()
 	{
 		PyGILState_Release(gil_state);
@@ -58,7 +58,7 @@ public:
 
 
 ///-------------------------------------------------------------------------------------
-///ǿ��ת�����
+///强制转化相关
 ///-------------------------------------------------------------------------------------
 
 boost::python::list tagvaluelist_to_pylist();
@@ -66,7 +66,7 @@ boost::python::list tagvaluelist_to_pylist();
 TagValueListSPtr pylist_to_tagvaluelist();
 
 ///-------------------------------------------------------------------------------------
-///������
+///声明类
 ///-------------------------------------------------------------------------------------
 
 class VnIbApi;
@@ -74,7 +74,7 @@ class VnIbApi;
 class IbWrapper;
 
 ///-------------------------------------------------------------------------------------
-///C++ SPI�Ļص���������ʵ��
+///C++ SPI的回调函数方法实现
 ///-------------------------------------------------------------------------------------
 
 class IbWrapper : public EWrapper
@@ -223,7 +223,7 @@ public:
 
 
 ///-------------------------------------------------------------------------------------
-///��װ���API��
+///封装后的API类
 ///-------------------------------------------------------------------------------------
 
 class VnIbApi
@@ -248,24 +248,17 @@ public:
 
 	~VnIbApi()
 	{
-		if (this->client)
-		{
-			delete this->client;
-		}
-
-		if (this->wrapper)
-		{
-			delete this->wrapper;
-		}
+		delete this->client;
+		delete this->wrapper;
 	};
 
 	//-------------------------------------------------------------------------------------
-	//�������checkMessages���̹߳�������
+	//负责调用checkMessages的线程工作函数
 	//-------------------------------------------------------------------------------------
 	void run();
 
 	//-------------------------------------------------------------------------------------
-	//�ص�����
+	//回调函数
 	//-------------------------------------------------------------------------------------
 
 	virtual void nextValidId(OrderId orderId){};
@@ -408,7 +401,7 @@ public:
 	*/
 
 	//-------------------------------------------------------------------------------------
-	//��������
+	//主动函数
 	//-------------------------------------------------------------------------------------
 
 	bool eConnect(string host, int port, int clientId, bool extraAuth);