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
ec36dfc9
Commit
ec36dfc9
authored
Feb 12, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Подправил объявления mutex-ов (в соответсвии с c++11)
parent
7489225e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
38 deletions
+10
-38
Mutex.h
include/Mutex.h
+8
-8
UniSetObject.cc
src/ObjectRepository/UniSetObject.cc
+2
-2
Mutex.cc
src/Various/Mutex.cc
+0
-28
No files found.
include/Mutex.h
View file @
ec36dfc9
...
@@ -52,8 +52,8 @@ namespace UniSetTypes
...
@@ -52,8 +52,8 @@ namespace UniSetTypes
private
:
private
:
friend
class
uniset_mutex_lock
;
friend
class
uniset_mutex_lock
;
uniset_mutex
(
const
uniset_mutex
&
r
);
uniset_mutex
(
const
uniset_mutex
&
r
)
=
delete
;
const
uniset_mutex
&
operator
=
(
const
uniset_mutex
&
r
);
const
uniset_mutex
&
operator
=
(
const
uniset_mutex
&
r
)
=
delete
;
std
::
string
nm
;
std
::
string
nm
;
std
::
timed_mutex
m_lock
;
std
::
timed_mutex
m_lock
;
};
};
...
@@ -80,8 +80,8 @@ namespace UniSetTypes
...
@@ -80,8 +80,8 @@ namespace UniSetTypes
uniset_mutex
*
mutex
;
uniset_mutex
*
mutex
;
std
::
atomic
<
int
>
locked
;
std
::
atomic
<
int
>
locked
;
uniset_mutex_lock
(
const
uniset_mutex_lock
&
);
uniset_mutex_lock
(
const
uniset_mutex_lock
&
)
=
delete
;
uniset_mutex_lock
&
operator
=
(
const
uniset_mutex_lock
&
);
uniset_mutex_lock
&
operator
=
(
const
uniset_mutex_lock
&
)
=
delete
;
};
};
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
...
@@ -126,8 +126,8 @@ namespace UniSetTypes
...
@@ -126,8 +126,8 @@ namespace UniSetTypes
~
uniset_rwmutex_wrlock
();
~
uniset_rwmutex_wrlock
();
private
:
private
:
uniset_rwmutex_wrlock
(
const
uniset_rwmutex_wrlock
&
);
uniset_rwmutex_wrlock
(
const
uniset_rwmutex_wrlock
&
)
=
delete
;
uniset_rwmutex_wrlock
&
operator
=
(
const
uniset_rwmutex_wrlock
&
);
uniset_rwmutex_wrlock
&
operator
=
(
const
uniset_rwmutex_wrlock
&
)
=
delete
;
uniset_rwmutex
&
m
;
uniset_rwmutex
&
m
;
};
};
...
@@ -138,8 +138,8 @@ namespace UniSetTypes
...
@@ -138,8 +138,8 @@ namespace UniSetTypes
~
uniset_rwmutex_rlock
();
~
uniset_rwmutex_rlock
();
private
:
private
:
uniset_rwmutex_rlock
(
const
uniset_rwmutex_rlock
&
);
uniset_rwmutex_rlock
(
const
uniset_rwmutex_rlock
&
)
=
delete
;
uniset_rwmutex_rlock
&
operator
=
(
const
uniset_rwmutex_rlock
&
);
uniset_rwmutex_rlock
&
operator
=
(
const
uniset_rwmutex_rlock
&
)
=
delete
;
uniset_rwmutex
&
m
;
uniset_rwmutex
&
m
;
};
};
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
...
...
src/ObjectRepository/UniSetObject.cc
View file @
ec36dfc9
...
@@ -199,13 +199,13 @@ bool UniSetObject::receiveMessage( VoidMessage& vm )
...
@@ -199,13 +199,13 @@ bool UniSetObject::receiveMessage( VoidMessage& vm )
if
(
!
queueMsg
.
empty
()
)
if
(
!
queueMsg
.
empty
()
)
{
{
// контроль переполнения
// контроль переполнения
if
(
queueMsg
.
size
()
>
SizeOfMessageQueue
)
if
(
queueMsg
.
size
()
>
SizeOfMessageQueue
)
{
{
ucrit
<<
myname
<<
"(receiveMessages): messages queue overflow!"
<<
endl
<<
flush
;
ucrit
<<
myname
<<
"(receiveMessages): messages queue overflow!"
<<
endl
<<
flush
;
cleanMsgQueue
(
queueMsg
);
cleanMsgQueue
(
queueMsg
);
// обновляем статистику по переполнениям
// обновляем статистику по переполнениям
stCountOfQueueFull
++
;
stCountOfQueueFull
++
;
stMaxQueueMessages
=
0
;
stMaxQueueMessages
=
0
;
}
}
if
(
!
queueMsg
.
empty
()
)
if
(
!
queueMsg
.
empty
()
)
...
...
src/Various/Mutex.cc
View file @
ec36dfc9
...
@@ -213,20 +213,6 @@ uniset_rwmutex_wrlock::~uniset_rwmutex_wrlock()
...
@@ -213,20 +213,6 @@ uniset_rwmutex_wrlock::~uniset_rwmutex_wrlock()
{
{
m
.
unlock
();
m
.
unlock
();
}
}
uniset_rwmutex_wrlock
::
uniset_rwmutex_wrlock
(
const
uniset_rwmutex_wrlock
&
r
)
:
m
(
r
.
m
)
{
}
uniset_rwmutex_wrlock
&
uniset_rwmutex_wrlock
::
operator
=
(
const
uniset_rwmutex_wrlock
&
r
)
{
if
(
this
!=
&
r
)
m
=
r
.
m
;
return
*
this
;
}
// -------------------------------------------------------------------------------------------
// -------------------------------------------------------------------------------------------
uniset_rwmutex_rlock
::
uniset_rwmutex_rlock
(
uniset_rwmutex
&
_m
)
:
uniset_rwmutex_rlock
::
uniset_rwmutex_rlock
(
uniset_rwmutex
&
_m
)
:
m
(
_m
)
m
(
_m
)
...
@@ -238,18 +224,4 @@ uniset_rwmutex_rlock::~uniset_rwmutex_rlock()
...
@@ -238,18 +224,4 @@ uniset_rwmutex_rlock::~uniset_rwmutex_rlock()
{
{
m
.
unlock
();
m
.
unlock
();
}
}
uniset_rwmutex_rlock
::
uniset_rwmutex_rlock
(
const
uniset_rwmutex_rlock
&
r
)
:
m
(
r
.
m
)
{
}
uniset_rwmutex_rlock
&
uniset_rwmutex_rlock
::
operator
=
(
const
uniset_rwmutex_rlock
&
r
)
{
if
(
this
!=
&
r
)
m
=
r
.
m
;
return
*
this
;
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
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