From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753231AbaFRPGv (ORCPT ); Wed, 18 Jun 2014 11:06:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22522 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751936AbaFRO7U (ORCPT ); Wed, 18 Jun 2014 10:59:20 -0400 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Arnaldo Carvalho de Melo , Corey Ashford , David Ahern , Frederic Weisbecker , Ingo Molnar , Jean Pihet , Namhyung Kim , Paul Mackerras , Peter Zijlstra Subject: [PATCH 02/18] perf tools: Fix accounting of ordered samples queue Date: Wed, 18 Jun 2014 16:58:43 +0200 Message-Id: <1403103539-16807-3-git-send-email-jolsa@kernel.org> In-Reply-To: <1403103539-16807-1-git-send-email-jolsa@kernel.org> References: <1403103539-16807-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Properly account flushed samples within the ordered samples queue. Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jean Pihet Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Signed-off-by: Jiri Olsa --- tools/perf/util/session.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 64a186e..aec3dcd 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -511,6 +511,7 @@ static int flush_sample_queue(struct perf_session *s, os->last_flush = iter->timestamp; list_del(&iter->list); list_add(&iter->list, &os->sample_cache); + os->nr_samples--; if (show_progress) ui_progress__update(&prog, 1); @@ -523,8 +524,6 @@ static int flush_sample_queue(struct perf_session *s, list_entry(head->prev, struct sample_queue, list); } - os->nr_samples = 0; - return 0; } -- 1.8.3.1