/trunk/code/projects/libwireless/lib/queue.c - Diff - Colony - Robotics Club

Revision 309

Added by Eugene Marinelli over 16 years ago

Brian committing from Eugene's account - Fixed Justin's port code. Wireless no longer needs gtkterm open to work with the baud rate. Untested on mac. Queue is thread safe on the computer (not robot). You may need to unplug and replug the xbee for it to work.

     #include <stdlib.h>
     #include <stdio.h>
     #ifndef ROBOT
     #include <pthread.h>
     #endif
     /**
      * @struct node_def
-...
     	q->head = NULL;
     	q->size = 0;
     	#ifndef ROBOT
     	pthread_mutex_init(&(q->lock), NULL);
     	#endif
     	return q;
+    }
-...
     		free(t);
     		t = t2;
+    	}
     	#ifndef ROBOT
     	pthread_mutex_destroy(&(q->lock));
     	#endif
     	free(q);
+    }
-...
      * @param q the queue to add an element to
      * @param item the item to add to the queue
      **/
     void queue_add(Queue* q, void* item)
     int queue_add(Queue* q, void* item)
+    {
     	#ifndef ROBOT
     	pthread_mutex_lock(&(q->lock));
     	#endif
     	Node* n = (Node*)malloc(sizeof(Node));
     	if (n == NULL)
+    	{
     		#ifndef ROBOT
     		pthread_mutex_unlock(&(q->lock));
     		#endif
     		return -1;
+    	}
     	n->val = item;
     	n->next = NULL;
-...
+    	}
     	else
+    	{
     		q->tail->next = n;
     		q->tail = n;
+    	}
     	q->size++;
     	#ifndef ROBOT
     	pthread_mutex_unlock(&(q->lock));
     	#endif
     	return 0;
+    }
     /**
-...
      **/
     void* queue_remove(Queue* q)
+    {
     	#ifndef ROBOT
     	pthread_mutex_lock(&(q->lock));
     	#endif
     	Node* first = q->head;
     	if (first == NULL)
+    	{
     		WL_DEBUG_PRINT("Attempting to remove item \
     			from empty queue.\r\n");
     		WL_DEBUG_PRINT_INT(queue_size(q));
     		#ifndef ROBOT
     		pthread_mutex_unlock(&(q->lock));
     		#endif
     		return NULL;
+    	}
     	void* ret = first->val;
     	q->head = first->next;
-...
     		q->tail = NULL;
     	free(first);
     	q->size--;
     	#ifndef ROBOT
     	pthread_mutex_unlock(&(q->lock));
     	#endif
     	return ret;
+    }
-...
      **/
     void queue_remove_all(Queue* q, void* item)
+    {
     	#ifndef ROBOT
     	pthread_mutex_lock(&(q->lock));
     	#endif
     	Node* curr = q->head;
     	Node* prev = NULL;
-...
     			prev = curr;
     		curr = next;
+    	}
     	#ifndef ROBOT
     	pthread_mutex_unlock(&(q->lock));
     	#endif
+    }
     /**
-...
      **/
     int queue_size(Queue* q)
+    {
     	return q->size;
     	int size;
     	#ifndef ROBOT
     	pthread_mutex_lock(&(q->lock));
     	#endif
     	size = q->size;
     	#ifndef ROBOT
     	pthread_mutex_unlock(&(q->lock));
     	#endif
     	return size;
+    }
     /**
-...
      **/
     int queue_is_empty(Queue* q)
+    {
     	return q->size == 0;
     	int result;
     	#ifndef ROBOT
     	pthread_mutex_lock(&(q->lock));
     	#endif
     	result = q->size == 0;
     	#ifndef ROBOT
     	pthread_mutex_unlock(&(q->lock));
     	#endif
     	return result;
+    }

Also available in: Unified diff

Project

General

Profile

Colony

Revision 309