From 038d2607ab759638217ded3bd1b232d389975af5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 27 Mar 2010 08:58:59 -0600
Subject: mesa: fix deadlock in _mesa_HashFindFreeKeyBlock()

Fixes fd.o bug 27340.
(cherry picked from commit 8fe3b3f66ae57a1a6eca7f6dcb0455e14ad92075)
---
 src/mesa/main/hash.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 975775469d9..f4af3fdcf70 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -127,8 +127,8 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
  * 
  * \return pointer to user's data or NULL if key not in table
  */
-void *
-_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
+static INLINE void *
+_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
 {
    GLuint pos;
    const struct HashEntry *entry;
@@ -137,19 +137,26 @@ _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
    assert(key);
 
    pos = HASH_FUNC(key);
-   _glthread_LOCK_MUTEX(table->Mutex);
    entry = table->Table[pos];
    while (entry) {
       if (entry->Key == key) {
-         _glthread_UNLOCK_MUTEX(table->Mutex);
          return entry->Data;
       }
       entry = entry->Next;
    }
-   _glthread_UNLOCK_MUTEX(table->Mutex);
    return NULL;
 }
 
+void *
+_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
+{
+   void *res;
+   assert(table);
+   _glthread_LOCK_MUTEX(table->Mutex);
+   res = _mesa_HashLookup_unlocked(table, key);
+   _glthread_UNLOCK_MUTEX(table->Mutex);
+   return res;
+}
 
 
 /**
@@ -447,7 +454,7 @@ _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
       GLuint freeStart = 1;
       GLuint key;
       for (key = 1; key != maxKey; key++) {
-	 if (_mesa_HashLookup(table, key)) {
+	 if (_mesa_HashLookup_unlocked(table, key)) {
 	    /* darn, this key is already in use */
 	    freeCount = 0;
 	    freeStart = key+1;
-- 
cgit v1.2.1


From 9903d09f82c525690cd016e7747ba2fe96c6468f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 27 Mar 2010 08:59:17 -0600
Subject: mesa: move/update hash function comments

(cherry picked from commit 535742d75f0096b22d1b8ff203ae561167af18f7)
---
 src/mesa/main/hash.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index f4af3fdcf70..b624e6ecac1 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -120,12 +120,8 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
 
 
 /**
- * Lookup an entry in the hash table.
- * 
- * \param table the hash table.
- * \param key the key.
- * 
- * \return pointer to user's data or NULL if key not in table
+ * Lookup an entry in the hash table, without locking.
+ * \sa _mesa_HashLookup
  */
 static INLINE void *
 _mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
@@ -147,6 +143,15 @@ _mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
    return NULL;
 }
 
+
+/**
+ * Lookup an entry in the hash table.
+ * 
+ * \param table the hash table.
+ * \param key the key.
+ * 
+ * \return pointer to user's data or NULL if key not in table
+ */
 void *
 _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
 {
-- 
cgit v1.2.1


From a6a4613135dc0b93012d3a2b1abcf69f772e4214 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun, 28 Mar 2010 16:31:08 -0700
Subject: mesa: set version string to 7.8

Also set the correct release date.
---
 src/mesa/main/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 23d74ee2c97..2e1d70c461a 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 8
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.8-rc2"
+#define MESA_VERSION_STRING "7.8"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.1