fix thread id type bug in arm 32

TarsCloud · Oct 12, 2023 · 469156e · 469156e
1 parent 04f433c
commit 469156e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 14 deletions.
diff --git a/unit-test/util/test_tc_epoller_server.cpp b/unit-test/util/test_tc_epoller_server.cpp
@@ -76,10 +76,11 @@ TEST_F(UtilEpollServerTest, RunUdp)
 
 		for (int i = 0; i < 10; i++)
 		{
-			iRet = client.sendRecv("abc", 3, recvBuffer, recvLenth);
+            string buff = "abc-" + TC_Common::tostr(i);
+			iRet = client.sendRecv(buff.c_str(), buff.size(), recvBuffer, recvLenth);
 
 			ASSERT_TRUE(iRet == 0);
-			ASSERT_TRUE(string(recvBuffer, recvLenth) == "abc");
+			ASSERT_TRUE(string(recvBuffer, recvLenth) == buff);
 		}
 
 		stopServer(server);

diff --git a/util/include/util/tc_epoll_server.h b/util/include/util/tc_epoll_server.h
@@ -1815,7 +1815,7 @@ class TC_EpollServer : public TC_HandleBase, public detail::LogInterface
         /**
          * net线程的id
          */
-        size_t                  _threadId;
+        uint64_t                _threadId;
 
         /**
          * 线程索引

diff --git a/util/include/util/tc_logger.h b/util/include/util/tc_logger.h
@@ -264,7 +264,7 @@ namespace tars
 		 * Stained thread ID collection
 		 *
 		 */
-		static unordered_map<size_t, string> _mapThreadID;
+		static unordered_map<uint64_t, string> _mapThreadID;
 	};
 
 	typedef TC_AutoPtr<TC_LoggerRoll> TC_LoggerRollPtr;
@@ -944,7 +944,7 @@ namespace tars
 
 			if (hasFlag(TC_Logger::HAS_PID))
 			{
-				n += snprintf(c + n, len - n, "%zd%s", TC_Thread::CURRENT_THREADID(), _sSepar.c_str());               
+				n += snprintf(c + n, len - n, "%lld%s", TC_Thread::CURRENT_THREADID(), _sSepar.c_str());
 			}
 
 			if (hasFlag(TC_Logger::HAS_LEVEL))

diff --git a/util/include/util/tc_thread.h b/util/include/util/tc_thread.h
@@ -206,7 +206,8 @@ class TC_Thread : public TC_Runable
 	 *
 	 * @return 
 	 */
-    static size_t CURRENT_THREADID();
+    static uint64_t CURRENT_THREADID();
+
 protected:
 
 	/**

diff --git a/util/src/tc_epoll_server.cpp b/util/src/tc_epoll_server.cpp
@@ -120,7 +120,6 @@ void TC_EpollServer::DataBuffer::insertRecvQueue(const deque<shared_ptr<RecvCont
 
 	_iRecvBufferSize += recv.size();
 
-
     if(_epollServer->getOpenCoroutine() == TC_EpollServer::NET_THREAD_MERGE_HANDLES_THREAD || _epollServer->getOpenCoroutine() == TC_EpollServer::NET_THREAD_MERGE_HANDLES_CO)
     {
         //协程模式本身也是队列模式
@@ -752,6 +751,8 @@ void TC_EpollServer::Connection::onRequestCallback(TC_Transceiver *trans)
 	{
 		auto it = _messages.begin();
 
+//        LOG_CONSOLE_DEBUG << string((*it)->buffer()->buffer(), (*it)->buffer()->length()) << ", message:" << _messages.size() << endl;
+
 		TC_Transceiver::ReturnStatus iRet = _trans->sendRequest((*it)->buffer(), (*it)->getRecvContext()->addr());
 
 		if (iRet == TC_Transceiver::eRetError)
@@ -978,6 +979,8 @@ int TC_EpollServer::Connection::sendBuffer()
 	//计算还有多少数据没有发送出去
 	size_t lastLeftBufferSize = _messageSize + sendBuffer.getBufferLength();
 
+//    LOG_CONSOLE_DEBUG << "buff size:" << sendBuffer.getBufferLength() << ", " << sendBuffer.getBuffersString() << endl;
+
 	_trans->doRequest();
 
 	//需要关闭链接
@@ -1000,7 +1003,9 @@ int TC_EpollServer::Connection::send(const shared_ptr<SendContext> &sc)
 	//队列不为空, 直接进队列
 	const shared_ptr<TC_NetWorkBuffer::Buffer>& buff = sc->buffer();
 
-	if(_messages.empty())
+//    LOG_CONSOLE_DEBUG << string(buff->buffer(), buff->length()) << ", message:" << _messages.size() << endl;
+
+    if(_messages.empty())
 	{
 		_trans->sendRequest(buff, sc->getRecvContext()->addr());
 	}
@@ -1014,11 +1019,13 @@ int TC_EpollServer::Connection::send(const shared_ptr<SendContext> &sc)
 	//数据没有发送完
 	if(!buff->empty())
 	{
-		_messageSize += sc->buffer()->length();
+		_messageSize += buff->length();
 
 		_messages.push_back(sc);
 	}
-
+
+//    LOG_CONSOLE_DEBUG << "buff size:" << buff->length() << ", message:" << _messages.size()  << endl;
+
     auto cl = _connList.lock();
 	if(cl)
 	{

diff --git a/util/src/tc_logger.cpp b/util/src/tc_logger.cpp
@@ -33,7 +33,7 @@ static int __global_logger_debug_init__ = init_global_debug_log();
 
 bool TC_LoggerRoll::_bDyeingFlag = false;
 TC_SpinLock TC_LoggerRoll::_mutexDyeing;
-unordered_map<size_t, string>  TC_LoggerRoll::_mapThreadID;
+unordered_map<uint64_t, string>  TC_LoggerRoll::_mapThreadID;
 
 const string LogByDay::FORMAT = "%Y%m%d";
 const string LogByHour::FORMAT = "%Y%m%d%H";

diff --git a/util/src/tc_thread.cpp b/util/src/tc_thread.cpp
@@ -249,14 +249,14 @@ bool TC_Thread::isAlive() const
     return _running;
 }
 
-size_t TC_Thread::CURRENT_THREADID()
+    uint64_t TC_Thread::CURRENT_THREADID()
 {
-    static thread_local size_t threadId = 0;
+    static thread_local uint64_t threadId = 0;
     if(threadId == 0 )
     {
         std::stringstream ss;
         ss << std::this_thread::get_id();
-        threadId = strtol(ss.str().c_str(), NULL, 0);
+        threadId = TC_Common::strto<uint64_t>(ss.str().c_str());
     }
     return threadId;
 }

diff --git a/util/src/tc_transceiver.cpp b/util/src/tc_transceiver.cpp
@@ -662,6 +662,8 @@ void TC_Transceiver::doRequest()
 		auto data = _sendBuffer.getBufferPointer();
 		assert(data.first != NULL && data.second != 0);
 
+//        LOG_CONSOLE_DEBUG << "doRequest buff :" << string(data.first, (uint32_t)data.second) << endl;
+
 		int iRet = this->send(data.first, (uint32_t)data.second, 0);
 
 		if (iRet <= 0)