[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-cvs
Subject:    delay_pool_write squid/src delay_pools.c,1.21.4.11,1.21.4.12
From:       Adrian Chadd <adri () users ! sourceforge ! net>
Date:       2008-07-25 8:00:41
Message-ID: 20080725080043.11911.qmail () squid-cache ! org
[Download RAW message or body]

Update of cvs.devel.squid-cache.org:/cvsroot/squid/squid/src

Modified Files:
      Tag: delay_pool_write
	delay_pools.c 
Log Message:
class5 -> class6



Index: delay_pools.c
===================================================================
RCS file: /cvsroot/squid/squid/src/delay_pools.c,v
retrieving revision 1.21.4.11
retrieving revision 1.21.4.12
diff -C2 -d -r1.21.4.11 -r1.21.4.12
*** delay_pools.c	25 Jul 2008 07:22:39 -0000	1.21.4.11
--- delay_pools.c	25 Jul 2008 08:00:39 -0000	1.21.4.12
***************
*** 120,124 ****
   * + The entry is -overwritten- if the fd changes pool; its not closed/reopened!
   */
! static char *delay_class_5_fds;
  static time_t delay_pools_last_update = 0;
  static hash_table *delay_id_ptr_hash = NULL;
--- 120,124 ----
   * + The entry is -overwritten- if the fd changes pool; its not closed/reopened!
   */
! static char *delay_class_6_fds;
  static time_t delay_pools_last_update = 0;
  static hash_table *delay_id_ptr_hash = NULL;
***************
*** 167,171 ****
      delay_pools_last_update = getCurrentTime();
      delay_no_delay = xcalloc(1, Squid_MaxFD);
!     delay_class_5_fds = xcalloc(1, Squid_MaxFD);
      cachemgrRegister("delay", "Delay Pool Levels", delayPoolStats, 0, 1);
      cachemgrRegister("delay2", "Delay Pool Statistics", delayPoolStatsNew, 0, 1);
--- 167,171 ----
      delay_pools_last_update = getCurrentTime();
      delay_no_delay = xcalloc(1, Squid_MaxFD);
!     delay_class_6_fds = xcalloc(1, Squid_MaxFD);
      cachemgrRegister("delay", "Delay Pool Levels", delayPoolStats, 0, 1);
      cachemgrRegister("delay2", "Delay Pool Statistics", delayPoolStatsNew, 0, 1);
***************
*** 351,355 ****
  {
  	delay_no_delay[fd] = 0;	/* XXX ? */
! 	delay_class_5_fds[fd] = 0;
  }
  
--- 351,355 ----
  {
  	delay_no_delay[fd] = 0;	/* XXX ? */
! 	delay_class_6_fds[fd] = 0;
  }
  
***************
*** 541,545 ****
  	delay_data[pool].class6->fds[position].aggregate =
  	  (int) (((double) Config.Delay.rates[pool]->individual.max_bytes * Config.Delay.initial) / 100);
! 	delay_class_5_fds[fd] = pool + 1;
  
  	return delayId(pool + 1, position);
--- 541,545 ----
  	delay_data[pool].class6->fds[position].aggregate =
  	  (int) (((double) Config.Delay.rates[pool]->individual.max_bytes * Config.Delay.initial) / 100);
! 	delay_class_6_fds[fd] = pool + 1;
  
  	return delayId(pool + 1, position);
***************
*** 579,583 ****
      assert(Biggest_FD < class6->fds_size);	
      for (fd = 0; fd < Biggest_FD; fd++) {
! 	if (delay_class_5_fds[fd] != (pool + 1))
  		continue;
          class6->fds[fd].aggregate += restore_bytes;
--- 579,583 ----
      assert(Biggest_FD < class6->fds_size);	
      for (fd = 0; fd < Biggest_FD; fd++) {
! 	if (delay_class_6_fds[fd] != (pool + 1))
  		continue;
          class6->fds[fd].aggregate += restore_bytes;
***************
*** 1097,1103 ****
  
      /* Per-FD stats! */
!     /* delay_class_5_fds[] contains the pool id starting from 1, not from 0 */
      for (i = 0; i < Biggest_FD; i++) {
! 	if (delay_class_5_fds[i] == (pool+1)) {
  		if (type == 1) {
  			storeAppendPrintf(sentry, "    FD: %d, aggregate %d\n", i, class6->fds[i].aggregate);
--- 1097,1103 ----
  
      /* Per-FD stats! */
!     /* delay_class_6_fds[] contains the pool id starting from 1, not from 0 */
      for (i = 0; i < Biggest_FD; i++) {
! 	if (delay_class_6_fds[i] == (pool+1)) {
  		if (type == 1) {
  			storeAppendPrintf(sentry, "    FD: %d, aggregate %d\n", i, class6->fds[i].aggregate);

[prev in list] [next in list] [prev in thread] [next in thread]