diff options
Diffstat (limited to 'lib/libpmc')
| -rw-r--r-- | lib/libpmc/pmclog.c | 9 | ||||
| -rw-r--r-- | lib/libpmc/pmclog.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c index 8772c58..a6b70b5 100644 --- a/lib/libpmc/pmclog.c +++ b/lib/libpmc/pmclog.c @@ -334,6 +334,7 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, PMCLOG_READ32(le,ev->pl_u.pl_s.pl_pid); PMCLOG_READADDR(le,ev->pl_u.pl_s.pl_pc); PMCLOG_READ32(le,ev->pl_u.pl_s.pl_pmcid); + PMCLOG_READ32(le,ev->pl_u.pl_s.pl_usermode); break; case PMCLOG_TYPE_PMCALLOCATE: PMCLOG_READ32(le,ev->pl_u.pl_a.pl_pmcid); @@ -361,6 +362,8 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, case PMCLOG_TYPE_PROCEXEC: PMCLOG_GET_PATHLEN(pathlen,evlen,pmclog_procexec); PMCLOG_READ32(le,ev->pl_u.pl_x.pl_pid); + PMCLOG_READADDR(le,ev->pl_u.pl_x.pl_entryaddr); + PMCLOG_READ32(le,ev->pl_u.pl_x.pl_pmcid); PMCLOG_READSTRING(le,ev->pl_u.pl_x.pl_pathname,pathlen); break; case PMCLOG_TYPE_PROCEXIT: @@ -436,8 +439,10 @@ pmclog_read(void *cookie, struct pmclog_ev *ev) PMCLOG_BUFFER_SIZE); if (nread <= 0) { - ev->pl_state = nread < 0 ? PMCLOG_ERROR : - PMCLOG_EOF; + if (nread == 0) + ev->pl_state = PMCLOG_EOF; + else if (errno != EAGAIN) /* not restartable */ + ev->pl_state = PMCLOG_ERROR; return -1; } diff --git a/lib/libpmc/pmclog.h b/lib/libpmc/pmclog.h index 3e3119e..bc3c476 100644 --- a/lib/libpmc/pmclog.h +++ b/lib/libpmc/pmclog.h @@ -61,6 +61,7 @@ struct pmclog_ev_pcsample { uintfptr_t pl_pc; pid_t pl_pid; pmc_id_t pl_pmcid; + uint32_t pl_usermode; }; struct pmclog_ev_pmcallocate { @@ -89,6 +90,8 @@ struct pmclog_ev_proccsw { struct pmclog_ev_procexec { pid_t pl_pid; + pmc_id_t pl_pmcid; + uintfptr_t pl_entryaddr; char pl_pathname[PATH_MAX]; }; |
