[Spice-devel] [PATCH] replay: compatibility with former version

[Christophe Fergeau]

On Tue, Sep 01, 2015 at 03:18:37PM +0100, Frediano Ziglio wrote:
> GMutex usage in replay.c was not working so replace with plain pthread.
> Avoid to use typedef twice for the same type.

Looks like the logs for 2 different commits stuck together in a single
commit ;)


> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/tests/basic_event_loop.c |  8 ++++----
>  server/tests/replay.c           | 11 ++++++-----
>  2 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/server/tests/basic_event_loop.c b/server/tests/basic_event_loop.c
> index e692f3a..89e05ad 100644
> --- a/server/tests/basic_event_loop.c
> +++ b/server/tests/basic_event_loop.c
> @@ -22,11 +22,11 @@ int debug = 0;
>  #define NOT_IMPLEMENTED printf("%s not implemented\n", __func__);
>  
>  
> -typedef struct SpiceTimer {
> +struct SpiceTimer {
>      SpiceTimerFunc func;
>      void *opaque;
>      guint source_id;
> -} SpiceTimer;
> +};

In my opinion, it would be less confusing to give it a different name
than SpiceTimer since it's already used

>  
>  static SpiceTimer* timer_add(SpiceTimerFunc func, void *opaque)
>  {
> @@ -71,12 +71,12 @@ static void timer_remove(SpiceTimer *timer)
>      g_free(timer);
>  }
>  
> -typedef struct SpiceWatch {
> +struct SpiceWatch {
>      void *opaque;
>      guint source_id;
>      GIOChannel *channel;
>      SpiceWatchFunc func;
> -} SpiceWatch;
> +};
>  
>  static GIOCondition spice_event_to_condition(int event_mask)
>  {
> diff --git a/server/tests/replay.c b/server/tests/replay.c
> index 01590c0..efa97e9 100644
> --- a/server/tests/replay.c
> +++ b/server/tests/replay.c
> @@ -12,6 +12,7 @@
>  #include <sys/wait.h>
>  #include <fcntl.h>
>  #include <glib.h>
> +#include <pthread.h>
>  
>  #include <spice/macros.h>
>  #include "red_replay_qxl.h"
> @@ -30,7 +31,7 @@ static GMainLoop *loop = NULL;
>  static GAsyncQueue *aqueue = NULL;
>  static long total_size;
>  
> -static GMutex mutex;
> +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
>  static guint fill_source_id = 0;
>  
>  
> @@ -102,9 +103,9 @@ static gboolean fill_queue_idle(gpointer user_data)
>  
>  end:
>      if (!keep) {
> -        g_mutex_lock(&mutex);
> +        pthread_mutex_lock(&mutex);
>          fill_source_id = 0;
> -        g_mutex_unlock(&mutex);
> +        pthread_mutex_unlock(&mutex);
>      }
>      spice_qxl_wakeup(&display_sin);
>  
> @@ -113,7 +114,7 @@ end:
>  
>  static void fill_queue(void)
>  {
> -    g_mutex_lock(&mutex);
> +    pthread_mutex_lock(&mutex);
>  
>      if (!started)
>          goto end;
> @@ -124,7 +125,7 @@ static void fill_queue(void)
>      fill_source_id = g_idle_add(fill_queue_idle, NULL);
>  
>  end:
> -    g_mutex_unlock(&mutex);
> +    pthread_mutex_unlock(&mutex);
>  }
>  
>  
> -- 
> 2.4.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150901/45811c78/attachment-0001.sig>