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
766fe809
Commit
766fe809
authored
Mar 26, 2011
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Прошёлся по всем утилитам и откорректировал возвращаемые значения
при завершение, для корректного использования в скриптах на bash.
parent
590c0bdc
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
45 additions
and
23 deletions
+45
-23
main.cc
Utilities/InfoServer/main.cc
+3
-1
main.cc
Utilities/NullController/main.cc
+2
-1
smonitor.cc
Utilities/SMonit/smonitor.cc
+2
-1
main.cc
Utilities/SViewer-text/main.cc
+3
-1
libuniset.spec
conf/libuniset.spec
+4
-1
iocalibr.cc
extensions/IOControl/iocalibr.cc
+1
-2
iocontrol.cc
extensions/IOControl/iocontrol.cc
+2
-1
logicproc.cc
extensions/LogicProcessor/logicproc.cc
+2
-1
plogicproc.cc
extensions/LogicProcessor/plogicproc.cc
+2
-2
main.cc
extensions/MBTCPMaster/main.cc
+2
-1
mbslave.cc
extensions/ModbusSlave/mbslave.cc
+2
-2
mtr-setup.cc
extensions/RTUExchange/mtr-setup.cc
+2
-1
mtrconv.cc
extensions/RTUExchange/mtrconv.cc
+1
-0
rtuexchange.cc
extensions/RTUExchange/rtuexchange.cc
+2
-1
rtustate.cc
extensions/RTUExchange/rtustate.cc
+3
-1
main.cc
extensions/SMDBServer/main.cc
+2
-1
main.cc
extensions/SMViewer/main.cc
+2
-1
udpexchange.cc
extensions/UDPExchange/udpexchange.cc
+2
-1
udpreceiver.cc
extensions/UDPExchange/udpreceiver.cc
+2
-1
udpsender.cc
extensions/UDPExchange/udpsender.cc
+2
-1
unetexchange.cc
extensions/UDPExchange/unetexchange.cc
+2
-1
No files found.
Utilities/InfoServer/main.cc
View file @
766fe809
...
@@ -70,6 +70,8 @@ int main(int argc, char** argv)
...
@@ -70,6 +70,8 @@ int main(int argc, char** argv)
act
.
addObject
(
static_cast
<
class
UniSetObject
*>
(
&
is
));
act
.
addObject
(
static_cast
<
class
UniSetObject
*>
(
&
is
));
act
.
run
(
false
);
act
.
run
(
false
);
}
}
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -80,5 +82,5 @@ int main(int argc, char** argv)
...
@@ -80,5 +82,5 @@ int main(int argc, char** argv)
cerr
<<
"(InfoServer::main): catch ..."
<<
endl
;
cerr
<<
"(InfoServer::main): catch ..."
<<
endl
;
}
}
return
0
;
return
1
;
}
}
Utilities/NullController/main.cc
View file @
766fe809
...
@@ -77,6 +77,7 @@ int main(int argc, char** argv)
...
@@ -77,6 +77,7 @@ int main(int argc, char** argv)
ObjectsActivator
act
;
ObjectsActivator
act
;
act
.
addObject
(
static_cast
<
class
UniSetObject
*>
(
&
nc
));
act
.
addObject
(
static_cast
<
class
UniSetObject
*>
(
&
nc
));
act
.
run
(
false
);
act
.
run
(
false
);
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -87,5 +88,5 @@ int main(int argc, char** argv)
...
@@ -87,5 +88,5 @@ int main(int argc, char** argv)
cerr
<<
"(nullController::main): catch ..."
<<
endl
;
cerr
<<
"(nullController::main): catch ..."
<<
endl
;
}
}
return
0
;
return
1
;
}
}
Utilities/SMonit/smonitor.cc
View file @
766fe809
...
@@ -40,6 +40,7 @@ int main( int argc, const char **argv )
...
@@ -40,6 +40,7 @@ int main( int argc, const char **argv )
SystemMessage
sm
(
SystemMessage
::
StartUp
);
SystemMessage
sm
(
SystemMessage
::
StartUp
);
act
.
broadcast
(
sm
.
transport_msg
()
);
act
.
broadcast
(
sm
.
transport_msg
()
);
act
.
run
(
false
);
act
.
run
(
false
);
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -50,6 +51,6 @@ int main( int argc, const char **argv )
...
@@ -50,6 +51,6 @@ int main( int argc, const char **argv )
cout
<<
"(main): Неизвестное исключение!!!!"
<<
endl
;
cout
<<
"(main): Неизвестное исключение!!!!"
<<
endl
;
}
}
return
0
;
return
1
;
}
}
// ------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------
Utilities/SViewer-text/main.cc
View file @
766fe809
...
@@ -46,6 +46,8 @@ int main(int argc, const char **argv)
...
@@ -46,6 +46,8 @@ int main(int argc, const char **argv)
}
}
else
else
sv
.
view
();
sv
.
view
();
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -56,5 +58,5 @@ int main(int argc, const char **argv)
...
@@ -56,5 +58,5 @@ int main(int argc, const char **argv)
cerr
<<
"(main): Неизвестное исключение!!!!"
<<
endl
;
cerr
<<
"(main): Неизвестное исключение!!!!"
<<
endl
;
}
}
return
0
;
return
1
;
}
}
conf/libuniset.spec
View file @
766fe809
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
Name: libuniset
Name: libuniset
Version: 1.0
Version: 1.0
Release: alt1
4
Release: alt1
5
Summary: UniSet - library for building distributed industrial control systems
Summary: UniSet - library for building distributed industrial control systems
License: GPL
License: GPL
Group: Development/C++
Group: Development/C++
...
@@ -191,6 +191,9 @@ rm -f %buildroot%_libdir/*.la
...
@@ -191,6 +191,9 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
%changelog
* Sat Mar 26 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt15
- fixed return value in some utilities
* Thu Mar 24 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt14
* Thu Mar 24 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt14
- fixed bug in MBSlave
- fixed bug in MBSlave
...
...
extensions/IOControl/iocalibr.cc
View file @
766fe809
...
@@ -147,7 +147,7 @@ int main(int argc, char* argv[])
...
@@ -147,7 +147,7 @@ int main(int argc, char* argv[])
case
'?'
:
case
'?'
:
default:
default:
printf
(
"? argument
\n
"
);
printf
(
"? argument
\n
"
);
return
0
;
return
1
;
}
}
}
}
...
@@ -419,7 +419,6 @@ void openXML()
...
@@ -419,7 +419,6 @@ void openXML()
}
}
uxml
.
close
();
uxml
.
close
();
return
;
}
}
catch
(
...
)
catch
(
...
)
{
{
...
...
extensions/IOControl/iocontrol.cc
View file @
766fe809
...
@@ -65,6 +65,7 @@ int main(int argc, const char **argv)
...
@@ -65,6 +65,7 @@ int main(int argc, const char **argv)
act
.
run
(
true
);
act
.
run
(
true
);
msleep
(
500
);
msleep
(
500
);
ic
->
execute
();
ic
->
execute
();
return
0
;
}
}
catch
(
SystemError
&
err
)
catch
(
SystemError
&
err
)
{
{
...
@@ -79,5 +80,5 @@ int main(int argc, const char **argv)
...
@@ -79,5 +80,5 @@ int main(int argc, const char **argv)
dlog
[
Debug
::
CRIT
]
<<
"(iocontrol): catch(...)"
<<
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(iocontrol): catch(...)"
<<
endl
;
}
}
return
0
;
return
1
;
}
}
extensions/LogicProcessor/logicproc.cc
View file @
766fe809
...
@@ -35,6 +35,7 @@ int main(int argc, const char **argv)
...
@@ -35,6 +35,7 @@ int main(int argc, const char **argv)
LProcessor
plc
;
LProcessor
plc
;
plc
.
execute
(
schema
);
plc
.
execute
(
schema
);
return
0
;
}
}
catch
(
LogicException
&
ex
)
catch
(
LogicException
&
ex
)
{
{
...
@@ -49,6 +50,6 @@ int main(int argc, const char **argv)
...
@@ -49,6 +50,6 @@ int main(int argc, const char **argv)
cerr
<<
" catch ... "
<<
endl
;
cerr
<<
" catch ... "
<<
endl
;
}
}
return
0
;
return
1
;
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
extensions/LogicProcessor/plogicproc.cc
View file @
766fe809
...
@@ -81,7 +81,7 @@ int main(int argc, const char **argv)
...
@@ -81,7 +81,7 @@ int main(int argc, const char **argv)
dlog
(
Debug
::
ANY
)
<<
"
\n\n\n
"
;
dlog
(
Debug
::
ANY
)
<<
"
\n\n\n
"
;
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- IOControl START -------------------------
\n\n
"
;
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- IOControl START -------------------------
\n\n
"
;
act
.
run
(
false
);
act
.
run
(
false
);
pause
()
;
return
0
;
}
}
catch
(
LogicException
&
ex
)
catch
(
LogicException
&
ex
)
{
{
...
@@ -96,6 +96,6 @@ int main(int argc, const char **argv)
...
@@ -96,6 +96,6 @@ int main(int argc, const char **argv)
cerr
<<
" catch ... "
<<
endl
;
cerr
<<
" catch ... "
<<
endl
;
}
}
return
0
;
return
1
;
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
extensions/MBTCPMaster/main.cc
View file @
766fe809
...
@@ -69,6 +69,7 @@ int main( int argc, const char** argv )
...
@@ -69,6 +69,7 @@ int main( int argc, const char** argv )
dlog
(
Debug
::
ANY
)
<<
"
\n\n\n
"
;
dlog
(
Debug
::
ANY
)
<<
"
\n\n\n
"
;
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- MBTCP Exchange START -------------------------
\n\n
"
;
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- MBTCP Exchange START -------------------------
\n\n
"
;
act
.
run
(
false
);
act
.
run
(
false
);
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -79,5 +80,5 @@ int main( int argc, const char** argv )
...
@@ -79,5 +80,5 @@ int main( int argc, const char** argv )
dlog
[
Debug
::
CRIT
]
<<
"(mbtcpmaster): catch ..."
<<
std
::
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(mbtcpmaster): catch ..."
<<
std
::
endl
;
}
}
return
0
;
return
1
;
}
}
extensions/ModbusSlave/mbslave.cc
View file @
766fe809
...
@@ -74,7 +74,7 @@ int main(int argc, const char **argv)
...
@@ -74,7 +74,7 @@ int main(int argc, const char **argv)
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- MBSlave START -------------------------
\n\n
"
;
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- MBSlave START -------------------------
\n\n
"
;
act
.
run
(
false
);
act
.
run
(
false
);
return
0
;
}
}
catch
(
SystemError
&
err
)
catch
(
SystemError
&
err
)
{
{
...
@@ -93,6 +93,6 @@ int main(int argc, const char **argv)
...
@@ -93,6 +93,6 @@ int main(int argc, const char **argv)
dlog
[
Debug
::
CRIT
]
<<
"(mbslave): catch(...)"
<<
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(mbslave): catch(...)"
<<
endl
;
}
}
return
0
;
return
1
;
}
}
// --------------------------------------------------------------------------
// --------------------------------------------------------------------------
extensions/RTUExchange/mtr-setup.cc
View file @
766fe809
...
@@ -363,6 +363,7 @@ int main( int argc, char **argv )
...
@@ -363,6 +363,7 @@ int main( int argc, char **argv )
return
1
;
return
1
;
}
}
return
0
;
}
}
catch
(
ModbusRTU
::
mbException
&
ex
)
catch
(
ModbusRTU
::
mbException
&
ex
)
{
{
...
@@ -381,7 +382,7 @@ int main( int argc, char **argv )
...
@@ -381,7 +382,7 @@ int main( int argc, char **argv )
cerr
<<
"(mtr-setup): catch(...)"
<<
endl
;
cerr
<<
"(mtr-setup): catch(...)"
<<
endl
;
}
}
return
0
;
return
1
;
}
}
// --------------------------------------------------------------------------
// --------------------------------------------------------------------------
char
*
checkArg
(
int
i
,
int
argc
,
char
*
argv
[]
)
char
*
checkArg
(
int
i
,
int
argc
,
char
*
argv
[]
)
...
...
extensions/RTUExchange/mtrconv.cc
View file @
766fe809
...
@@ -120,6 +120,7 @@ int main( int argc, const char **argv )
...
@@ -120,6 +120,7 @@ int main( int argc, const char **argv )
else
else
{
{
cout
<<
" Unknown type: "
<<
type
<<
endl
;
cout
<<
" Unknown type: "
<<
type
<<
endl
;
return
1
;
}
}
return
0
;
return
0
;
...
...
extensions/RTUExchange/rtuexchange.cc
View file @
766fe809
...
@@ -70,6 +70,7 @@ int main( int argc, char** argv )
...
@@ -70,6 +70,7 @@ int main( int argc, char** argv )
act
.
run
(
false
);
act
.
run
(
false
);
// msleep(500);
// msleep(500);
// rs->execute();
// rs->execute();
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -80,5 +81,5 @@ int main( int argc, char** argv )
...
@@ -80,5 +81,5 @@ int main( int argc, char** argv )
dlog
[
Debug
::
CRIT
]
<<
"(rtuexchange): catch ..."
<<
std
::
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(rtuexchange): catch ..."
<<
std
::
endl
;
}
}
return
0
;
return
1
;
}
}
extensions/RTUExchange/rtustate.cc
View file @
766fe809
...
@@ -108,6 +108,8 @@ int main( int argc, char **argv )
...
@@ -108,6 +108,8 @@ int main( int argc, char **argv )
cout
<<
"UNIO1 AI"
<<
i
<<
": "
<<
rtu
.
getFloat
(
RTUStorage
::
nJ1
,
i
,
UniversalIO
::
AnalogInput
)
<<
endl
;
cout
<<
"UNIO1 AI"
<<
i
<<
": "
<<
rtu
.
getFloat
(
RTUStorage
::
nJ1
,
i
,
UniversalIO
::
AnalogInput
)
<<
endl
;
for
(
int
i
=
0
;
i
<
24
;
i
++
)
for
(
int
i
=
0
;
i
<
24
;
i
++
)
cout
<<
"UNIO1 DI"
<<
i
<<
": "
<<
rtu
.
getState
(
RTUStorage
::
nJ1
,
i
,
UniversalIO
::
DigitalInput
)
<<
endl
;
cout
<<
"UNIO1 DI"
<<
i
<<
": "
<<
rtu
.
getState
(
RTUStorage
::
nJ1
,
i
,
UniversalIO
::
DigitalInput
)
<<
endl
;
return
0
;
}
}
catch
(
ModbusRTU
::
mbException
&
ex
)
catch
(
ModbusRTU
::
mbException
&
ex
)
{
{
...
@@ -126,6 +128,6 @@ int main( int argc, char **argv )
...
@@ -126,6 +128,6 @@ int main( int argc, char **argv )
cerr
<<
"(rtustate): catch(...)"
<<
endl
;
cerr
<<
"(rtustate): catch(...)"
<<
endl
;
}
}
return
0
;
return
1
;
}
}
// --------------------------------------------------------------------------
// --------------------------------------------------------------------------
extensions/SMDBServer/main.cc
View file @
766fe809
...
@@ -69,6 +69,7 @@ int main( int argc, const char** argv )
...
@@ -69,6 +69,7 @@ int main( int argc, const char** argv )
dlog
(
Debug
::
ANY
)
<<
"
\n\n\n
"
;
dlog
(
Debug
::
ANY
)
<<
"
\n\n\n
"
;
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- SMDBServer START -------------------------
\n\n
"
;
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- SMDBServer START -------------------------
\n\n
"
;
act
.
run
(
false
);
act
.
run
(
false
);
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -79,5 +80,5 @@ int main( int argc, const char** argv )
...
@@ -79,5 +80,5 @@ int main( int argc, const char** argv )
dlog
[
Debug
::
CRIT
]
<<
"(smdbserver): catch ..."
<<
std
::
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(smdbserver): catch ..."
<<
std
::
endl
;
}
}
return
0
;
return
1
;
}
}
extensions/SMViewer/main.cc
View file @
766fe809
...
@@ -36,6 +36,7 @@ int main( int argc, const char **argv )
...
@@ -36,6 +36,7 @@ int main( int argc, const char **argv )
SMViewer
smv
(
shmID
);
SMViewer
smv
(
shmID
);
smv
.
run
();
smv
.
run
();
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -46,6 +47,6 @@ int main( int argc, const char **argv )
...
@@ -46,6 +47,6 @@ int main( int argc, const char **argv )
cout
<<
"Неизвестное исключение!!!!"
<<
endl
;
cout
<<
"Неизвестное исключение!!!!"
<<
endl
;
}
}
return
0
;
return
1
;
}
}
// ------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------
extensions/UDPExchange/udpexchange.cc
View file @
766fe809
...
@@ -70,6 +70,7 @@ int main( int argc, char** argv )
...
@@ -70,6 +70,7 @@ int main( int argc, char** argv )
act
.
run
(
false
);
act
.
run
(
false
);
// msleep(500);
// msleep(500);
// rs->execute();
// rs->execute();
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -80,5 +81,5 @@ int main( int argc, char** argv )
...
@@ -80,5 +81,5 @@ int main( int argc, char** argv )
dlog
[
Debug
::
CRIT
]
<<
"(udpexchange): catch ..."
<<
std
::
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(udpexchange): catch ..."
<<
std
::
endl
;
}
}
return
0
;
return
1
;
}
}
extensions/UDPExchange/udpreceiver.cc
View file @
766fe809
...
@@ -70,6 +70,7 @@ int main( int argc, char** argv )
...
@@ -70,6 +70,7 @@ int main( int argc, char** argv )
act
.
run
(
false
);
act
.
run
(
false
);
// msleep(500);
// msleep(500);
// rs->execute();
// rs->execute();
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -86,5 +87,5 @@ int main( int argc, char** argv )
...
@@ -86,5 +87,5 @@ int main( int argc, char** argv )
dlog
[
Debug
::
CRIT
]
<<
"(udpexchange): catch ..."
<<
std
::
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(udpexchange): catch ..."
<<
std
::
endl
;
}
}
return
0
;
return
1
;
}
}
extensions/UDPExchange/udpsender.cc
View file @
766fe809
...
@@ -70,6 +70,7 @@ int main( int argc, char** argv )
...
@@ -70,6 +70,7 @@ int main( int argc, char** argv )
act
.
run
(
false
);
act
.
run
(
false
);
// msleep(500);
// msleep(500);
// rs->execute();
// rs->execute();
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -84,5 +85,5 @@ int main( int argc, char** argv )
...
@@ -84,5 +85,5 @@ int main( int argc, char** argv )
dlog
[
Debug
::
CRIT
]
<<
"(udpsender): catch ..."
<<
std
::
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(udpsender): catch ..."
<<
std
::
endl
;
}
}
return
0
;
return
1
;
}
}
extensions/UDPExchange/unetexchange.cc
View file @
766fe809
...
@@ -68,6 +68,7 @@ int main( int argc, char** argv )
...
@@ -68,6 +68,7 @@ int main( int argc, char** argv )
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- UDPReceiver START -------------------------
\n\n
"
;
dlog
[
Debug
::
ANY
]
<<
"(main): -------------- UDPReceiver START -------------------------
\n\n
"
;
act
.
run
(
false
);
act
.
run
(
false
);
return
0
;
}
}
catch
(
Exception
&
ex
)
catch
(
Exception
&
ex
)
{
{
...
@@ -84,5 +85,5 @@ int main( int argc, char** argv )
...
@@ -84,5 +85,5 @@ int main( int argc, char** argv )
dlog
[
Debug
::
CRIT
]
<<
"(unetexchange): catch ..."
<<
std
::
endl
;
dlog
[
Debug
::
CRIT
]
<<
"(unetexchange): catch ..."
<<
std
::
endl
;
}
}
return
0
;
return
1
;
}
}
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