[Mesa-dev] [PATCH 1/2] glapi: replace 'user' with 'context' in u_current.[ch] code

[Chia-I Wu]

On Wed, Mar 5, 2014 at 10:48 PM, Brian Paul <brianp at vmware.com> wrote:
> To make the functions more understandable.
Both patches are

Reviewed-by: Chia-I Wu <olv at lunarg.com>

> ---
>  src/mapi/glapi/glapi.c |    2 +-
>  src/mapi/mapi_glapi.c  |    2 +-
>  src/mapi/u_current.c   |   32 ++++++++++++++++----------------
>  src/mapi/u_current.h   |   20 ++++++++++----------
>  4 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/src/mapi/glapi/glapi.c b/src/mapi/glapi/glapi.c
> index 3a0b638..231bdad 100644
> --- a/src/mapi/glapi/glapi.c
> +++ b/src/mapi/glapi/glapi.c
> @@ -54,7 +54,7 @@ _glapi_check_multithread(void)
>  void
>  _glapi_set_context(void *context)
>  {
> -   u_current_set_user((const void *) context);
> +   u_current_set_context((const void *) context);
>  }
>
>  void
> diff --git a/src/mapi/mapi_glapi.c b/src/mapi/mapi_glapi.c
> index 925caf3..d345f2a 100644
> --- a/src/mapi/mapi_glapi.c
> +++ b/src/mapi/mapi_glapi.c
> @@ -58,7 +58,7 @@ _glapi_check_multithread(void)
>  void
>  _glapi_set_context(void *context)
>  {
> -   u_current_set_user((const void *) context);
> +   u_current_set_context((const void *) context);
>  }
>
>  void
> diff --git a/src/mapi/u_current.c b/src/mapi/u_current.c
> index 0721338..72190fe 100644
> --- a/src/mapi/u_current.c
> +++ b/src/mapi/u_current.c
> @@ -103,18 +103,18 @@ __thread struct mapi_table *u_current_table
>      __attribute__((tls_model("initial-exec")))
>      = (struct mapi_table *) table_noop_array;
>
> -__thread void *u_current_user
> +__thread void *u_current_context
>      __attribute__((tls_model("initial-exec")));
>
>  #else
>
>  struct mapi_table *u_current_table =
>     (struct mapi_table *) table_noop_array;
> -void *u_current_user;
> +void *u_current_context;
>
>  #ifdef THREADS
>  struct u_tsd u_current_table_tsd;
> -static struct u_tsd u_current_user_tsd;
> +static struct u_tsd u_current_context_tsd;
>  static int ThreadSafe;
>  #endif /* THREADS */
>
> @@ -127,7 +127,7 @@ u_current_destroy(void)
>  {
>  #if defined(THREADS) && defined(_WIN32)
>     u_tsd_destroy(&u_current_table_tsd);
> -   u_tsd_destroy(&u_current_user_tsd);
> +   u_tsd_destroy(&u_current_context_tsd);
>  #endif
>  }
>
> @@ -138,7 +138,7 @@ static void
>  u_current_init_tsd(void)
>  {
>     u_tsd_init(&u_current_table_tsd);
> -   u_tsd_init(&u_current_user_tsd);
> +   u_tsd_init(&u_current_context_tsd);
>  }
>
>  /**
> @@ -169,7 +169,7 @@ u_current_init(void)
>     else if (knownID != u_thread_self()) {
>        ThreadSafe = 1;
>        u_current_set(NULL);
> -      u_current_set_user(NULL);
> +      u_current_set_context(NULL);
>     }
>     u_mutex_unlock(ThreadCheckMutex);
>  }
> @@ -191,17 +191,17 @@ u_current_init(void)
>   * void from the real context pointer type.
>   */
>  void
> -u_current_set_user(const void *ptr)
> +u_current_set_context(const void *ptr)
>  {
>     u_current_init();
>
>  #if defined(GLX_USE_TLS)
> -   u_current_user = (void *) ptr;
> +   u_current_context = (void *) ptr;
>  #elif defined(THREADS)
> -   u_tsd_set(&u_current_user_tsd, (void *) ptr);
> -   u_current_user = (ThreadSafe) ? NULL : (void *) ptr;
> +   u_tsd_set(&u_current_context_tsd, (void *) ptr);
> +   u_current_context = (ThreadSafe) ? NULL : (void *) ptr;
>  #else
> -   u_current_user = (void *) ptr;
> +   u_current_context = (void *) ptr;
>  #endif
>  }
>
> @@ -211,16 +211,16 @@ u_current_set_user(const void *ptr)
>   * void to the real context pointer type.
>   */
>  void *
> -u_current_get_user_internal(void)
> +u_current_get_context_internal(void)
>  {
>  #if defined(GLX_USE_TLS)
> -   return u_current_user;
> +   return u_current_context;
>  #elif defined(THREADS)
>     return (ThreadSafe)
> -      ? u_tsd_get(&u_current_user_tsd)
> -      : u_current_user;
> +      ? u_tsd_get(&u_current_context_tsd)
> +      : u_current_context;
>  #else
> -   return u_current_user;
> +   return u_current_context;
>  #endif
>  }
>
> diff --git a/src/mapi/u_current.h b/src/mapi/u_current.h
> index f9cffd8..6709af2 100644
> --- a/src/mapi/u_current.h
> +++ b/src/mapi/u_current.h
> @@ -11,14 +11,14 @@
>
>  #ifdef GLX_USE_TLS
>  #define u_current_table _glapi_tls_Dispatch
> -#define u_current_user _glapi_tls_Context
> +#define u_current_context _glapi_tls_Context
>  #else
>  #define u_current_table _glapi_Dispatch
> -#define u_current_user _glapi_Context
> +#define u_current_context _glapi_Context
>  #endif
>
>  #define u_current_get_internal _glapi_get_dispatch
> -#define u_current_get_user_internal _glapi_get_context
> +#define u_current_get_context_internal _glapi_get_context
>
>  #define u_current_table_tsd _gl_DispatchTSD
>
> @@ -33,13 +33,13 @@ struct mapi_table;
>  extern __thread struct mapi_table *u_current_table
>      __attribute__((tls_model("initial-exec")));
>
> -extern __thread void *u_current_user
> +extern __thread void *u_current_context
>      __attribute__((tls_model("initial-exec")));
>
>  #else /* GLX_USE_TLS */
>
>  extern struct mapi_table *u_current_table;
> -extern void *u_current_user;
> +extern void *u_current_context;
>
>  #endif /* GLX_USE_TLS */
>
> @@ -58,10 +58,10 @@ struct mapi_table *
>  u_current_get_internal(void);
>
>  void
> -u_current_set_user(const void *ptr);
> +u_current_set_context(const void *ptr);
>
>  void *
> -u_current_get_user_internal(void);
> +u_current_get_context_internal(void);
>
>  static INLINE const struct mapi_table *
>  u_current_get(void)
> @@ -75,12 +75,12 @@ u_current_get(void)
>  }
>
>  static INLINE const void *
> -u_current_get_user(void)
> +u_current_get_context(void)
>  {
>  #ifdef GLX_USE_TLS
> -   return u_current_user;
> +   return u_current_context;
>  #else
> -   return likely(u_current_user) ? u_current_user : u_current_get_user_internal();
> +   return likely(u_current_context) ? u_current_context : u_current_get_context_internal();
>  #endif
>  }
>
> --
> 1.7.10.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev



-- 
olv at LunarG.com