Changeset: 00aa2e1f94b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00aa2e1f94b7
Modified Files:
monetdb5/mal/mal_dataflow.c
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (37 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
@@ -124,6 +124,7 @@ q_create(int sz, const char *name)
return NULL;
}
+ (void) name; /* in case MT_LOCK_TRACE is not enabled in gdk_system.h */
MT_lock_init(&q->l, name);
MT_sema_init(&q->s, 0, name);
return q;
@@ -132,6 +133,7 @@ q_create(int sz, const char *name)
static void
q_destroy(Queue *q)
{
+ assert(q);
MT_lock_destroy(&q->l);
MT_sema_destroy(&q->s);
GDKfree(q->data);
@@ -143,6 +145,8 @@ q_destroy(Queue *q)
static void
q_enqueue_(Queue *q, FlowEvent d)
{
+ assert(q);
+ assert(d);
if (q->last == q->size) {
q->size <<= 1;
q->data = (FlowEvent*) GDKrealloc(q->data, sizeof(FlowEvent) *
q->size);
@@ -173,6 +177,8 @@ q_requeue_(Queue *q, FlowEvent d)
{
int i;
+ assert(q);
+ assert(d);
if (q->last == q->size) {
/* enlarge buffer */
q->size <<= 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
