PERFORCE change 181557 for review

[Alexandre Fiveg]

http://p4web.freebsd.org/@@181557?ac=10

Change 181557 by afiveg at ringmap-2 on 2010/07/29 14:43:22

	Related to the previously submit

Affected files ...

.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#26 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#11 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#10 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#9 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#10 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#40 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#40 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#10 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#21 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#22 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#16 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#9 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#9 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#11 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#11 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#11 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#9 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#26 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#11 (text+ko) ====

@@ -1418,13 +1418,6 @@
 
 	++que->irqs;
 
-#ifdef RINGMAP
-	struct capt_object *co = NULL; 
-	IXGBE_RX_LOCK(que->rxr);
-	adapter->rm->funcs->delayed_isr(que);
-	IXGBE_RX_UNLOCK(que->rxr);
-#endif
-
 	more_rx = ixgbe_rxeof(que, adapter->rx_process_limit);
 
 	IXGBE_TX_LOCK(txr);
@@ -1433,19 +1426,6 @@
 
 	more_rx = ixgbe_rxeof(que, adapter->rx_process_limit);
 
-#ifdef RINGMAP
-	IXGBE_RX_LOCK(que->rxr);
-	adapter->rm->funcs->sync_head(que);
-	
-	/* TODO: Only our co not all */
-	SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
-		if (RING_NOT_EMPTY(co->ring)){
-			wakeup(co->ring);
-		}
-	}
-	IXGBE_RX_UNLOCK(que->rxr);
-#endif 
-
 	/* Do AIM now? */
 
 	if (ixgbe_enable_aim == FALSE)
@@ -3788,12 +3768,6 @@
 		/* Update descriptor */
 		rxr->rx_base[j].read.pkt_addr = htole64(pseg[0].ds_addr);
 
-//#ifdef RINGMAP
-//#if (__RINGMAP_DEB)
-//		printf("[%s] pkt phys addr [%d] : 0x%llX\n",
-//				__func__, j, htole64(pseg[0].ds_addr));
-//#endif 
-//#endif 
 	}
 
 
@@ -3966,6 +3940,7 @@
 			reta = (reta << 8) | (j * 0x11);
 #else 
 #ifdef DEFAULT_QUEUE
+			/* Here we will set default queue for all incomming pckts */
 			reta = (reta << 8) | (DEFAULT_QUEUE * 0x11);
 #else 
 			reta = (reta << 8) | (j * 0x11);

==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#40 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#40 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#21 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#22 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#16 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#9 (text+ko) ====