This commit is contained in:
beykery
2017-05-15 10:41:09 +08:00
parent 68b5aa3de2
commit cad513fba2
5 changed files with 5 additions and 14 deletions

View File

@@ -1,6 +1,7 @@
#ifndef MUTEX_H
#define MUTEX_H
#include <pthread.h>
#include <mutex>
class Mutext {
private:

View File

@@ -6,15 +6,6 @@
</data>
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/D:/work/git/cocosocket/cocosocket-client/ThreadPool.h</file>
<file>file:/D:/work/git/cocosocket/cocosocket-client/SocketListerner.cpp</file>
<file>file:/D:/work/git/cocosocket/cocosocket-client/SocketListerner.h</file>
<file>file:/D:/work/git/cocosocket/cocosocket-client/Socket.h</file>
<file>file:/D:/work/git/cocosocket/cocosocket-client/Socket.cpp</file>
<file>file:/D:/work/git/cocosocket/cocosocket-client/Thread.h</file>
<file>file:/D:/work/git/cocosocket/cocosocket-client/Thread.cpp</file>
<file>file:/D:/work/git/cocosocket/cocosocket-client/main.cpp</file>
</group>
<group/>
</open-files>
</project-private>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.beykery</groupId>
<artifactId>cocosocket</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -111,7 +111,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.4.Final</version>
<version>4.1.10.Final</version>
</dependency>
</dependencies>
</project>

View File

@@ -13,7 +13,6 @@ import io.netty.channel.ChannelPipeline;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.ServerChannel;
import io.netty.channel.epoll.Epoll;
import io.netty.channel.epoll.EpollChannelOption;
import io.netty.channel.epoll.EpollEventLoopGroup;
import io.netty.channel.epoll.EpollServerSocketChannel;
import io.netty.channel.local.LocalAddress;

View File

@@ -346,7 +346,7 @@ public class Kcp
rx_srtt = 1;
}
}
int rto = rx_srtt + Math.Max(1, 4 * rx_rttval);
int rto = rx_srtt + Math.Max(interval, 4 * rx_rttval);
rx_rto = _ibound_(rx_minrto, rto, IKCP_RTO_MAX);
}