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
c377d11b
Commit
c377d11b
authored
Jan 27, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Млекие стилистические правки (удаление лишних пробелов и т.п.)
parent
5dfa1766
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
23 additions
and
20 deletions
+23
-20
TODO
TODO
+2
-0
start_fg_vcall.sh
extensions/tests/SMemoryTest/start_fg_vcall.sh
+1
-1
IONotifyController.h
include/IONotifyController.h
+1
-1
Mutex.h
include/Mutex.h
+3
-3
UniSetManager.h
include/UniSetManager.h
+3
-3
UniSetObject.h
include/UniSetObject.h
+1
-1
WDTInterface.h
include/WDTInterface.h
+2
-2
UInterface.cc
src/Interfaces/UInterface.cc
+2
-2
ObjectRepository.cc
src/ObjectRepository/ObjectRepository.cc
+2
-2
UniSetManager.cc
src/ObjectRepository/UniSetManager.cc
+4
-4
NCRestorer_XML.cc
src/Processes/NCRestorer_XML.cc
+2
-1
No files found.
TODO
View file @
c377d11b
...
@@ -25,3 +25,4 @@ Version 2.0
...
@@ -25,3 +25,4 @@ Version 2.0
============
============
- написать документацию по ModbusSlave
- написать документацию по ModbusSlave
- циклическое хранилище для аварийных следов на основе SQLite
- циклическое хранилище для аварийных следов на основе SQLite
- отказаться от alias-ов.. (не прижилось, а накладные расходы большие)
\ No newline at end of file
extensions/tests/SMemoryTest/start_fg_vcall.sh
View file @
c377d11b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
START
=
uniset-start.sh
START
=
uniset-start.sh
${
START
}
-vcall
./.libs/lt-smemory-test
--confile
test.xml
--dlog-add-levels
level1
--localNode
LocalhostNode
$*
${
START
}
-vcall
./.libs/lt-smemory-test
--confile
./
test.xml
--dlog-add-levels
level1
--localNode
LocalhostNode
$*
#--unideb-add-levels crit,warn,info
#--unideb-add-levels crit,warn,info
...
...
include/IONotifyController.h
View file @
c377d11b
...
@@ -291,7 +291,7 @@ class IONotifyController:
...
@@ -291,7 +291,7 @@ class IONotifyController:
//----------------------
//----------------------
bool
addConsumer
(
ConsumerList
&
lst
,
const
UniSetTypes
::
ConsumerInfo
&
cons
);
//!< добавить потребителя сообщения
bool
addConsumer
(
ConsumerList
&
lst
,
const
UniSetTypes
::
ConsumerInfo
&
cons
);
//!< добавить потребителя сообщения
bool
removeConsumer
(
ConsumerList
&
lst
,
const
UniSetTypes
::
ConsumerInfo
&
cons
);
//!< удалить потребителя сообщения
bool
removeConsumer
(
ConsumerList
&
lst
,
const
UniSetTypes
::
ConsumerInfo
&
cons
);
//!< удалить потребителя сообщения
//! обработка заказа
//! обработка заказа
void
ask
(
AskMap
&
askLst
,
const
IOController_i
::
SensorInfo
&
si
,
void
ask
(
AskMap
&
askLst
,
const
IOController_i
::
SensorInfo
&
si
,
...
...
include/Mutex.h
View file @
c377d11b
...
@@ -49,12 +49,12 @@ namespace UniSetTypes
...
@@ -49,12 +49,12 @@ namespace UniSetTypes
bool
isRelease
();
bool
isRelease
();
void
lock
();
void
lock
();
void
unlock
();
void
unlock
();
inline
std
::
string
name
(){
return
nm
;
}
inline
std
::
string
name
(){
return
nm
;
}
inline
void
setName
(
const
std
::
string
&
name
){
nm
=
name
;
}
inline
void
setName
(
const
std
::
string
&
name
){
nm
=
name
;
}
protected
:
protected
:
private
:
private
:
friend
class
uniset_mutex_lock
;
friend
class
uniset_mutex_lock
;
uniset_mutex
(
const
uniset_mutex
&
r
);
uniset_mutex
(
const
uniset_mutex
&
r
);
...
...
include/UniSetManager.h
View file @
c377d11b
...
@@ -134,7 +134,7 @@ class UniSetManager:
...
@@ -134,7 +134,7 @@ class UniSetManager:
//! \note Переопределяя не забывайте вызвать базовую
//! \note Переопределяя не забывайте вызвать базовую
virtual
bool
disactivateObject
();
virtual
bool
disactivateObject
();
typedef
UniSetManagerList
::
iterator
MListIterator
;
typedef
UniSetManagerList
::
iterator
MListIterator
;
int
getObjectsInfo
(
UniSetManager
*
mngr
,
UniSetTypes
::
SimpleInfoSeq
*
seq
,
int
getObjectsInfo
(
UniSetManager
*
mngr
,
UniSetTypes
::
SimpleInfoSeq
*
seq
,
int
begin
,
const
long
uplimit
);
int
begin
,
const
long
uplimit
);
...
@@ -143,9 +143,9 @@ class UniSetManager:
...
@@ -143,9 +143,9 @@ class UniSetManager:
PortableServer
::
POAManager_var
pman
;
PortableServer
::
POAManager_var
pman
;
private
:
private
:
friend
class
UniSetActivator
;
friend
class
UniSetActivator
;
int
sig
;
int
sig
;
UniSetManagerList
mlist
;
UniSetManagerList
mlist
;
ObjectsList
olist
;
ObjectsList
olist
;
...
...
include/UniSetObject.h
View file @
c377d11b
...
@@ -220,7 +220,7 @@ class UniSetObject:
...
@@ -220,7 +220,7 @@ class UniSetObject:
pid_t
msgpid
;
// pid потока обработки сообщений
pid_t
msgpid
;
// pid потока обработки сообщений
bool
reg
;
bool
reg
;
UniSetTypes
::
mutex_atomic_t
active
;
UniSetTypes
::
mutex_atomic_t
active
;
// UniSetTypes::uniset_rwmutex mutex_act;
bool
threadcreate
;
bool
threadcreate
;
UniSetTimer
*
tmr
;
UniSetTimer
*
tmr
;
UniSetTypes
::
ObjectId
myid
;
UniSetTypes
::
ObjectId
myid
;
...
...
include/WDTInterface.h
View file @
c377d11b
...
@@ -14,8 +14,8 @@ class WDTInterface
...
@@ -14,8 +14,8 @@ class WDTInterface
WDTInterface
(
const
std
::
string
&
dev
);
WDTInterface
(
const
std
::
string
&
dev
);
~
WDTInterface
();
~
WDTInterface
();
bool
ping
();
bool
ping
();
bool
stop
();
bool
stop
();
protected
:
protected
:
const
std
::
string
dev
;
const
std
::
string
dev
;
...
...
src/Interfaces/UInterface.cc
View file @
c377d11b
...
@@ -63,7 +63,7 @@ UInterface::UInterface( const ObjectId backid, CORBA::ORB_var orb, ObjectIndex*
...
@@ -63,7 +63,7 @@ UInterface::UInterface( const ObjectId backid, CORBA::ORB_var orb, ObjectIndex*
oind
=
uconf
->
oind
;
oind
=
uconf
->
oind
;
init
();
init
();
}
}
UInterface
::~
UInterface
()
UInterface
::~
UInterface
()
{
{
...
@@ -717,7 +717,7 @@ ObjectType UInterface::getType(const ObjectId name, const ObjectId node) const
...
@@ -717,7 +717,7 @@ ObjectType UInterface::getType(const ObjectId name, const ObjectId node) const
// uwarn << "UI(getType): CORBA::SystemException" << endl;
// uwarn << "UI(getType): CORBA::SystemException" << endl;
}
}
catch
(
UniSetTypes
::
TimeOut
){}
catch
(
UniSetTypes
::
TimeOut
){}
rcache
.
erase
(
name
,
node
);
rcache
.
erase
(
name
,
node
);
throw
UniSetTypes
::
TimeOut
(
set_err
(
"UI(getType): Timeout"
,
name
,
node
));
throw
UniSetTypes
::
TimeOut
(
set_err
(
"UI(getType): Timeout"
,
name
,
node
));
}
}
...
...
src/ObjectRepository/ObjectRepository.cc
View file @
c377d11b
...
@@ -101,7 +101,7 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
...
@@ -101,7 +101,7 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
err
<<
" содержит недопустимый символ "
<<
bad
;
err
<<
" содержит недопустимый символ "
<<
bad
;
throw
(
InvalidObjectName
(
err
.
str
().
c_str
())
);
throw
(
InvalidObjectName
(
err
.
str
().
c_str
())
);
}
}
CosNaming
::
Name_var
oName
=
omniURI
::
stringToName
(
name
.
c_str
());
CosNaming
::
Name_var
oName
=
omniURI
::
stringToName
(
name
.
c_str
());
CosNaming
::
NamingContext_var
ctx
;
CosNaming
::
NamingContext_var
ctx
;
for
(
unsigned
int
i
=
0
;
i
<
2
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
2
;
i
++
)
...
@@ -110,7 +110,7 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
...
@@ -110,7 +110,7 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
{
{
// Добавляем в репозиторий новую ссылку (заменяя если есть старую)
// Добавляем в репозиторий новую ссылку (заменяя если есть старую)
CORBA
::
ORB_var
orb
=
uconf
->
getORB
();
CORBA
::
ORB_var
orb
=
uconf
->
getORB
();
ctx
=
ORepHelpers
::
getContext
(
orb
,
section
,
nsName
);
ctx
=
ORepHelpers
::
getContext
(
orb
,
section
,
nsName
);
ctx
->
bind
(
oName
,
oRef
);
ctx
->
bind
(
oName
,
oRef
);
return
;
return
;
...
...
src/ObjectRepository/UniSetManager.cc
View file @
c377d11b
...
@@ -444,13 +444,13 @@ const UniSetObject* UniSetManager::itemO(const ObjectId id)
...
@@ -444,13 +444,13 @@ const UniSetObject* UniSetManager::itemO(const ObjectId id)
int
UniSetManager
::
objectsCount
()
int
UniSetManager
::
objectsCount
()
{
{
int
res
(
olist
.
size
()
+
mlist
.
size
()
);
int
res
(
olist
.
size
()
+
mlist
.
size
()
);
for
(
UniSetManagerList
::
const_iterator
it
=
beginMList
();
for
(
UniSetManagerList
::
const_iterator
it
=
beginMList
();
it
!=
endMList
();
++
it
)
it
!=
endMList
();
++
it
)
{
{
res
+=
(
*
it
)
->
objectsCount
();
res
+=
(
*
it
)
->
objectsCount
();
}
}
return
res
;
return
res
;
}
}
...
@@ -463,7 +463,7 @@ int UniSetManager::getObjectsInfo( UniSetManager* mngr, SimpleInfoSeq* seq,
...
@@ -463,7 +463,7 @@ int UniSetManager::getObjectsInfo( UniSetManager* mngr, SimpleInfoSeq* seq,
// получаем у самого менджера
// получаем у самого менджера
SimpleInfo_var
msi
=
mngr
->
getInfo
();
SimpleInfo_var
msi
=
mngr
->
getInfo
();
(
*
seq
)[
ind
]
=
msi
;
(
*
seq
)[
ind
]
=
msi
;
ind
++
;
ind
++
;
if
(
ind
>
uplimit
)
if
(
ind
>
uplimit
)
return
ind
;
return
ind
;
...
...
src/Processes/NCRestorer_XML.cc
View file @
c377d11b
...
@@ -39,7 +39,8 @@ c_filterField(""),
...
@@ -39,7 +39,8 @@ c_filterField(""),
c_filterValue
(
""
),
c_filterValue
(
""
),
t_filterField
(
""
),
t_filterField
(
""
),
t_filterValue
(
""
),
t_filterValue
(
""
),
fname
(
fname
)
fname
(
fname
),
uxml
(
0
)
{
{
init
(
fname
);
init
(
fname
);
}
}
...
...
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