Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
k-sdk
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈伟灿
k-sdk
Commits
15e812ee
Commit
15e812ee
authored
Sep 18, 2020
by
chen.weican
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改内容】修改启动后误报offline的bug
【提交人】陈伟灿
parent
c60ccdf7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
131 additions
and
129 deletions
+131
-129
midware/midware/dm/kk_dm_heartbeat.c
midware/midware/dm/kk_dm_heartbeat.c
+128
-126
midware/midware/midware.c
midware/midware/midware.c
+3
-3
No files found.
midware/midware/dm/kk_dm_heartbeat.c
View file @
15e812ee
...
...
@@ -82,6 +82,7 @@ static void _kk_heartbeat_unlock(void)
HAL_MutexUnlock
(
ctx
->
mutex
);
}
}
uint64_t
s_start_time
=
0
;
void
*
kk_heartbeat_yield
(
void
*
args
)
{
...
...
@@ -89,7 +90,7 @@ void *kk_heartbeat_yield(void *args)
uint64_t
current_time
=
0
;
dm_mgr_dev_node_t
*
search_node
=
NULL
;
while
(
ctx
->
hearbeat_thread_running
)
{
current_time
=
HAL_UptimeMs
()
;
current_time
=
HAL_UptimeMs
()
-
s_start_time
;
_kk_heartbeat_lock
();
dm_mgr_check_heartbeat_timeout
(
current_time
);
_kk_heartbeat_unlock
();
...
...
@@ -109,6 +110,7 @@ int kk_heartbeat_init(void)
}
/* Init Device Id*/
ctx
->
hearbeat_thread_running
=
1
;
s_start_time
=
HAL_UptimeMs
();
res
=
pthread_create
(
&
ctx
->
hearbeat_thread
,
NULL
,
kk_heartbeat_yield
,
NULL
);
if
(
res
<
0
)
{
...
...
midware/midware/midware.c
View file @
15e812ee
...
...
@@ -158,7 +158,7 @@ void gw2mid_cb(void* data, int len, char* chalMark){
}
}
extern
uint64_t
s_start_time
;
void
kk_platMsg_handle
(
void
*
data
,
char
*
chalMark
){
char
*
out
;
...
...
@@ -197,10 +197,10 @@ void kk_platMsg_handle(void* data, char* chalMark){
}
if
(
chalMark
!=
NULL
){
dm_mgr_update_timestamp_by_devicecode
(
chalMark
,
HAL_UptimeMs
());
dm_mgr_update_timestamp_by_devicecode
(
chalMark
,
HAL_UptimeMs
()
-
s_start_time
);
}
dm_mgr_update_timestamp_by_devicecode
(
info_dcode
->
valuestring
,
HAL_UptimeMs
());
dm_mgr_update_timestamp_by_devicecode
(
info_dcode
->
valuestring
,
HAL_UptimeMs
()
-
s_start_time
);
if
(
strcmp
(
msgType
->
valuestring
,
KK_THING_TOPO_ADD_MSG
)
==
0
){
proCode
=
cJSON_GetObjectItem
(
jsonPay
,
MSG_PRODUCT_CODE_STR
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment