From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Thu, 22 May 2008 11:33:17 +0000 (+0900)
Subject: pipebuffer: Don't retry allocating in slab suballocator.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bd4eec0561fb021849ac4047fdbf40a616fb68b3;p=mesa.git

pipebuffer: Don't retry allocating in slab suballocator.

In pipebuffer, fencing is done at on a level above sub-allocation, so no
matter how many times slab allocator retries no buffer will be freed. The
pipebuffer fencing implemention already retries allocating.
---

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index b931455056e..45ba158a4d9 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -47,9 +47,6 @@
 #include "pb_bufmgr.h"
 
 
-#define DRI_SLABPOOL_ALLOC_RETRIES 100
-
-
 struct pb_slab;
 
 struct pb_slab_buffer
@@ -313,7 +310,6 @@ pb_slab_manager_create_buffer(struct pb_manager *_mgr,
    static struct pb_slab_buffer *buf;
    struct pb_slab *slab;
    struct list_head *list;
-   int count = DRI_SLABPOOL_ALLOC_RETRIES;
 
    /* check size */
    assert(size == mgr->bufSize);
@@ -331,23 +327,14 @@ pb_slab_manager_create_buffer(struct pb_manager *_mgr,
    /* XXX: check for compatible buffer usage too? */
    
    _glthread_LOCK_MUTEX(mgr->mutex);
-   while (mgr->slabs.next == &mgr->slabs && count > 0) {
-      if (mgr->slabs.next != &mgr->slabs)
-	 break;
-
-      _glthread_UNLOCK_MUTEX(mgr->mutex);
-      if (count != DRI_SLABPOOL_ALLOC_RETRIES)
-	 util_time_sleep(1);
-      _glthread_LOCK_MUTEX(mgr->mutex);
+   if (mgr->slabs.next == &mgr->slabs) {
       (void) pb_slab_create(mgr);
-      count--;
+      if (mgr->slabs.next == &mgr->slabs) {
+	 _glthread_UNLOCK_MUTEX(mgr->mutex);
+	 return NULL;
+      }
    }
-
    list = mgr->slabs.next;
-   if (list == &mgr->slabs) {
-      _glthread_UNLOCK_MUTEX(mgr->mutex);
-      return NULL;
-   }
    slab = LIST_ENTRY(struct pb_slab, list, head);
    if (--slab->numFree == 0)
       LIST_DELINIT(list);