add instrumentation for allocation profiling

Author: sflow

src/Linux/hsflowd.c

@@ -181,8 +181,16 @@ extern "C" {
     deleteAdaptorFromHT(sp->adaptorsByMac, ad, "byMac");
     if(ad->peer_ifIndex)
       deleteAdaptorFromHT(sp->adaptorsByPeerIndex, ad, "byPeerIndex");
-    if(freeFlag)
+    if(freeFlag) {
+      HSPAdaptorNIO *nio = ADAPTOR_NIO(ad);
+      if(nio->sampler)
+	myDebug(1, "deleteAdaptor: adaptor %s has sFlow sampler", ad->deviceName);
+      if(nio->poller)
+	myDebug(1, "deleteAdaptor: adaptor %s has sFlow poller", ad->deviceName);
+      if(nio->deviceAlias)
+	myDebug(1, "deleteAdaptor: adaptor %s has deviceAlias", ad->deviceName);
       adaptorFree(ad);
+    }
   }
 
   int deleteMarkedAdaptors(HSP *sp, UTHash *adaptorHT, int freeFlag) {
@@ -299,16 +307,24 @@ extern "C" {
     -----------------___________________________------------------
   */
 
+  static __thread int th_n_localIPs = 0;
+
   HSPLocalIP *localIPNew(SFLAddress *ipAddr, char *dev) {
     HSPLocalIP *lip = my_calloc(sizeof(HSPLocalIP));
     lip->ipAddr = *ipAddr;
     lip->dev = my_strdup(dev);
+    th_n_localIPs++;
     return lip;
   }
 
   void localIPFree(HSPLocalIP *lip) {
     my_free(lip->dev);
     my_free(lip);
+    th_n_localIPs--;
+  }
+
+  int localIPInstances(void) {
+    return th_n_localIPs;
   }
 
   /*_________________---------------------------__________________
@@ -644,6 +660,10 @@ extern "C" {
       installSFlowSettings(sp, sp->sFlowSettings);
     }
 
+    myDebug(1, "instances: adaptors=%d, localIP=%d",
+	    adaptorInstances(),
+	    localIPInstances());
+    
     if(ad_added || ad_removed || ad_cameup || ad_wentdown || ad_changed) {
       // test for switch ports
       configSwitchPorts(sp); // in readPackets.c

src/Linux/hsflowd.h

@@ -308,8 +308,6 @@ extern "C" {
   // cache nio counters per adaptor
   typedef struct _HSPAdaptorNIO {
     SFLAddress ipAddr;
-    UTHash *ip4Addrs;
-    UTHash *ip6Addrs;
     EnumHSPDevType devType;
     bool up:1;
     bool loopback:1;
@@ -829,6 +827,7 @@ extern "C" {
   // local IPs
   HSPLocalIP *localIPNew(SFLAddress *ipAddr, char *dev);
   void localIPFree(HSPLocalIP *lip);
+  int localIPInstances(void);
 
   // readPackets.c
 #define HSP_SAMPLEOPT_BRIDGE      0x0001

src/Linux/util.c

@@ -1247,6 +1247,8 @@ extern "C" {
     ----------------___________________________------------------
   */
 
+  static __thread int th_n_adaptors=0;
+  
   SFLAdaptor *adaptorNew(char *dev, u_char *macBytes, size_t userDataSize, uint32_t ifIndex) {
     SFLAdaptor *ad = (SFLAdaptor *)my_calloc(sizeof(SFLAdaptor));
     ad->deviceName = my_strdup(dev);
@@ -1256,6 +1258,7 @@ extern "C" {
       memcpy(ad->macs[0].mac, macBytes, 6);
       ad->num_macs = 1;
     }
+    th_n_adaptors++;
     return ad;
   }
 
@@ -1275,9 +1278,14 @@ extern "C" {
       if(ad->deviceName) my_free(ad->deviceName);
       if(ad->userData) my_free(ad->userData);
       my_free(ad);
+      th_n_adaptors--;
     }
   }
 
+  int adaptorInstances(void) {
+    return th_n_adaptors;
+  }
+
   /*________________---------------------------__________________
     ________________      adaptorList          __________________
     ----------------___________________________------------------

src/Linux/util.h

@@ -226,6 +226,7 @@ extern "C" {
   SFLAdaptor *adaptorNew(char *dev, u_char *macBytes, size_t userDataSize, uint32_t ifIndex);
   int adaptorEqual(SFLAdaptor *ad1, SFLAdaptor *ad2);
   void adaptorFree(SFLAdaptor *ad);
+  int adaptorInstances(void);
 
   // SFLAdaptorList
   SFLAdaptorList *adaptorListNew(void);