[Spice-devel] [PATCH 05/14] server: split cache-item.h

[Frediano Ziglio]

> 
> From: Marc-André Lureau <marcandre.lureau at gmail.com>
> 
> ---
>  server/Makefile.am       |  1 +
>  server/cache-item.h      | 39 +++++++++++++++++++++++++++++++++++++++
>  server/display-channel.h | 16 +---------------
>  3 files changed, 41 insertions(+), 15 deletions(-)
>  create mode 100644 server/cache-item.h
> 
> diff --git a/server/Makefile.am b/server/Makefile.am
> index a701170..013188b 100644
> --- a/server/Makefile.am
> +++ b/server/Makefile.am
> @@ -65,6 +65,7 @@ libspice_server_la_SOURCES =			\
>  	$(libspice_serverinclude_HEADERS)	\
>  	agent-msg-filter.c			\
>  	agent-msg-filter.h			\
> +	cache-item.h				\
>  	char_device.c				\
>  	char_device.h				\
>  	demarshallers.h				\
> diff --git a/server/cache-item.h b/server/cache-item.h
> new file mode 100644
> index 0000000..730e344
> --- /dev/null
> +++ b/server/cache-item.h
> @@ -0,0 +1,39 @@
> +/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> +/*
> +   Copyright (C) 2014 Red Hat, Inc.
> +
> +   This library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   This library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with this library; if not, see
> <http://www.gnu.org/licenses/>.
> +*/
> +#ifndef CACHE_ITEM_H_
> +# define CACHE_ITEM_H_
> +
> +#include "red_channel.h"
> +#include "common/ring.h"
> +
> +typedef struct CacheItem CacheItem;
> +
> +struct CacheItem {
> +    union {
> +        PipeItem pipe_data;
> +        struct {
> +            RingItem lru_link;
> +            CacheItem *next;
> +        } cache_data;
> +    } u;
> +    uint64_t id;
> +    size_t size;
> +    uint32_t inval_type;
> +};
> +
> +#endif /* CACHE_ITEM_H_ */
> diff --git a/server/display-channel.h b/server/display-channel.h
> index ecf764d..fb38ee2 100644
> --- a/server/display-channel.h
> +++ b/server/display-channel.h
> @@ -19,6 +19,7 @@
>  # define RED_WORKER_CLIENT_H_
>  
>  #include "red_worker.h"
> +#include "cache-item.h"
>  #include "pixmap-cache.h"
>  
>  typedef int64_t red_time_t;
> @@ -36,21 +37,6 @@ typedef struct Drawable Drawable;
>  #define NUM_STREAMS 50
>  #define NUM_SURFACES 10000
>  
> -typedef struct CacheItem CacheItem;
> -
> -struct CacheItem {
> -    union {
> -        PipeItem pipe_data;
> -        struct {
> -            RingItem lru_link;
> -            CacheItem *next;
> -        } cache_data;
> -    } u;
> -    uint64_t id;
> -    size_t size;
> -    uint32_t inval_type;
> -};
> -
>  #define RED_COMPRESS_BUF_SIZE (1024 * 64)
>  typedef struct RedCompressBuf RedCompressBuf;
>  struct RedCompressBuf {

Ack, but it depends on previous patch

Frediano