Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Philip Trettner
aion
Commits
38b4fe1d
Commit
38b4fe1d
authored
Jun 01, 2016
by
Philip Trettner
Browse files
Hopefully fixed threading problem with missing entry vector
parent
66757b37
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/aion/ActionLabel.cc
View file @
38b4fe1d
...
@@ -91,6 +91,16 @@ void ActionLabel::startEntry()
...
@@ -91,6 +91,16 @@ void ActionLabel::startEntry()
ActionEntry
e
;
ActionEntry
e
;
e
.
labelIdx
=
mIndex
;
e
.
labelIdx
=
mIndex
;
writeTime
(
e
);
writeTime
(
e
);
if
(
!
sEntries
)
{
sLabelLock
.
lock
();
if
(
!
sEntries
)
{
sEntries
=
new
std
::
vector
<
ActionEntry
>
();
sEntriesPerThread
.
push_back
(
sEntries
);
}
sLabelLock
.
unlock
();
}
sEntries
->
push_back
(
e
);
sEntries
->
push_back
(
e
);
}
}
...
...
src/aion/ActionLabel.hh
View file @
38b4fe1d
...
@@ -49,6 +49,6 @@ public:
...
@@ -49,6 +49,6 @@ public:
private:
private:
ActionLabel
(
std
::
string
const
&
name
,
std
::
string
const
&
function
,
std
::
string
const
&
file
,
int
line
,
int
idx
);
ActionLabel
(
std
::
string
const
&
name
,
std
::
string
const
&
function
,
std
::
string
const
&
file
,
int
line
,
int
idx
);
friend
class
ActionPackage
;
friend
class
ActionPackage
;
};
};
}
}
Write
Preview
Supports
Markdown
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