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
0a0b2351
Commit
0a0b2351
authored
Jan 27, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Млекие стилистические правки (удаление лишних пробелов и т.п.)
parent
82bbde0c
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
14 deletions
+25
-14
TODO
TODO
+1
-0
start_fg_vcall.sh
extensions/tests/SMemoryTest/start_fg_vcall.sh
+9
-0
IONotifyController.h
include/IONotifyController.h
+1
-1
UniSetObject.h
include/UniSetObject.h
+1
-1
WDTInterface.h
include/WDTInterface.h
+3
-3
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 @
0a0b2351
...
...
@@ -25,3 +25,4 @@ Version 2.0
============
- написать документацию по ModbusSlave
- циклическое хранилище для аварийных следов на основе SQLite
- отказаться от alias-ов.. (не прижилось, а накладные расходы большие)
extensions/tests/SMemoryTest/start_fg_vcall.sh
0 → 100755
View file @
0a0b2351
#!/bin/sh
START
=
uniset-start.sh
${
START
}
-vcall
./.libs/lt-smemory-test
--confile
./test.xml
--dlog-add-levels
level1
--localNode
LocalhostNode
$*
#--unideb-add-levels crit,warn,info
#system,level2,level8,level9
include/IONotifyController.h
View file @
0a0b2351
...
...
@@ -291,7 +291,7 @@ class IONotifyController:
//----------------------
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
,
...
...
include/UniSetObject.h
View file @
0a0b2351
...
...
@@ -220,7 +220,7 @@ class UniSetObject:
pid_t
msgpid
;
// pid потока обработки сообщений
bool
reg
;
UniSetTypes
::
mutex_atomic_t
active
;
// UniSetTypes::uniset_rwmutex mutex_act;
bool
threadcreate
;
UniSetTimer
*
tmr
;
UniSetTypes
::
ObjectId
myid
;
...
...
include/WDTInterface.h
View file @
0a0b2351
...
...
@@ -14,9 +14,9 @@ class WDTInterface
WDTInterface
(
const
std
::
string
&
dev
);
~
WDTInterface
();
bool
ping
();
bool
stop
();
bool
ping
();
bool
stop
();
protected
:
const
std
::
string
dev
;
};
...
...
src/Interfaces/UInterface.cc
View file @
0a0b2351
...
...
@@ -63,7 +63,7 @@ UInterface::UInterface( const ObjectId backid, CORBA::ORB_var orb, ObjectIndex*
oind
=
uconf
->
oind
;
init
();
}
}
UInterface
::~
UInterface
()
{
...
...
@@ -717,7 +717,7 @@ ObjectType UInterface::getType(const ObjectId name, const ObjectId node) const
// uwarn << "UI(getType): CORBA::SystemException" << endl;
}
catch
(
UniSetTypes
::
TimeOut
){}
rcache
.
erase
(
name
,
node
);
throw
UniSetTypes
::
TimeOut
(
set_err
(
"UI(getType): Timeout"
,
name
,
node
));
}
...
...
src/ObjectRepository/ObjectRepository.cc
View file @
0a0b2351
...
...
@@ -101,7 +101,7 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
err
<<
" содержит недопустимый символ "
<<
bad
;
throw
(
InvalidObjectName
(
err
.
str
().
c_str
())
);
}
CosNaming
::
Name_var
oName
=
omniURI
::
stringToName
(
name
.
c_str
());
CosNaming
::
NamingContext_var
ctx
;
for
(
unsigned
int
i
=
0
;
i
<
2
;
i
++
)
...
...
@@ -110,7 +110,7 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
{
// Добавляем в репозиторий новую ссылку (заменяя если есть старую)
CORBA
::
ORB_var
orb
=
uconf
->
getORB
();
ctx
=
ORepHelpers
::
getContext
(
orb
,
section
,
nsName
);
ctx
=
ORepHelpers
::
getContext
(
orb
,
section
,
nsName
);
ctx
->
bind
(
oName
,
oRef
);
return
;
...
...
src/ObjectRepository/UniSetManager.cc
View file @
0a0b2351
...
...
@@ -444,13 +444,13 @@ const UniSetObject* UniSetManager::itemO(const ObjectId id)
int
UniSetManager
::
objectsCount
()
{
int
res
(
olist
.
size
()
+
mlist
.
size
()
);
for
(
UniSetManagerList
::
const_iterator
it
=
beginMList
();
it
!=
endMList
();
++
it
)
{
res
+=
(
*
it
)
->
objectsCount
();
}
}
return
res
;
}
...
...
@@ -463,7 +463,7 @@ int UniSetManager::getObjectsInfo( UniSetManager* mngr, SimpleInfoSeq* seq,
// получаем у самого менджера
SimpleInfo_var
msi
=
mngr
->
getInfo
();
(
*
seq
)[
ind
]
=
msi
;
ind
++
;
if
(
ind
>
uplimit
)
return
ind
;
...
...
src/Processes/NCRestorer_XML.cc
View file @
0a0b2351
...
...
@@ -39,7 +39,8 @@ c_filterField(""),
c_filterValue
(
""
),
t_filterField
(
""
),
t_filterValue
(
""
),
fname
(
fname
)
fname
(
fname
),
uxml
(
0
)
{
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