Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
f628ffb0
Commit
f628ffb0
authored
Jun 24, 2016
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Сделал sm-ready-timeout 60 сек (вместо 15-ти).
parent
0e911ee6
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
8 deletions
+8
-8
IOControl.cc
extensions/IOControl/IOControl.cc
+1
-1
MBExchange.cc
extensions/ModbusMaster/MBExchange.cc
+1
-1
MBSlave.cc
extensions/ModbusSlave/MBSlave.cc
+1
-1
SMDBServer.cc
extensions/SMDBServer/SMDBServer.cc
+1
-1
UNetExchange.cc
extensions/UNetUDP/UNetExchange.cc
+1
-1
UniExchange.cc
extensions/UniNetwork/UniExchange.cc
+1
-1
sm_perf_test.cc
extensions/tests/sm_perf_test.cc
+1
-1
IOController.cc
src/Processes/IOController.cc
+1
-1
No files found.
extensions/IOControl/IOControl.cc
View file @
f628ffb0
...
...
@@ -240,7 +240,7 @@ IOControl::IOControl(UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
int
sm_tout
=
conf
->
getArgInt
(
"--"
+
prefix
+
"-sm-ready-timeout"
,
it
.
getProp
(
"ready_timeout"
));
if
(
sm_tout
==
0
)
smReadyTimeout
=
3
0000
;
smReadyTimeout
=
6
0000
;
else
if
(
sm_tout
<
0
)
smReadyTimeout
=
UniSetTimer
::
WaitUpTime
;
else
...
...
extensions/ModbusMaster/MBExchange.cc
View file @
f628ffb0
...
...
@@ -285,7 +285,7 @@ void MBExchange::waitSMReady()
{
// waiting for SM is ready...
int
tout
=
uniset_conf
()
->
getArgInt
(
"--"
+
prefix
+
"-sm-ready-timeout"
,
"15000"
);
timeout_t
ready_timeout
=
15
000
;
timeout_t
ready_timeout
=
60
000
;
if
(
tout
>
0
)
ready_timeout
=
tout
;
...
...
extensions/ModbusSlave/MBSlave.cc
View file @
f628ffb0
...
...
@@ -511,7 +511,7 @@ void MBSlave::waitSMReady()
{
// waiting for SM is ready...
int
tout
=
uniset_conf
()
->
getArgInt
(
"--"
+
prefix
+
"-sm-ready-timeout"
,
"15000"
);
timeout_t
ready_timeout
=
15
000
;
timeout_t
ready_timeout
=
60
000
;
if
(
tout
>
0
)
ready_timeout
=
tout
;
...
...
extensions/SMDBServer/SMDBServer.cc
View file @
f628ffb0
...
...
@@ -103,7 +103,7 @@ void SMDBServer::waitSMReady()
int
ready_timeout
=
conf
->
getArgInt
(
"--"
+
prefix
+
"-sm-ready-timeout"
,
"15000"
);
if
(
ready_timeout
==
0
)
ready_timeout
=
15
000
;
ready_timeout
=
60
000
;
else
if
(
ready_timeout
<
0
)
ready_timeout
=
UniSetTimer
::
WaitUpTime
;
...
...
extensions/UNetUDP/UNetExchange.cc
View file @
f628ffb0
...
...
@@ -461,7 +461,7 @@ void UNetExchange::waitSMReady()
// waiting for SM is ready...
int
tout
=
uniset_conf
()
->
getArgInt
(
"--unet-sm-ready-timeout"
,
"15000"
);
timeout_t
ready_timeout
=
15
000
;
timeout_t
ready_timeout
=
60
000
;
if
(
tout
>
0
)
ready_timeout
=
tout
;
...
...
extensions/UniNetwork/UniExchange.cc
View file @
f628ffb0
...
...
@@ -76,7 +76,7 @@ UniExchange::UniExchange(UniSetTypes::ObjectId id, UniSetTypes::ObjectId shmID,
int
sm_tout
=
conf
->
getArgInt
(
"--io-sm-ready-timeout"
,
it
.
getProp
(
"ready_timeout"
));
if
(
sm_tout
==
0
)
smReadyTimeout
=
15
000
;
smReadyTimeout
=
60
000
;
else
if
(
sm_tout
<
0
)
smReadyTimeout
=
UniSetTimer
::
WaitUpTime
;
else
...
...
extensions/tests/sm_perf_test.cc
View file @
f628ffb0
...
...
@@ -110,7 +110,7 @@ int main(int argc, char* argv[] )
std
::
chrono
::
time_point
<
std
::
chrono
::
system_clock
>
start
,
end
;
start
=
std
::
chrono
::
system_clock
::
now
();
run_test
(
8
,
1000000
,
shm
);
run_test
(
std
::
thread
::
hardware_concurrency
()
,
1000000
,
shm
);
end
=
std
::
chrono
::
system_clock
::
now
();
int
elapsed_seconds
=
std
::
chrono
::
duration_cast
<
std
::
chrono
::
milliseconds
>
(
end
-
start
).
count
();
...
...
src/Processes/IOController.cc
View file @
f628ffb0
...
...
@@ -448,7 +448,7 @@ void IOController::logging( UniSetTypes::SensorMessage& sm )
return
;
sm
.
consumer
=
dbID
;
TransportMessage
tm
(
s
m
.
transport_msg
(
));
TransportMessage
tm
(
s
td
::
move
(
sm
.
transport_msg
()
));
ui
->
send
(
sm
.
consumer
,
std
::
move
(
tm
)
);
isPingDBServer
=
true
;
}
...
...
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