Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
JDChain
Bftsmart
提交
b76ab0d1
B
Bftsmart
项目概览
JDChain
/
Bftsmart
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
B
Bftsmart
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
b76ab0d1
编写于
1月 22, 2019
作者:
J
João Sousa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tweeks
上级
9da01359
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
12 deletion
+19
-12
bin/BFT-SMaRt.jar
bin/BFT-SMaRt.jar
+0
-0
src/bftsmart/clientsmanagement/ClientsManager.java
src/bftsmart/clientsmanagement/ClientsManager.java
+18
-8
src/bftsmart/tom/core/TOMLayer.java
src/bftsmart/tom/core/TOMLayer.java
+1
-4
未找到文件。
bin/BFT-SMaRt.jar
浏览文件 @
b76ab0d1
无法预览此类型文件
src/bftsmart/clientsmanagement/ClientsManager.java
浏览文件 @
b76ab0d1
...
@@ -32,6 +32,7 @@ import bftsmart.tom.server.RequestVerifier;
...
@@ -32,6 +32,7 @@ import bftsmart.tom.server.RequestVerifier;
import
bftsmart.tom.util.TOMUtil
;
import
bftsmart.tom.util.TOMUtil
;
import
java.nio.ByteBuffer
;
import
java.nio.ByteBuffer
;
import
java.util.concurrent.LinkedBlockingQueue
;
import
java.util.concurrent.LinkedBlockingQueue
;
import
java.util.concurrent.TimeUnit
;
import
java.util.logging.Level
;
import
java.util.logging.Level
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -44,6 +45,7 @@ public class ClientsManager {
...
@@ -44,6 +45,7 @@ public class ClientsManager {
private
Logger
logger
=
LoggerFactory
.
getLogger
(
this
.
getClass
());
private
Logger
logger
=
LoggerFactory
.
getLogger
(
this
.
getClass
());
private
boolean
doWork
=
true
;
private
ServerViewController
controller
;
private
ServerViewController
controller
;
private
RequestsTimer
timer
;
private
RequestsTimer
timer
;
private
HashMap
<
Integer
,
ClientData
>
clientsData
=
new
HashMap
<
Integer
,
ClientData
>();
private
HashMap
<
Integer
,
ClientData
>
clientsData
=
new
HashMap
<
Integer
,
ClientData
>();
...
@@ -73,13 +75,15 @@ public class ClientsManager {
...
@@ -73,13 +75,15 @@ public class ClientsManager {
public
void
run
()
{
public
void
run
()
{
while
(
true
)
{
while
(
doWork
)
{
try
{
try
{
TOMMessage
request
=
ackQueue
.
take
();
TOMMessage
request
=
null
;
cs
.
send
(
new
int
[]{
request
.
getSender
()},
request
.
reply
);
request
=
ackQueue
.
poll
(
100
,
TimeUnit
.
MILLISECONDS
);
if
(
request
!=
null
)
cs
.
send
(
new
int
[]{
request
.
getSender
()},
request
.
reply
);
}
catch
(
InterruptedException
ex
)
{
}
catch
(
InterruptedException
ex
)
{
java
.
util
.
logging
.
Logger
.
getLogger
(
ClientsManager
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
logger
.
error
(
"Interrupted exception"
,
ex
);
}
}
}
}
}
}
...
@@ -479,10 +483,8 @@ public class ClientsManager {
...
@@ -479,10 +483,8 @@ public class ClientsManager {
ackQueue
.
put
(
clone
);
ackQueue
.
put
(
clone
);
}
catch
(
InterruptedException
ex
)
{
}
catch
(
InterruptedException
|
CloneNotSupportedException
ex
)
{
java
.
util
.
logging
.
Logger
.
getLogger
(
ClientsManager
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
logger
.
error
(
"Error while sending ACK"
,
ex
);
}
catch
(
CloneNotSupportedException
ex
)
{
java
.
util
.
logging
.
Logger
.
getLogger
(
ClientsManager
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
}
}
request
.
ackSent
=
true
;
request
.
ackSent
=
true
;
...
@@ -544,4 +546,12 @@ public class ClientsManager {
...
@@ -544,4 +546,12 @@ public class ClientsManager {
return
clientsData
.
size
();
return
clientsData
.
size
();
}
}
public
void
shutdown
()
{
clear
();
getPendingRequests
().
clear
();
doWork
=
false
;
}
}
}
src/bftsmart/tom/core/TOMLayer.java
浏览文件 @
b76ab0d1
...
@@ -627,10 +627,7 @@ public final class TOMLayer extends Thread implements RequestReceiver {
...
@@ -627,10 +627,7 @@ public final class TOMLayer extends Thread implements RequestReceiver {
setNoExec
();
setNoExec
();
if
(
this
.
requestsTimer
!=
null
)
this
.
requestsTimer
.
shutdown
();
if
(
this
.
requestsTimer
!=
null
)
this
.
requestsTimer
.
shutdown
();
if
(
this
.
clientsManager
!=
null
)
{
if
(
this
.
clientsManager
!=
null
)
this
.
clientsManager
.
shutdown
();
this
.
clientsManager
.
clear
();
this
.
clientsManager
.
getPendingRequests
().
clear
();
}
if
(
this
.
dt
!=
null
)
this
.
dt
.
shutdown
();
if
(
this
.
dt
!=
null
)
this
.
dt
.
shutdown
();
if
(
this
.
communication
!=
null
)
this
.
communication
.
shutdown
();
if
(
this
.
communication
!=
null
)
this
.
communication
.
shutdown
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录