Changeset 3972

Timestamp:

11/23/10 18:36:18 (13 years ago)

Author:

schlocke

Message:

loadbalancer: because we have an ecm cache, loadbalancer doesn't need a
ecm cache any longer. Also thread locking is removed, this speeds up the
loadbalancer

Location:

trunk

Files:

• module-stat.c (modified) (17 diffs)
• module-stat.h (modified) (1 diff)

trunk/module-stat.c

@@ -1 @@
-//FIXME Not checked on threadsafety yet; not necessary if only 1 stat running; after checking please remove this line
 #include "module-stat.h"
 
@@ -8 +7 @@
 static struct timeb nulltime;
 
-int ecm_send_cache_idx = 0;
-typedef struct s_ecm_send_cache {
-   ushort        caid;
-   uint64        grp;
-   uchar         ecmd5[CS_ECMSTORESIZE];            
-   int           readers[CS_MAXREADER];
-   struct s_reader * best_rdr;
-} ECM_SEND_CACHE;
-ECM_SEND_CACHE *ecm_send_cache;
-
 void init_stat()
 {
-    ecm_send_cache = malloc(sizeof(ECM_SEND_CACHE)*MAX_ECM_SEND_CACHE);
-    memset(ecm_send_cache, 0, sizeof(ECM_SEND_CACHE)*MAX_ECM_SEND_CACHE);
     cs_ftime(&nulltime);
     stat_load_save = -100;
@@ -36 +23 @@
     if (cfg->lb_reopen_seconds < 10)
         cfg->lb_reopen_seconds = DEFAULT_REOPEN_SECONDS;
-        
-    //init mutex lock with recusive attribute:
-    pthread_mutexattr_t   mta;
-    pthread_mutexattr_init(&mta);
-    pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
-    pthread_mutex_init(&stat_busy, &mta);
-}
-
-int chk_send_cache(int caid, uchar *ecmd5, uint64 grp)
-{
-    int i;
-    for (i=0; i<MAX_ECM_SEND_CACHE; i++) {
-        if (ecm_send_cache[i].caid == caid && (grp&ecm_send_cache[i].grp) && 
-          memcmp(ecm_send_cache[i].ecmd5, ecmd5, sizeof(uchar)*CS_ECMSTORESIZE) == 0)
-            return i;
-    }
-    return -1;
-}
-
-void add_send_cache(int caid, uchar *ecmd5, int *readers, struct s_reader *best_rdr, uint64 grp)
-{
-    ecm_send_cache[ecm_send_cache_idx].caid = caid;
-    memcpy(ecm_send_cache[ecm_send_cache_idx].ecmd5, ecmd5, sizeof(uchar)*CS_ECMSTORESIZE);
-    memcpy(ecm_send_cache[ecm_send_cache_idx].readers, readers, sizeof(int)*CS_MAXREADER);
-    ecm_send_cache[ecm_send_cache_idx].best_rdr = best_rdr;
-    ecm_send_cache[ecm_send_cache_idx].grp = grp;
-    ecm_send_cache_idx++;
-    if (ecm_send_cache_idx >= MAX_ECM_SEND_CACHE)
-        ecm_send_cache_idx = 0;
-}
-
-void clear_from_cache(int caid)
-{
-    int i;
-    for (i=0; i<MAX_ECM_SEND_CACHE; i++) {
-        if (ecm_send_cache[i].caid == caid)
-            ecm_send_cache[i].caid = 0;
-    }
 }
 
@@ -136 +85 @@
 READER_STAT *get_stat(struct s_reader *rdr, ushort caid, ulong prid, ushort srvid)
 {
-    pthread_mutex_lock(&stat_busy);
     if (stat_load_save < 0 && cfg->lb_save)
         load_stat_from_file();
@@ -150 +98 @@
     }
     ll_iter_release(it);
-    pthread_mutex_unlock(&stat_busy);
     return stat;
 }
@@ -162 +109 @@
         return 0;
 
-    pthread_mutex_lock(&stat_busy);
     int c = 0;
     LL_ITER *it = ll_iter_create(rdr->lb_stat);
@@ -173 +119 @@
     }
     ll_iter_release(it);
-    clear_from_cache(caid);
-    pthread_mutex_unlock(&stat_busy);
     return c;
 }
@@ -203 +147 @@
 void save_stat_to_file()
 {
-    pthread_mutex_lock(&stat_busy);
     stat_load_save = 0;
     char buf[256];
@@ -211 +154 @@
     if (!file) {
         cs_log("can't write to file %s", buf);
-        pthread_mutex_unlock(&stat_busy);
         return;
     }
@@ -234 +176 @@
     
     fclose(file);
-    pthread_mutex_unlock(&stat_busy);
     cs_log("loadbalacer statistic saved %d records", count);
 }
@@ -245 +186 @@
     if (!rdr)
         return;
-    pthread_mutex_lock(&stat_busy);
     READER_STAT *stat = get_stat(rdr, caid, prid, srvid);
     if (!stat) {
@@ -312 +252 @@
         stat->rc = rc;
         //stat->ecm_count = 0; Keep ecm_count!
-        clear_from_cache(caid);
     }
     else if (rc == 5) { //timeout
@@ -328 +267 @@
         }
     }
-    pthread_mutex_unlock(&stat_busy);
 }
 
 void reset_stat(ushort caid, ulong prid, ushort srvid)
 {
-    pthread_mutex_lock(&stat_busy);
     //cs_debug_mask(D_TRACE, "loadbalance: resetting ecm count");
     struct s_reader *rdr;
@@ -347 +284 @@
         }
     }
-    pthread_mutex_unlock(&stat_busy);
 }
 
@@ -359 +295 @@
 int get_best_reader(ECM_REQUEST *er)
 {
-    pthread_mutex_lock(&stat_busy);
     int i;
-    i = chk_send_cache(er->caid, er->ecmd5, er->client->grp);
-    if (i >= 0) { //Found in cache, return same reader because he has the cached cws!
-        memcpy(er->matching_rdr, ecm_send_cache[i].readers, sizeof(int)*CS_MAXREADER);
-        struct s_reader * best_rdr = ecm_send_cache[i].best_rdr;
-        cs_debug_mask(D_TRACE, "loadbalancer: client %s for %04X/%06X/%04X: %s readers: %d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d (cache)", 
-            username(er->client), er->caid, er->prid, er->srvid,
-            best_rdr?best_rdr->label:"NONE",
-            er->matching_rdr[0], er->matching_rdr[1], er->matching_rdr[2], er->matching_rdr[3], 
-            er->matching_rdr[4], er->matching_rdr[5], er->matching_rdr[6], er->matching_rdr[7], 
-            er->matching_rdr[8], er->matching_rdr[9], er->matching_rdr[10], er->matching_rdr[11], 
-            er->matching_rdr[12], er->matching_rdr[13], er->matching_rdr[14], er->matching_rdr[15]);
-
-        pthread_mutex_unlock(&stat_busy);
-        return 0;
-    }
-
     int result[CS_MAXREADER];
     memset(result, 0, sizeof(result));
@@ -549 +468 @@
     }
     
-    add_send_cache(er->caid, er->ecmd5, er->matching_rdr, best_rdr, er->client->grp); //add to cache
-    
     if (new_nulltime.time)
         nulltime = new_nulltime;
         
-    pthread_mutex_unlock(&stat_busy);
-    
     return 1;
 }
@@ -567 +482 @@
         return;
 
-    pthread_mutex_lock(&stat_busy);
-    ll_destroy_data(rdr->lb_stat);
-    rdr->lb_stat = ll_create();
-    pthread_mutex_unlock(&stat_busy);
-}
+    ll_clear_data(rdr->lb_stat);
+}

trunk/module-stat.h

@@ -1 +1 @@
 #include "globals.h"
-//#include "module-datastruct-llist.h"
 #include "module-datastruct-llist.h"
-
-static pthread_mutex_t stat_busy;
 
 void init_stat();