Fix bug

src/CircularBuffer.h

@@ -27,8 +27,7 @@ class  CircularBuffer
 
     ~CircularBuffer()
     {
-        delete []data_;
-        data_  = NULL;
+        TINY_DELETE( data_ );
         begin_ = 0;
         end_   = 0;
         count_ = 0;

src/Connection.cc

@@ -18,8 +18,7 @@ Connection::Connection( int fd, EventLoop* loop, struct sockaddr_in& addr  ): IC
 
 Connection::~Connection()
 {
-
-
+    close();
 }
 
 void Connection::send( char* data, int len )
@@ -67,7 +66,7 @@ void Connection::close()
 {
     if( state_ == CS_Connecing || state_ == CS_Connected ){
         state_ = CS_DisConnecting;
-            onClose();
+        onClose();
     }
 }
 
@@ -130,6 +129,7 @@ int  Connection::onConnFinish()
 int Connection::onConnDestory()
 {
     if( state_ == CS_Connected ){
+
         state_ = CS_DisConnected;
         ev_.stop();
     }

src/EventEpoll.cc

@@ -24,7 +24,6 @@ EventEpoll::EventEpoll( EventLoop* loop ): IPoller( loop ), epollfd_( -1 ),epoll
 
 EventEpoll::~EventEpoll()
 {
-
     close( epollfd_ );
 }
 

src/EventLoop.cc

@@ -10,20 +10,45 @@
 #include "ActiveEvent.h"
 #include "PendingEvent.h"
 
-EventLoop::EventLoop(): isRuning_( true ), curPid_(0), signalHelper_(this)
+EventLoop::EventLoop(): isRuning_( true ), curPid_(0),
+                        activeCnt_(0),ioBlockTime_(0),signalHelper_(this)
 {
     poller_ = getRecommendedPoller();
     curTime_ = tinyGetTime();
+    //占位
     timers_.push_back( NULL );
 }
 
 EventLoop::~EventLoop()
 {
+    isRuning_ = false;
+
     TINY_DELETE( poller_ );
+
+    PendingArr::iterator it = pendingEvents_.begin();
+    for( ; it != pendingEvents_.end(); ++it ){
+        delete *it;
+    }
     pendingEvents_.clear();
-    activeFdEvents_.clear();
+
+    {
+        ActiveFdArr::iterator it = activeFdEvents_.begin();
+        for( ; it!= activeFdEvents_.begin(); ++it ){
+            delete *it;
+        }
+        activeFdEvents_.clear();
+    }
+
     changeFds_.clear();
-    timers_.clear();
+
+    {
+        HeapVec::iterator it = timers_.begin();
+        for( ; it != timers_.end(); ++it ){
+            delete *it;
+        }
+        timers_.clear();
+    }
+
     rFeeds_.clear();
 }
 

src/EventLoop.h

@@ -63,8 +63,8 @@ public :
      tiny_forceinline   void updateTime( Timestamp maxBlockTime );
      tiny_noinline tiny_cold void timerReSchedule( Timestamp adjust );
      tiny_forceinline   void timersReify();
-private:
 
+private:
     typedef  std::vector<PendingEvent*>   PendingArr;
     PendingArr          pendingEvents_;
     bool                isRuning_;

src/IConnection.h

@@ -28,6 +28,7 @@ class IConnection: public nocopyable
         socketHelper_->close( sockfd_ );
         sockfd_ = -1;
         loop_   = NULL;
+
         delete socketHelper_;
         socketHelper_ =  NULL;
     }

src/TcpClient.cc

@@ -22,7 +22,7 @@ TcpClient::TcpClient( EventLoop*  loop, const char* ip, int port ): loop_(loop),
 TcpClient::~TcpClient()
 {
     TINY_DELETE( connector_ );
-    TINY_DELETE(conn_);
+    assert( NULL == conn_ );
 }
 
 void TcpClient::init()

src/TinyDefine.h

@@ -98,6 +98,8 @@ const static int kHeap0 = 1;
 extern Timestamp  tinyGetTime();
 extern void tinySleep( Timestamp t );
 extern void fdInteral( int fd );
+
+
 #endif