From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 6/6] tests/kms_flip: free the test_output
 struct when counting modes
Date: Tue, 7 Jan 2014 08:16:33 +0100
Message-ID: <20140107071633.GC16015@phenom.ffwll.local>
References: <1388419013-17016-1-git-send-email-przanoni@gmail.com>
	<1388419013-17016-6-git-send-email-przanoni@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com
	[209.85.215.171])
	by gabe.freedesktop.org (Postfix) with ESMTP id B505A11DC0C
	for <intel-gfx@lists.freedesktop.org>;
	Mon,  6 Jan 2014 23:15:28 -0800 (PST)
Received: by mail-ea0-f171.google.com with SMTP id h10so3584eak.16
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 06 Jan 2014 23:15:16 -0800 (PST)
Content-Disposition: inline
In-Reply-To: <1388419013-17016-6-git-send-email-przanoni@gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
To: Paulo Zanoni <przanoni@gmail.com>
Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni <paulo.r.zanoni@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

On Mon, Dec 30, 2013 at 01:56:53PM -0200, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Looks like we have to do a lot of work just to count the number of
> modes...
> 
> Caught by Valgrind.
> 
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Nice set of patches, please push. I agree that the mode/output config
handling in our kms tests is still awful and too verbose, but I didn't
come up yet with a good idea ...
-Daniel

> ---
>  tests/kms_flip.c | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index c43a26f..7e5e355 100644
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -1129,6 +1129,16 @@ static unsigned event_loop(struct test_output *o, unsigned duration_ms)
>  	return end - start;
>  }
>  
> +static void free_test_output(struct test_output *o)
> +{
> +	int i;
> +
> +	for (i = 0; i < o->count; i++) {
> +		drmModeFreeEncoder(o->kencoder[i]);
> +		drmModeFreeConnector(o->kconnector[i]);
> +	}
> +}
> +
>  static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
>  				 int crtc_count, int duration_ms)
>  {
> @@ -1231,10 +1241,7 @@ out:
>  
>  	last_connector = NULL;
>  
> -	for (i = 0; i < o->count; i++) {
> -		drmModeFreeEncoder(o->kencoder[i]);
> -		drmModeFreeConnector(o->kconnector[i]);
> -	}
> +	free_test_output(o);
>  }
>  
>  static int run_test(int duration, int flags)
> @@ -1261,6 +1268,7 @@ static int run_test(int duration, int flags)
>  			if (o.mode_valid)
>  				modes++;
>  
> +			free_test_output(&o);
>  		}
>  	}
>  
> @@ -1318,6 +1326,7 @@ static int run_pair(int duration, int flags)
>  					if (o.mode_valid)
>  						modes++;
>  
> +					free_test_output(&o);
>  				}
>  			}
>  		}
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch