Garbage load spread out

sev/exe/sev_server/src/sev_server.cpp

@@ -40,6 +40,7 @@
 #include "pwr_baseclasses.h"
 
 #define sev_cGarbageInterval 120
+#define sev_cGarbageCycle 86400
 
 
 static int sev_comp_item(tree_sTable *tp, tree_sNode *x, tree_sNode *y)
@@ -68,6 +69,26 @@ static int sev_comp_item(tree_sTable *tp, tree_sNode *x, tree_sNode *y)
   return 0;
 }
 
+static int sev_comp_refid(tree_sTable *tp, tree_sNode *x, tree_sNode *y)
+{
+  sev_sRefid *xp = (sev_sRefid *) x; 
+  sev_sRefid *yp = (sev_sRefid *) y;
+  
+  if (xp->id.nid > yp->id.nid)
+    return 1;
+
+  if (xp->id.nid < yp->id.nid)
+    return -1;
+
+  if (xp->id.rix > yp->id.rix)
+    return 1;
+
+  if (xp->id.rix < yp->id.rix)
+    return -1;
+
+  return 0;
+}
+
 int sev_server::init( int noneth)
 {
   qcom_sNode		node;
@@ -131,6 +152,7 @@ int sev_server::init( int noneth)
 
   m_db->get_items( &m_sts);
 
+  m_refid = tree_CreateTable(&sts, sizeof(pwr_tRefId), offsetof(sev_sRefid, id), sizeof(sev_sRefid), 100, sev_comp_refid);
   m_item_key = tree_CreateTable(&sts, sizeof(sev_sItemKey), offsetof(sev_sItem, key), sizeof(sev_sItem), 100, sev_comp_item);
 
   for ( unsigned int i = 0; i < m_db->m_items.size(); i++) {
@@ -474,11 +496,17 @@ int sev_server::check_histitems( sev_sMsgHistItems *msg, unsigned int size)
   // Remove all refid's for this node
   pwr_tNid nid = msg->Items[0].sevid.nid;
 
-  for ( iterator_refid it = m_refid.begin(); it != m_refid.end(); it++) {
-    if ( it->first.id.nid == nid)
-      m_refid.erase( it);
+  sev_sRefid *rp = (sev_sRefid *)tree_Minimum(&sts, m_refid);
+  sev_sRefid *succ_rp;
+  while ( rp) {
+    succ_rp = (sev_sRefid *)tree_Successor(&sts, m_refid, rp);
+
+    if ( rp->id.nid == nid) 
+      tree_Remove( &sts, m_refid, &rp->id);
+
+    rp = succ_rp;
   }
-  
+
   for ( int i = 0; i < item_cnt; i++) {
 
     // Deadband requires id variable
@@ -507,8 +535,15 @@ int sev_server::check_histitems( sev_sMsgHistItems *msg, unsigned int size)
     }
 
     m_db->m_items[idx].sevid = msg->Items[i].sevid;
-    sev_refid sevid(msg->Items[i].sevid);
-    m_refid[sevid] = idx;
+
+
+    pwr_tRefId rk;
+    sev_sRefid *rp;
+                  
+    rk = msg->Items[i].sevid;
+    rp = (sev_sRefid *) tree_Insert(&sts, m_refid, &rk);
+    rp->idx = idx;
+
   }
 
 #if 0
@@ -528,17 +563,20 @@ int sev_server::check_histitems( sev_sMsgHistItems *msg, unsigned int size)
 
 int sev_server::receive_histdata( sev_sMsgHistDataStore *msg, unsigned int size)
 {
+  pwr_tStatus sts;
   sev_sHistData *dp = (sev_sHistData *)&msg->Data;
   pwr_tTime time;
 
   while ( (char *)dp - (char *)msg < (int)size) {
-    sev_refid sevid(dp->sevid);
-    iterator_refid it = m_refid.find( sevid);
-    if ( it == m_refid.end()) {
+    sev_sRefid *rp;
+    pwr_tRefId rk = dp->sevid;
+
+    rp = (sev_sRefid *) tree_Find(&sts, m_refid, &rk);
+    if ( !rp) {
       dp = (sev_sHistData *)((char *)dp + sizeof( *dp) - sizeof(dp->data) +  dp->size);
       continue;
     }
-    unsigned int idx = it->second;
+    unsigned int idx = rp->idx;
 
     time = net_NetTimeToTime( &msg->Time);
     m_db->store_value( &m_sts, idx, 0, time, &dp->data, dp->size);
@@ -620,22 +658,57 @@ int sev_server::send_histdata( qcom_sQid tgt, sev_sMsgHistDataGetRequest *rmsg,
 }
 
 void sev_server::garbage_collector()
+{
+  int item_size = m_db->m_items.size();
+  static int current = 0;
+  float items_per_scan;
+  int scan_per_items;
+  static int scan_cnt = 0;
+  int i;
+
+  if ( m_db->m_items.size() == 0)
+    return;
+
+  items_per_scan = ((float)sev_cGarbageInterval) * item_size / sev_cGarbageCycle;
+
+  if ( items_per_scan >= 1) {
+    for ( i = 0; i < (int)items_per_scan; i++) {
+      garbage_item( current);
+      current++;
+      if ( current >= item_size)
+	current = 0;
+    }    
+  }
+  else {
+    scan_per_items = (int)( 1.0 / items_per_scan);
+    scan_cnt++;
+    if ( scan_cnt >= scan_per_items) {
+      scan_cnt = 0;
+
+      garbage_item( current);
+
+      current++;
+      if ( current >= item_size)
+	current = 0;
+    }
+  }
+}
+
+void sev_server::garbage_item( int idx)
 {
   pwr_tTime currenttime, limit;
 
   time_GetTime( &currenttime);
   
-  for ( unsigned int i = 0; i < m_db->m_items.size(); i++) {
-    if ( m_db->m_items[i].deleted)
-      continue;
-    if ( m_db->m_items[i].storagetime.tv_sec == 0)
-      continue;
+  if ( m_db->m_items[idx].deleted)
+    return;
+  if ( m_db->m_items[idx].storagetime.tv_sec == 0)
+    return;
 
-    time_Asub( &limit, &currenttime, &m_db->m_items[i].storagetime);
+  time_Asub( &limit, &currenttime, &m_db->m_items[idx].storagetime);
 
-    m_db->delete_old_data( &m_sts, m_db->m_items[i].oid, m_db->m_items[i].attr[0].aname, 
-			   m_db->m_items[i].options, limit);
-  }
+  m_db->delete_old_data( &m_sts, m_db->m_items[idx].oid, m_db->m_items[idx].attr[0].aname, 
+			 m_db->m_items[idx].options, limit);
 }
 
 int main (int argc, char *argv[])

sev/exe/sev_server/src/sev_server.h

@@ -34,7 +34,8 @@ class sev_node {
   char 		name[80];
 };
 
-class sev_refid {
+typedef struct {
+#if 0
  public:
   sev_refid( pwr_tRefId rid) : id(rid) {}
   bool operator<(const sev_refid& x) const {
@@ -44,8 +45,11 @@ class sev_refid {
       return true;
     return false;
   }
+#endif
+  tree_sNode  node;
   pwr_tRefId id;
-};
+  int idx;
+} sev_sRefid;
 
 // Struct for binary tree item
 typedef struct {
@@ -62,14 +66,12 @@ typedef struct {
 class sev_server {
  public:
 
-  sev_server() : m_server_status(0), m_item_key(0), m_msg_id(0) {}
-
-  typedef map<sev_refid, unsigned int>::iterator iterator_refid;
+  sev_server() : m_server_status(0), m_refid(0), m_item_key(0), m_msg_id(0) {}
 
   pwr_tStatus m_sts;
   pwr_tStatus m_server_status;
   vector<sev_node> m_nodes;
-  map<sev_refid, unsigned int> m_refid;
+  tree_sTable *m_refid;
   tree_sTable *m_item_key;
   unsigned int m_msg_id;
   sev_db *m_db;
@@ -86,5 +88,6 @@ class sev_server {
   int send_server_status( qcom_sQid tgt);
   int delete_item( qcom_sQid tgt, sev_sMsgHistItemDelete *rmsg);
   void garbage_collector();
+  void garbage_item( int idx);
 };
 #endif