bwm-tools-devel Mailing List for Bandwidth Management Tools (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: nkukard
Date: 2005-01-26 18:29:04 +0200 (Wed, 26 Jan 2005)
New Revision: 65

Modified:
   trunk/bwmd/flow.c
Log:
* Updated the way packets are processed in prioritization, packets are now processed fairly


Modified: trunk/bwmd/flow.c
===================================================================

--- trunk/bwmd/flow.c	2005-01-21 11:38:31 UTC (rev 64)
+++ trunk/bwmd/flow.c	2005-01-26 16:29:04 UTC (rev 65)
@@ -177,15 +177,17 @@
 
 
 // Function to process a flow queue, returns number of packets accepted
-static int processPktQueue(struct runnerData_t *runnerData, struct pktQueue_t *pktQueue)
+static unsigned int processPktQueue(struct runnerData_t *runnerData, struct pktQueue_t *pktQueue, 
+		unsigned int pkts)
 {
 	int status;
 	GList *packets;
 	int exceeded = 0;
 	int i;
 	// Differences in queue when we done
-	int acceptLen = 0, queuedLen = 0;
-	int acceptSize = 0, queuedSize = 0;
+	unsigned int acceptLen = 0, queuedLen = 0;
+	unsigned int acceptSize = 0, queuedSize = 0;
+	unsigned int processed;
 	
 
 	// Lock, hijack packets, unlock
@@ -194,8 +196,8 @@
 	pktQueue->packets = NULL;
 	g_mutex_unlock(pktQueue->lock);
 
-	// Check that we within our boundaries	
-	while (!exceeded)
+	// Check that we within our boundaries and will not accept too many packets
+	while (!exceeded && pkts > (acceptLen + queuedLen))
 	{
 		struct packet_t *packet;
 		GList *pktQueueItem;
@@ -322,6 +324,7 @@
 				{
 					float delta;	
 					
+					
 					// Get the fraction of time passed since last update, predict below to 1 second
 					delta = flow->curThroughputAge / 1000000.0;
 
@@ -454,7 +457,9 @@
 
 	g_mutex_unlock(pktQueue->lock);
 
-	return acceptLen;
+	processed = acceptLen + queuedLen;
+	
+	return processed;
 }
 
 
@@ -464,19 +469,6 @@
 {
 	struct runnerData_t *runnerData = (struct runnerData_t*) data;
 
-
-	// Our processing function
-	void processQueue(void *data, void *user_data)
-	{
-		struct pktQueue_t *pktQueue = (struct pktQueue_t*) data;
-		struct runnerData_t *aRunnerData = (struct runnerData_t*) user_data;
-
-
-		// Check if we found a flow with a queue
-		// NOTE: The function below returns the number of packets processed
-		processPktQueue(aRunnerData,pktQueue);
-	}
-
 	
 	logMessage(LOG_DEBUG, "Flow runner started...\n");
 
@@ -485,7 +477,7 @@
 	{
 		GTimeVal mytime;
 		unsigned char i;
-		GList *queueChangeList = NULL;
+		GList *queueChangeList[NUM_PRIO_BANDS];
 
 
 		g_mutex_lock(runnerData->bandSignalLock);
@@ -502,11 +494,13 @@
 		// Hijack the queue change list items
 		for (i = 0; i < NUM_PRIO_BANDS; i++)
 		{
+			queueChangeList[i] = NULL;
+
 			// Zero runner data if it is non-NULL
 			if (runnerData->queueChangeList[i])
 			{
 				// Copy list item over
-				queueChangeList = g_list_concat(queueChangeList,runnerData->queueChangeList[i]);
+				queueChangeList[i] = g_list_concat(queueChangeList[i],runnerData->queueChangeList[i]);
 				// Blank used list... copy uses directly
 				runnerData->queueChangeList[i] = NULL;
 			}
@@ -518,10 +512,31 @@
 
 		
 		// Process list if it is non-NULL
-		if (queueChangeList)
+		for (i = 0; i < NUM_PRIO_BANDS; i++)
 		{
-			g_list_foreach(queueChangeList,processQueue,runnerData);
-			g_list_free(queueChangeList);
+			// Loop while there are still items to be processed
+			while (queueChangeList[i])
+			{
+				GList *item = g_list_first(queueChangeList[i]);
+
+				// Loop with all queues that need items to be processed
+				while (item)
+				{
+					struct pktQueue_t *pktQueue;
+					unsigned int processed = 0;
+
+					// Just a harmless error check
+					if ((pktQueue = (struct pktQueue_t*) item->data))
+						processed = processPktQueue(runnerData,pktQueue,1);  // Process 1 packet at a time
+
+					// Next queue
+					item = g_list_next(item);
+					
+					// If nothing was processed remove ourselves from the change list
+					if (!processed)
+						queueChangeList[i] = g_list_remove(queueChangeList[i],(void *) pktQueue);
+				}
+			}
 		}
 	}
 





2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (11)
2005	Jan (52)	Feb	Mar	Apr (6)	May (1)	Jun (2)	Jul (1)	Aug	Sep (1)	Oct	Nov	Dec
2006	Jan	Feb (3)	Mar (9)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec

bwm-tools-devel Mailing List for Bandwidth Management Tools (Page 2)

bwm-tools-devel — Developer Mailing List