Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
4c22b514
Commit
4c22b514
authored
May 28, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
optimized Dart/CellMarker destructor
parent
1cade09e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
45 deletions
+23
-45
include/Topology/generic/cellmarker.h
include/Topology/generic/cellmarker.h
+2
-23
include/Topology/generic/dartmarker.h
include/Topology/generic/dartmarker.h
+3
-22
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+11
-0
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+7
-0
No files found.
include/Topology/generic/cellmarker.h
View file @
4c22b514
...
...
@@ -47,13 +47,11 @@ protected:
AttributeMultiVector
<
Mark
>*
m_markVector
;
unsigned
int
m_thread
;
unsigned
int
m_cell
;
bool
releaseOnDestruct
;
public:
CellMarkerGen
(
unsigned
int
cell
,
unsigned
int
thread
=
0
)
:
m_thread
(
thread
),
m_cell
(
cell
),
releaseOnDestruct
(
true
)
m_cell
(
cell
)
{}
virtual
~
CellMarkerGen
()
...
...
@@ -69,10 +67,6 @@ protected:
CellMarkerGen
(
const
CellMarkerGen
&
/*cm*/
)
{}
/**
* set if the mark has to be release on destruction or not
*/
void
setReleaseOnDestruct
(
bool
b
)
{
releaseOnDestruct
=
b
;
}
// virtual void mark(Dart d) = 0 ;
// virtual void unmark(Dart d) = 0 ;
...
...
@@ -108,7 +102,6 @@ public:
m_map
.
template
addEmbedding
<
CELL
>()
;
m_mark
=
m_map
.
template
getMarkerSet
<
CELL
>(
m_thread
).
getNewMark
()
;
m_markVector
=
m_map
.
template
getMarkVector
<
CELL
>(
m_thread
)
;
m_map
.
cellMarkers
[
m_thread
].
push_back
(
this
)
;
}
CellMarkerBase
(
const
MAP
&
map
,
unsigned
int
thread
=
0
)
:
...
...
@@ -119,26 +112,12 @@ public:
m_map
.
template
addEmbedding
<
CELL
>()
;
m_mark
=
m_map
.
template
getMarkerSet
<
CELL
>(
m_thread
).
getNewMark
()
;
m_markVector
=
m_map
.
template
getMarkVector
<
CELL
>(
m_thread
)
;
m_map
.
cellMarkers
[
m_thread
].
push_back
(
this
)
;
}
virtual
~
CellMarkerBase
()
{
if
(
releaseOnDestruct
)
{
if
(
GenericMap
::
alive
(
&
m_map
))
m_map
.
template
getMarkerSet
<
CELL
>(
m_thread
).
releaseMark
(
m_mark
)
;
std
::
vector
<
CellMarkerGen
*>&
cmg
=
m_map
.
cellMarkers
[
m_thread
];
for
(
std
::
vector
<
CellMarkerGen
*>::
iterator
it
=
cmg
.
begin
();
it
!=
cmg
.
end
();
++
it
)
{
if
(
*
it
==
this
)
{
*
it
=
cmg
.
back
();
cmg
.
pop_back
();
return
;
}
}
}
}
protected:
...
...
include/Topology/generic/dartmarker.h
View file @
4c22b514
...
...
@@ -46,15 +46,13 @@ protected:
Mark
m_mark
;
AttributeMultiVector
<
Mark
>*
m_markVector
;
unsigned
int
m_thread
;
bool
releaseOnDestruct
;
public:
/**
* constructor
*/
DartMarkerGen
(
unsigned
int
thread
=
0
)
:
m_thread
(
thread
),
releaseOnDestruct
(
true
)
m_thread
(
thread
)
{}
virtual
~
DartMarkerGen
()
...
...
@@ -69,10 +67,6 @@ protected:
DartMarkerGen
(
const
DartMarkerGen
&
/*dm*/
)
{}
/**
* set if the mark has to be release on destruction or not
*/
inline
void
setReleaseOnDestruct
(
bool
b
)
{
releaseOnDestruct
=
b
;
}
}
;
template
<
typename
MAP
>
...
...
@@ -92,7 +86,6 @@ public:
{
m_mark
=
m_map
.
template
getMarkerSet
<
DART
>(
m_thread
).
getNewMark
()
;
m_markVector
=
m_map
.
template
getMarkVector
<
DART
>(
m_thread
)
;
m_map
.
dartMarkers
[
m_thread
].
push_back
(
this
)
;
}
DartMarkerTmpl
(
const
MAP
&
map
,
unsigned
int
thread
=
0
)
:
...
...
@@ -101,25 +94,13 @@ public:
{
m_mark
=
m_map
.
template
getMarkerSet
<
DART
>(
m_thread
).
getNewMark
()
;
m_markVector
=
m_map
.
template
getMarkVector
<
DART
>(
m_thread
)
;
m_map
.
dartMarkers
[
m_thread
].
push_back
(
this
)
;
}
virtual
~
DartMarkerTmpl
()
{
if
(
releaseOnDestruct
)
{
if
(
GenericMap
::
alive
(
&
m_map
))
m_map
.
template
getMarkerSet
<
DART
>(
m_thread
).
releaseMark
(
m_mark
)
;
std
::
vector
<
DartMarkerGen
*>&
dmg
=
m_map
.
dartMarkers
[
m_thread
]
;
for
(
std
::
vector
<
DartMarkerGen
*>::
iterator
it
=
dmg
.
begin
();
it
!=
dmg
.
end
();
++
it
)
{
if
(
*
it
==
this
)
{
*
it
=
dmg
.
back
()
;
dmg
.
pop_back
()
;
return
;
}
}
}
}
protected:
...
...
include/Topology/generic/genericmap.h
View file @
4c22b514
...
...
@@ -138,6 +138,9 @@ protected:
std
::
vector
<
DartMarkerGen
*>
dartMarkers
[
NB_THREAD
]
;
std
::
vector
<
CellMarkerGen
*>
cellMarkers
[
NB_THREAD
]
;
// table of instancied maps for Dart/CellMarker release
static
std
::
vector
<
GenericMap
*>
s_instances
;
public:
static
const
unsigned
int
UNKNOWN_ATTRIB
=
AttributeContainer
::
UNKNOWN
;
...
...
@@ -145,6 +148,14 @@ public:
virtual
~
GenericMap
()
;
static
inline
bool
alive
(
GenericMap
*
map
)
{
for
(
auto
it
=
s_instances
.
begin
();
it
!=
s_instances
.
end
();
++
it
)
if
(
*
it
==
map
)
return
true
;
return
false
;
}
protected:
void
init
();
...
...
src/Topology/generic/genericmap.cpp
View file @
4c22b514
...
...
@@ -42,6 +42,9 @@ int NumberOfThreads = getSystemNumberOfCores();
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*>*
GenericMap
::
m_attributes_registry_map
=
NULL
;
int
GenericMap
::
m_nbInstances
=
0
;
// table of instancied maps for Dart/CellMarker release
std
::
vector
<
GenericMap
*>
GenericMap
::
s_instances
;
GenericMap
::
GenericMap
()
:
m_nbThreadMarkers
(
1
)
{
if
(
m_attributes_registry_map
==
NULL
)
...
...
@@ -81,6 +84,7 @@ GenericMap::GenericMap() : m_nbThreadMarkers(1)
}
m_nbInstances
++
;
s_instances
.
push_back
(
this
);
for
(
unsigned
int
i
=
0
;
i
<
NB_ORBITS
;
++
i
)
{
...
...
@@ -143,6 +147,9 @@ GenericMap::~GenericMap()
delete
m_attributes_registry_map
;
m_attributes_registry_map
=
NULL
;
}
// remove instance for table
std
::
remove
(
s_instances
.
begin
(),
s_instances
.
end
(),
this
);
}
void
GenericMap
::
init
()
...
...
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