sort: omit unnecessary mutex unlock+lock; simplify heap access

* src/sort.c (queue_pop): Omit unnecessary unlock+lock after
pthread_cond_wait returns.  Don't access "count" member of the
heap; any efficiency gains should be quite minor, the access
complicates this code, and "count" should be private anyway.
This commit is contained in:
Paul R. Eggert authored and Paul Eggert committed 2010-07-25 20:55:21 -07:00
1 parent 1563ffd2b1
commit de949fc12d
1 file changed
+5 -14
+5 -14
View File
@@ -3173,20 +3173,11 @@ queue_insert (struct merge_node_queue *queue, struct merge_node *node)
static inline struct merge_node *
queue_pop (struct merge_node_queue *queue)
{
struct merge_node *node = NULL;
while (!node)
{
pthread_mutex_lock (&queue->mutex);
if (queue->priority_queue->count)
node = heap_remove_top (queue->priority_queue);
else
{
/* Go into conditional wait if no NODE is immediately available. */
pthread_cond_wait (&queue->cond, &queue->mutex);
}
pthread_mutex_unlock (&queue->mutex);
}
struct merge_node *node;
pthread_mutex_lock (&queue->mutex);
while (! (node = heap_remove_top (queue->priority_queue)))
pthread_cond_wait (&queue->cond, &queue->mutex);
pthread_mutex_unlock (&queue->mutex);
lock_node (node);
node->queued = false;
return node;