Minor changes to the trace macros.

Source/queue.c

@@ -314,6 +314,8 @@ size_t xQueueSizeInBytes;
 		mutual exclusion is required to test the pxMutexHolder variable. */
 		if( pxMutex->pxMutexHolder == xTaskGetCurrentTaskHandle() )
 		{
+			traceGIVE_MUTEX_RECURSIVE( pxMutex );
+
 			/* uxRecursiveCallCount cannot be zero if pxMutexHolder is equal to
 			the task handle, therefore no underflow check is required.  Also,
 			uxRecursiveCallCount is only modified by the mutex holder, and as
@@ -330,8 +332,6 @@ size_t xQueueSizeInBytes;
 			}
 
 			xReturn = pdPASS;			
-
-			traceGIVE_MUTEX_RECURSIVE( pxMutex );
 		}
 		else
 		{
@@ -356,6 +356,8 @@ size_t xQueueSizeInBytes;
 		/* Comments regarding mutual exclusion as per those within
 		xQueueGiveMutexRecursive(). */
 
+		traceTAKE_MUTEX_RECURSIVE( pxMutex );
+
 		if( pxMutex->pxMutexHolder == xTaskGetCurrentTaskHandle() )
 		{
 			( pxMutex->uxRecursiveCallCount )++;
@@ -373,8 +375,6 @@ size_t xQueueSizeInBytes;
 			}
 		}		
 
-		traceTAKE_MUTEX_RECURSIVE( pxMutex );
-
 		return xReturn;
 	}
 

Source/tasks.c

@@ -1414,6 +1414,8 @@ inline void vTaskIncrementTick( void )
 
 void vTaskSwitchContext( void )
 {
+	traceTASK_SWITCHED_OUT();
+
 	if( uxSchedulerSuspended != ( unsigned portBASE_TYPE ) pdFALSE )
 	{
 		/* The scheduler is currently suspended - do not allow a context