X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=95bd383e6d8b4f4b8f8d5c11cfe114b7f16b5052;hp=0133fe3666ba304cdcabdc9bea38b8a300dc30ef;hb=06570214a7aa236670706a1aac01c3f352e7454d;hpb=1dec520a9e8e0654fa7fab2310a0191b2836d424 diff --git a/src/lttngtop.c b/src/lttngtop.c index 0133fe3..95bd383 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -10,10 +10,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _GNU_SOURCE @@ -213,7 +212,7 @@ void extract_perf_counter_scope(struct bt_ctf_event *event, for (i = 0; i < count; i++) { const char *name = bt_ctf_field_name(list[i]); - if (strncmp(name, "_perf_", 6) == 0) { + if (strncmp(name, "perf_", 5) == 0) { int value = bt_ctf_get_uint64(list[i]); if (bt_ctf_field_get_error()) continue; @@ -248,7 +247,6 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, int pid, tid, ppid; char *comm; struct processtop *parent, *child; - struct definition *scope; unsigned long timestamp; /* FIXME : display nice error when missing context pid, tid, ppid and comm */ @@ -436,7 +434,7 @@ void iter_trace(struct bt_context *bt_ctx) sem_wait(&end_trace_sem); end_iter: - bt_iter_destroy(bt_ctf_get_iter(iter)); + bt_ctf_iter_destroy(iter); } /*