Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
22f89a88
Commit
22f89a88
authored
Oct 17, 2019
by
Micha Müller
Browse files
Fix bug that prevented Cali service from resolving symbols
parent
45380821
Changes
1
Hide whitespace changes
Inline
Side-by-side
dcdbpusher/Caliper/dcdbpusher/DcdbPusher.cpp
View file @
22f89a88
...
...
@@ -115,7 +115,7 @@ class DcdbPusher {
/* make it sortable for faster lookups */
bool
operator
<
(
const
func_symbol
&
rhs
)
const
{
return
start
_addr
<
rhs
.
start
_addr
;
return
end
_addr
<
rhs
.
end
_addr
;
}
};
...
...
@@ -130,7 +130,7 @@ class DcdbPusher {
/* make it sortable for faster lookups */
bool
operator
<
(
const
addr_range
&
rhs
)
const
{
return
start
_addr
<
rhs
.
start
_addr
;
return
end
_addr
<
rhs
.
end
_addr
;
}
};
...
...
@@ -330,6 +330,7 @@ private:
// symdat.end_addr,
// sym.st_size);
if
(
!
dest
.
insert
(
symdat
).
second
)
{
//TODO check again here
//Log(1).stream() << chn->name() << ": DcdbPusher: Could not insert symbol!" << std::endl;
}
}
else
{
...
...
@@ -767,7 +768,7 @@ private:
uintptr_t
pc
=
sampler_pc_entry
.
value
().
to_uint
();
addr_range
a_tmp
;
a_tmp
.
start
_addr
=
pc
;
a_tmp
.
end
_addr
=
pc
;
if
(
!
symbol_lock
.
try_lock_shared
())
{
++
snapshots_failed
;
...
...
@@ -778,7 +779,7 @@ private:
if
(
a_it
!=
addr_data
.
end
()
&&
pc
>=
a_it
->
start_addr
&&
pc
<=
a_it
->
end_addr
)
{
//we found associated address range
func_symbol
f_tmp
;
f_tmp
.
start
_addr
=
pc
;
f_tmp
.
end
_addr
=
pc
;
auto
f_it
=
a_it
->
symbols
.
lower_bound
(
f_tmp
);
if
(
f_it
!=
a_it
->
symbols
.
end
()
&&
pc
>=
f_it
->
start_addr
&&
pc
<=
f_it
->
end_addr
)
{
...
...
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