From: Brian Paul <brianp@vmware.com>
Date: Wed, 5 Mar 2014 14:47:41 +0000 (-0700)
Subject: glapi: replace 'user' with 'context' in u_current.[ch] code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=280e0657072459804896e4c05d45d1cf8bfc97c4;p=mesa.git

glapi: replace 'user' with 'context' in u_current.[ch] code

To make the functions more understandable.

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

diff --git a/src/mapi/glapi/glapi.c b/src/mapi/glapi/glapi.c
index 3a0b638f73e..231bdad4634 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 925caf36c08..d345f2abf31 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 07213380dc4..72190feb9ff 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 f9cffd8c3d0..6709af28932 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
 }