MonetDB: Feb2013 - q_dequeue(): assess q->last even for assertio...

[Stefan Manegold]

Changeset: 87e338368984 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=87e338368984
Modified Files:
        monetdb5/mal/mal_dataflow.c
Branch: Feb2013
Log Message:

q_dequeue(): assess q->last even for assertion only inside lock

This appears to avoid some assertions /segfault that occured on
Sun/Solaris with the default branch and optimization enabled.
Stiil, considering it a bugfix, and thus checking it in to the
Feb2013 branch.


diffs (13 lines):

diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -194,8 +194,8 @@ q_dequeue(queue *q)
        void *r = NULL;
 
        MT_sema_down(&q->s, "q_dequeue");
+       MT_lock_set(&q->l, "q_dequeue");
        assert(q->last);
-       MT_lock_set(&q->l, "q_dequeue");
        if (q->last > 0) {
                /* LIFO favors garbage collection */
                r = q->data[--q->last];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list