Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
E
evsuits
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
OpsTeam
evsuits
Commits
883ef81f
提交
883ef81f
authored
9月 09, 2019
作者:
blu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
big refacting of communitation architect
上级
c5f22628
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
22 行增加
和
13 行删除
+22
-13
evdaemon.cpp
opencv-motion-detect/evdaemon.cpp
+22
-13
没有找到文件。
opencv-motion-detect/evdaemon.cpp
浏览文件 @
883ef81f
...
...
@@ -35,8 +35,10 @@ class EvDaemon{
int
portRouter
=
5549
;
thread
::
id
thIdMain
;
thread
thRouter
;
json
peerStatus
;
json
peerConfig
;
json
peerData
;
// peerData["status"];
// peerData["pids"];
// peerData["config"];
unordered_map
<
string
,
queue
<
vector
<
vector
<
uint8_t
>
>>
>
cachedMsg
;
mutex
cacheLock
;
queue
<
string
>
eventQue
;
...
...
@@ -72,13 +74,14 @@ class EvDaemon{
spdlog
::
info
(
"evdaemon {} got cloud config:
\n
{}"
,
devSn
,
jret
.
dump
(
4
));
json
&
data
=
jret
[
"data"
];
string
peerId
;
for
(
auto
&
[
k
,
v
]
:
data
.
items
())
{
if
(
k
==
this
->
devSn
)
{
// startup evmgr
string
peerId
=
v
[
"sn"
].
get
<
string
>
()
+
":evmgr:0"
;
peerId
=
v
[
"sn"
].
get
<
string
>
()
+
":evmgr:0"
;
// offline
this
->
peer
Status
[
peerId
]
=
0
;
this
->
peer
Config
[
peerId
]
=
v
;
this
->
peer
Data
[
"status"
]
[
peerId
]
=
0
;
this
->
peer
Data
[
"config"
]
[
peerId
]
=
v
;
pid_t
pid
;
if
(
(
pid
=
fork
())
==
-
1
)
{
spdlog
::
error
(
"evdamon {} failed to fork subsytem - evmgr"
,
this
->
devSn
);
...
...
@@ -94,6 +97,7 @@ class EvDaemon{
spdlog
::
error
(
"evdaemon {} failed to startup evmgr"
,
this
->
devSn
);
}
else
{
// parent
this
->
peerData
[
"pids"
][
peerId
]
=
pid
;
spdlog
::
info
(
"evdaemon {} created evmgr"
,
this
->
devSn
);
}
}
...
...
@@ -153,17 +157,17 @@ class EvDaemon{
return
-
1
;
}
if
(
peer
Status
.
count
(
selfId
)
==
0
)
{
spdlog
::
warn
(
"evdaemon {} unkown module with id: {}, peerStats {}"
,
devSn
,
selfId
,
peer
Status
.
dump
(
4
));
if
(
peer
Data
[
"status"
]
.
count
(
selfId
)
==
0
)
{
spdlog
::
warn
(
"evdaemon {} unkown module with id: {}, peerStats {}"
,
devSn
,
selfId
,
peer
Data
[
"status"
]
.
dump
(
4
));
return
-
1
;
}
if
(
peer
Status
[
selfId
]
==
0
)
{
peer
Status
[
selfId
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
if
(
peer
Data
[
"status"
]
[
selfId
]
==
0
)
{
peer
Data
[
"status"
]
[
selfId
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
spdlog
::
info
(
"evdaemon {} peer connected: {}"
,
devSn
,
selfId
);
eventConn
=
true
;
spdlog
::
debug
(
"evdaemon {} update status of {} to 1 and send config"
,
devSn
,
selfId
);
string
cfg
=
peer
Config
[
selfId
].
dump
();
string
cfg
=
peer
Data
[
"config"
]
[
selfId
].
dump
();
json
j
;
j
[
"type"
]
=
EV_MSG_META_CONFIG
;
string
meta
=
j
.
dump
();
...
...
@@ -171,7 +175,7 @@ class EvDaemon{
z_send_multiple
(
pRouter
,
v
);
}
else
{
peer
Status
[
selfId
]
=
0
;
peer
Data
[
"status"
]
[
selfId
]
=
0
;
spdlog
::
warn
(
"evdaemon {} peer disconnected: {}"
,
devSn
,
selfId
);
}
...
...
@@ -209,14 +213,14 @@ class EvDaemon{
selfId
=
body2str
(
body
[
0
]);
peerId
=
body2str
(
body
[
1
]);
// update status;
this
->
peer
Status
[
selfId
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
this
->
peer
Data
[
"status"
]
[
selfId
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
// msg to peer
if
(
memcmp
((
void
*
)(
body
[
1
].
data
()),
(
devSn
+
":0:0"
).
data
(),
body
[
1
].
size
())
!=
0
)
{
// message to other peer
// check peer status
vector
<
vector
<
uint8_t
>
>
v
=
{
body
[
1
],
body
[
0
],
body
[
2
],
body
[
3
]};
if
(
peer
Status
.
count
(
peerId
)
!=
0
&&
peerStatus
[
peerId
]
!=
0
)
{
if
(
peer
Data
[
"status"
].
count
(
peerId
)
!=
0
&&
peerData
[
"status"
]
[
peerId
]
!=
0
)
{
spdlog
::
info
(
"evdaemon {} route msg from {} to {}"
,
devSn
,
selfId
,
peerId
);
ret
=
z_send_multiple
(
pRouter
,
v
);
if
(
ret
<
0
)
{
...
...
@@ -378,6 +382,11 @@ class EvDaemon{
}
});
thRouter
.
detach
();
//
/// peerId -> value
peerData
[
"status"
]
=
json
();
peerData
[
"pids"
]
=
json
();
peerData
[
"config"
]
=
json
();
};
~
EvDaemon
(){};
};
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论