Changeset 5128
- Timestamp:
- 04/30/11 13:10:15 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-stat.c
r5126 r5128 591 591 return 0; 592 592 } 593 594 void convert_to_beta_int(ECM_REQUEST *er, uint16_t caid_to) 595 { 596 convert_to_beta(er->client, er, caid_to); 597 // update ecmd5 for store ECM in cache 598 memcpy(er->ecmd5, MD5(er->ecm+13, er->l-13, er->client->dump), CS_ECMSTORESIZE); 599 } 600 593 601 /** 594 602 * Gets best reader for caid/prid/srvid/ecmlen. … … 634 642 int32_t time_beta = 0; 635 643 int32_t weight; 644 int32_t time; 636 645 637 646 READER_STAT *stat_nagra; … … 647 656 stat_beta = get_stat(rdr, caid_to, prid, er->srvid, er->l+10); 648 657 649 if (stat_nagra && stat_nagra->rc == 0 && (!time_nagra || stat_nagra->time_avg < time_nagra)) 650 time_nagra = stat_nagra->time_avg/weight; 651 if (stat_beta && stat_beta->rc == 0 && (!time_beta || stat_beta->time_avg < time_beta)) 652 time_beta = stat_beta->time_avg/weight; 658 if (stat_nagra && stat_nagra->rc == 0) { 659 time = stat_nagra->time_avg/weight; 660 if (!time_nagra || time < time_nagra) 661 time_nagra = time; 662 } 663 664 if (stat_beta && stat_beta->rc == 0) { 665 time = stat_beta->time_avg/weight; 666 if (!time_beta || time < time_beta) 667 time_beta = time; 668 } 653 669 654 670 //Uncomplete reader evaluation, we need more stats! … … 664 680 cs_debug_mask(D_TRACE, "loadbalancer-betatunnel %04X:%04X needs more statistics...", er->caid, caid_to); 665 681 if (needs_stats_beta) 666 convert_to_beta (er->client,er, caid_to);682 convert_to_beta_int(er, caid_to); 667 683 } 668 684 else if (time_beta && (!time_nagra || time_beta <= time_nagra)) { 669 685 cs_debug_mask(D_TRACE, "loadbalancer-betatunnel %04X:%04X selected beta: n%dms>b%dms", er->caid, caid_to, time_nagra, time_beta); 670 convert_to_beta (er->client,er, caid_to);686 convert_to_beta_int(er, caid_to); 671 687 } 672 688 else {
Note:
See TracChangeset
for help on using the changeset viewer.