Changeset 121 for trunk/src

Timestamp:

07/30/10 16:12:20 (13 years ago)

Author:

andreu

Message:

add multisampling for matrix and aggregation mode based on router ID

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (6 diffs)
• get_conf.c (modified) (1 diff)
• renetcol.c (modified) (1 diff)
• renetcolAgg.c (modified) (2 diffs)
• renetcolAgg.h (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -995 +995 @@
                   }
 #else
+
                   if (myPtrs->currentRouterPtr->sampled != 0 ){
                     /* IN ("traffic to the prefix/subnet")  */
@@ -1022 +1023 @@
                 res2 = bsearch(&prefixKey, V4PTab, nbPV4, 
                                sizeof(struct PrefixV4), prefGlobalCmp);
-                if (res2!=NULL){                
+                if (res2!=NULL){
+#if defined(MULTISAMPLING)
+                  if (myPtrs->currentRouterPtr->sampled != res2->sampling ){
+                    ((struct POP *)((myPtrs->matrixPOP)
+                                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                                    +((res2->routerNb))))->pktsNb += agCache.pkts*myPtrs->currentRouterPtr->sampled/res2->sampling;
+                    ((struct POP *)((myPtrs->matrixPOP)
+                                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                                    +((res2->routerNb))))->bytesNb += agCache.bytes*myPtrs->currentRouterPtr->sampled/res2->sampling;
+                    ((struct POP *)((myPtrs->matrixPOP)
+                                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                                    +((res2->routerNb))))->flowNb++;
+                  } else {
+                    ((struct POP *)((myPtrs->matrixPOP)
+                                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                                    +((res2->routerNb))))->pktsNb += agCache.pkts;
+                    ((struct POP *)((myPtrs->matrixPOP)
+                                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                                    +((res2->routerNb))))->bytesNb += agCache.bytes; 
+                    ((struct POP *)((myPtrs->matrixPOP)
+                                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                                    +((res2->routerNb))))->flowNb++;
+                  }
+#else
                   ((struct POP *)((myPtrs->matrixPOP)
                                   +((res->routerNb)*ROUTER_INDEX_MAX)
@@ -1032 +1056 @@
                                   +((res->routerNb)*ROUTER_INDEX_MAX)
                                   +((res2->routerNb))))->flowNb++; 
-                } else {
+#endif
+                } else { 
+                  /* here we'll make the choice that in multisampling mode,
+                   * the virtual POP that represent the reste of world is 
+                   * in 1:10 packets mode */
+#if defined(MULTISAMPLING)
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                    +((ROUTER_INDEX_MAX-1))))->pktsNb += agCache.pkts*myPtrs->currentRouterPtr->sampled/10; 
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                    +((ROUTER_INDEX_MAX-1))))->bytesNb += agCache.bytes*myPtrs->currentRouterPtr->sampled/10; 
+                  (
+                   ((struct POP *)(myPtrs->matrixPOP)
+                    +((res->routerNb)*ROUTER_INDEX_MAX)
+                    +((ROUTER_INDEX_MAX-1))))->flowNb++;
+#else
                   (
                    ((struct POP *)(myPtrs->matrixPOP)
@@ -1044 +1086 @@
                    ((struct POP *)(myPtrs->matrixPOP)
                     +((res->routerNb)*ROUTER_INDEX_MAX)
-                    +((ROUTER_INDEX_MAX-1))))->flowNb++; 
+                    +((ROUTER_INDEX_MAX-1))))->flowNb++;
+#endif          
                 }
                 /* end interpop matrix accounting */
@@ -1140 +1183 @@
 #if defined(IPV4AGGIDR) 
               if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
+#if defined(MULTISAMPLING)
+                if (myPtrs->currentRouterPtr->sampled != res->sampling ){
+                  res->bytesNbIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  res->pktsNbIN += agCache.pkts*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else {
+                    res->fourthCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  }
+                }else{
+                  res->bytesNbIN += agCache.bytes;
+                  res->pktsNbIN += agCache.pkts;
+                  (res->flowNbIN)++;
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSIN += agCache.bytes;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSIN += agCache.bytes;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSIN += agCache.bytes;
+                  } else {
+                    res->fourthCoSIN += agCache.bytes;
+                  }
+                }
+#else
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
                   /* IN ("traffic to the prefix")  */
@@ -1155 +1226 @@
                   }
                 }
+#endif
               }
               if (res->sampling == 0 

trunk/src/get_conf.c

@@ -251 +251 @@
     {
 #if defined(IPV4AGGIDR)
+#if defined(MULTISAMPLING)
+      sscanf(prefixStrTab[i],"%hu.%hu.%hu.%hu/%hu-%hu %hu\n",
+             &n0,&n1,&n2,&n3,&n4,&n5,&n6);
+#else
       sscanf(prefixStrTab[i],"%hu.%hu.%hu.%hu/%hu-%hu\n",
              &n0,&n1,&n2,&n3,&n4,&n5);
+#endif
 #endif
 #if defined(IPV4AGGIDSNMP)

trunk/src/renetcol.c

@@ -868 +868 @@
 
   if ((ethernetPacket = pcap_next(myPcapHandle, &myPcapHeader)) == NULL) {
+    fprintf (stderr, "IP: %llu , UDP: %llu, NDEv9: %llu, drops: %llu, FS: %llu, Flows: %llu, realFl: %llu Diff:%llu\n",
+             myPtrs.currentMIB->ipPacketNb,
+             myPtrs.currentMIB->udpPacketNb,
+             myPtrs.currentMIB->v9PacketNb,
+             myPtrs.currentMIB->v9UnSeqNb,
+             myPtrs.currentMIB->flowSetNb,
+             myPtrs.currentMIB->flowNb,
+             myPtrs.currentMIB->realFlowNb,
+             myPtrs.currentMIB->flowNb - myPtrs.currentMIB->realFlowNb
+             );
     pcap_close(myPcapHandle);
     exit(0);

trunk/src/renetcolAgg.c

@@ -4 +4 @@
  * Authors: ANDREU Francois-Xavier 
  *
- * Copyright (C) 2007 - 2009 GIP RENATER 
+ * Copyright (C) 2007 - 2010 GIP RENATER 
  */
 
@@ -29 +29 @@
  * When your system is too fast and the number of your subnet too big
  * (> 1024), the create and update process can be too fast and before the 
- * creation end the maximum number of files which can be opened for one process
- * in the same time is reached. So we must temporize.
+ * end of creation. So the maximum number of files which can be opened for one
+ * process in the same time is reached and we must temporize.
  */
 

trunk/src/renetcolAgg.h

@@ -4 +4 @@
  * Authors: ANDREU Francois-Xavier 
  *
- * Copyright (C) 2005 2006 2007 GIP RENATER 
+ * Copyright (C) 2005-2010 GIP RENATER 
  */