Skip to content

Commit 363cf28

Browse files
author
渡世白玉
committed
libev win下不启用
1 parent f413aa4 commit 363cf28

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Server/tcpsocket.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ TcpSocket::TcpSocket(qintptr socketDescriptor, QObject *parent) : //构造函数
1010
connect(this,&TcpSocket::readyRead,this,&TcpSocket::readData);
1111
dis = connect(this,&TcpSocket::disconnected,
1212
[&](){
13+
qDebug() << "disconnect" ;
1314
emit sockDisConnect(socketID,this->peerAddress().toString(),this->peerPort(),QThread::currentThread());//发送断开连接的用户信息
1415
this->deleteLater();
1516
});
@@ -47,13 +48,14 @@ void TcpSocket::disConTcp(int i)
4748

4849
void TcpSocket::readData()
4950
{
50-
datas.append(this->readAll());
51-
// auto data = handleData(this->readAll(),this->peerAddress().toString(),this->peerPort());
52-
// this->write(data);
53-
if (!watcher.isRunning())//放到异步线程中处理。
54-
{
55-
watcher.setFuture(QtConcurrent::run(this,&TcpSocket::handleData,datas.dequeue(),this->peerAddress().toString(),this->peerPort()));
56-
}
51+
// datas.append(this->readAll());
52+
auto data = handleData(this->readAll(),this->peerAddress().toString(),this->peerPort());
53+
qDebug() << data;
54+
this->write(data);
55+
// if (!watcher.isRunning())//放到异步线程中处理。
56+
// {
57+
// watcher.setFuture(QtConcurrent::run(this,&TcpSocket::handleData,datas.dequeue(),this->peerAddress().toString(),this->peerPort()));
58+
// }
5759
}
5860

5961
QByteArray TcpSocket::handleData(QByteArray data, const QString &ip, qint16 port)

Server/threadhandle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ThreadHandle
2222
static ThreadHandle & getClass(); //返回对象引用,是单例类
2323

2424
QThread * getThread(); //取出应该移入的线程
25-
void initThreadType(ThreadType type = HANDLESIZE,unsigned int max = 10);//初始化线程管理的方式
25+
void initThreadType(ThreadType type = HANDLESIZE,unsigned int max = 1000);//初始化线程管理的方式
2626
void removeThread(QThread *);//连接断开,线程计数减一
2727
void clear();//清空计数
2828

0 commit comments

Comments
 (0)