minor modify

linghunjiushu · Jun 29, 2018 · 60e033b · 60e033b
1 parent ddc5d84
commit 60e033b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/cpp/util/include/util/tc_lockfree_queue.h b/cpp/util/include/util/tc_lockfree_queue.h
@@ -112,13 +112,12 @@ class LockFreeQueue
 		{
 			bsuccess = __sync_bool_compare_and_swap(&(((Entry*)&(_head[1]))[pos].flag), FLAG_NULL, FLAG_SETTOOK);
 		}while(false == bsuccess);
-		
+
         ((Entry*)&(_head[1]))[pos].data = val;
+        __sync_synchronize();
 
 		((Entry*)&(_head[1]))[pos].flag = FLAG_SETED;
 
-        __sync_synchronize();
-
         return RT_OK;
     }
 
@@ -165,10 +164,10 @@ class LockFreeQueue
 		}while(false == bsuccess);
 
 		val = ((Entry*)&(_head[1]))[pos].data;
+        __sync_synchronize();
 
 		((Entry*)&(_head[1]))[pos].flag = FLAG_NULL;
 
-        __sync_synchronize();
         return RT_OK;
     }
 

diff --git a/cpp/util/src/tc_epoller.cpp b/cpp/util/src/tc_epoller.cpp
@@ -64,10 +64,7 @@ void TC_Epoller::create(int max_connections)
 
     _iEpollfd = epoll_create(_max_connections + 1);
 
-    if(_pevs != NULL)
-    {
-        delete[] _pevs;
-    }
+    delete[] _pevs;
 
     _pevs = new epoll_event[_max_connections + 1];
 }

diff --git a/cpp/util/src/tc_file.cpp b/cpp/util/src/tc_file.cpp
@@ -231,16 +231,23 @@ string TC_File::simplifyDirectory(const string& path)
 
 string TC_File::load2str(const string &sFullFileName)
 {
-    ifstream ifs(sFullFileName.c_str());
+    ifstream ifs(sFullFileName.c_str(), std::ios_base::binary);
+    if (ifs.bad())
+        return "";
 
-    return string(istreambuf_iterator<char>(ifs), istreambuf_iterator<char>());
+    std::string s((istreambuf_iterator<char>(ifs)), istreambuf_iterator<char>());
+    ifs.close();
+
+    return s;
 }
 
 void TC_File::load2str(const string &sFullFileName, vector<char> &buffer)
 {
     buffer.clear();
 
-    ifstream ifs(sFullFileName.c_str());
+    ifstream ifs(sFullFileName.c_str(), std::ios_base::binary);
+    if (ifs.bad())
+        return;
 
     buffer.insert(buffer.end(), istreambuf_iterator<char>(ifs), istreambuf_iterator<char>());
 }

diff --git a/cpp/util/src/tc_thread_pool.cpp b/cpp/util/src/tc_thread_pool.cpp
@@ -81,10 +81,7 @@ pthread_key_t TC_ThreadPool::g_key;
 void TC_ThreadPool::destructor(void *p)
 {
     ThreadData *ttd = (ThreadData*)p;
-    if(ttd)
-    {
-        delete ttd;
-    }
+    delete ttd;
 }
 
 void TC_ThreadPool::exit()