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
f15984b2
Commit
f15984b2
authored
Feb 03, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Исправил ошибку в LT_Object (неправильно использование remove_if)
parent
befbf2ee
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
15 additions
and
6 deletions
+15
-6
libuniset2.spec
conf/libuniset2.spec
+4
-1
DBServer_MySQL.cc
extensions/DBServer-MySQL/DBServer_MySQL.cc
+0
-0
TestProc.cc
extensions/tests/SMemoryTest/TestProc.cc
+2
-0
uniset-start.sh
python/tests/UConnector/uniset-start.sh
+0
-2
uniset2-functions.sh
python/tests/UConnector/uniset2-functions.sh
+2
-0
uniset2-start.sh
python/tests/UConnector/uniset2-start.sh
+2
-0
uniset-start.sh
python/tests/UInterface/uniset-start.sh
+0
-2
uniset2-functions.sh
python/tests/UInterface/uniset2-functions.sh
+2
-0
uniset2-start.sh
python/tests/UInterface/uniset2-start.sh
+2
-0
LT_Object.cc
src/Various/LT_Object.cc
+1
-1
No files found.
conf/libuniset2.spec
View file @
f15984b2
...
...
@@ -8,7 +8,7 @@
Name: libuniset2
Version: 2.0
Release: alt0.
7
Release: alt0.
8
Summary: UniSet - library for building distributed industrial control systems
...
...
@@ -333,6 +333,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet2.pc
%changelog
* Mon Feb 03 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.8
- fixed bug in LT_Object
* Sun Feb 02 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.7
- refactoring DBInterface (rename to MySQLInterface, add MySQLResult class,..)
...
...
extensions/DBServer-MySQL/DBServer_MySQL.cc
View file @
f15984b2
extensions/tests/SMemoryTest/TestProc.cc
View file @
f15984b2
...
...
@@ -84,6 +84,8 @@ void TestProc::timerInfo( const TimerMessage *tm )
state
^=
true
;
out_lamp_c
=
(
state
?
lmpBLINK
:
lmpOFF
);
mylog2
<<
myname
<<
": state="
<<
state
<<
" lmp="
<<
out_lamp_c
<<
endl
;
askTimer
(
tmCheckWorking
,
0
);
// test remove timer
askTimer
(
tmCheckWorking
,
checkTime
);
// reset timer
}
else
if
(
tm
->
id
==
tmCheckWorking
)
...
...
python/tests/UConnector/uniset-start.sh
deleted
120000 → 0
View file @
befbf2ee
/home/pv/Projects/uniset/Utilities/scripts/uniset-start.sh
\ No newline at end of file
python/tests/UConnector/uniset2-functions.sh
0 → 120000
View file @
f15984b2
../../../Utilities/scripts/uniset2-functions.sh
\ No newline at end of file
python/tests/UConnector/uniset2-start.sh
0 → 120000
View file @
f15984b2
../../../Utilities/scripts/uniset2-start.sh
\ No newline at end of file
python/tests/UInterface/uniset-start.sh
deleted
120000 → 0
View file @
befbf2ee
/home/pv/Projects/uniset/Utilities/scripts/uniset-start.sh
\ No newline at end of file
python/tests/UInterface/uniset2-functions.sh
0 → 120000
View file @
f15984b2
../../../Utilities/scripts/uniset2-functions.sh
\ No newline at end of file
python/tests/UInterface/uniset2-start.sh
0 → 120000
View file @
f15984b2
../../../Utilities/scripts/uniset2-start.sh
\ No newline at end of file
src/Various/LT_Object.cc
View file @
f15984b2
...
...
@@ -163,7 +163,7 @@ timeout_t LT_Object::askTimer( UniSetTypes::TimerId timerid, timeout_t timeMS, c
uinfo
<<
"(LT_askTimer): поступил отказ по таймеру id="
<<
timerid
<<
endl
;
{
// lock
uniset_rwmutex_wrlock
lock
(
lstMutex
);
tlst
.
erase
(
std
::
remove_if
(
tlst
.
begin
(),
tlst
.
end
(),
Timer_eq
(
timerid
))
);
tlst
.
erase
(
std
::
remove_if
(
tlst
.
begin
(),
tlst
.
end
(),
Timer_eq
(
timerid
))
,
tlst
.
end
()
);
}
// unlock
}
...
...
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