Patchwork spice: Convert core to QEMU thread API

login
register
mail settings
Submitter Jan Kiszka
Date Sept. 20, 2011, 3:14 p.m.
Message ID <4E78ADD9.30904@siemens.com>
Download mbox | patch
Permalink /patch/115573/
State New
Headers show

Comments

Jan Kiszka - Sept. 20, 2011, 3:14 p.m.
No need to use pthread directly, we have proper abstractions for
identity checking.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ui/spice-core.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Robert Wang - Sept. 22, 2011, 5:08 a.m.
Tested, it is compatible with checkpatch.pl and can work well.
> No need to use pthread directly, we have proper abstractions for
> identity checking.
>
> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
> ---
>   ui/spice-core.c |    8 ++++----
>   1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index 3cbc721..afdf82e 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -19,10 +19,10 @@
>   #include<spice-experimental.h>
>
>   #include<netdb.h>
> -#include<pthread.h>
>
>   #include "qemu-common.h"
>   #include "qemu-spice.h"
> +#include "qemu-thread.h"
>   #include "qemu-timer.h"
>   #include "qemu-queue.h"
>   #include "qemu-x509.h"
> @@ -45,7 +45,7 @@ static char *auth_passwd;
>   static time_t auth_expires = TIME_MAX;
>   int using_spice = 0;
>
> -static pthread_t me;
> +static QemuThread me;
>
>   struct SpiceTimer {
>       QEMUTimer *timer;
> @@ -229,7 +229,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info)
>        * thread and grab the iothread lock if so before calling qemu
>        * functions.
>        */
> -    bool need_lock = !pthread_equal(me, pthread_self());
> +    bool need_lock = !qemu_thread_is_self(&me);
>       if (need_lock) {
>           qemu_mutex_lock_iothread();
>       }
> @@ -503,7 +503,7 @@ void qemu_spice_init(void)
>       spice_image_compression_t compression;
>       spice_wan_compression_t wan_compr;
>
> -    me = pthread_self();
> +    qemu_thread_get_self(&me);
>
>      if (!opts) {
>           return;

Patch

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 3cbc721..afdf82e 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -19,10 +19,10 @@ 
 #include <spice-experimental.h>
 
 #include <netdb.h>
-#include <pthread.h>
 
 #include "qemu-common.h"
 #include "qemu-spice.h"
+#include "qemu-thread.h"
 #include "qemu-timer.h"
 #include "qemu-queue.h"
 #include "qemu-x509.h"
@@ -45,7 +45,7 @@  static char *auth_passwd;
 static time_t auth_expires = TIME_MAX;
 int using_spice = 0;
 
-static pthread_t me;
+static QemuThread me;
 
 struct SpiceTimer {
     QEMUTimer *timer;
@@ -229,7 +229,7 @@  static void channel_event(int event, SpiceChannelEventInfo *info)
      * thread and grab the iothread lock if so before calling qemu
      * functions.
      */
-    bool need_lock = !pthread_equal(me, pthread_self());
+    bool need_lock = !qemu_thread_is_self(&me);
     if (need_lock) {
         qemu_mutex_lock_iothread();
     }
@@ -503,7 +503,7 @@  void qemu_spice_init(void)
     spice_image_compression_t compression;
     spice_wan_compression_t wan_compr;
 
-    me = pthread_self();
+    qemu_thread_get_self(&me);
 
    if (!opts) {
         return;