Roxen.git/ server/ base_server/ roxen.pike

1996-11-26

1996-11-26 15:35:13 by Per Hedbor <ph@opera.com>

• 27b0e1ac2478fffbb8343f0480aabc7750f2d9b3 (59 lines) (+26/-33) ^{[ Show | Annotate ]}
  Branch: 5.2

Se ticketdatabasen

Rev: server/base_server/config/low_describers.pike:1.3
Rev: server/base_server/configuration.pike:1.4
Rev: server/base_server/disk_cache.pike:1.7
Rev: server/base_server/hosts.pike:1.2
Rev: server/base_server/read_config.pike:1.3
Rev: server/base_server/roxen.pike:1.8
Rev: server/base_server/roxenlib.pike:1.3
Rev: server/etc/roxen_master.pike:1.6
Rev: server/languages/portuguese.pike:1.1
Rev: server/modules/directories/directories.pike:1.2
Rev: server/modules/filesystems/filesystem.pike:1.2
Rev: server/modules/filesystems/userfs.pike:1.3
Rev: server/modules/filters/htaccess.pike:1.2
Rev: server/modules/logging/home_logger.pike:1.2
Rev: server/modules/misc/userdb.pike:1.2
Rev: server/modules/proxies/proxy.pike:1.4
Rev: server/modules/tags/htmlparse.pike:1.4
Rev: server/protocols/ftp.pike:1.2
Rev: server/protocols/gopher.pike:1.2
Rev: server/protocols/http.pike:1.3
Rev: server/protocols/ssl.pike:1.2

775:    if(!current_configuration)    return ("No current_configuration. No configurations enabled?\n");    -  tmp = (int)(current_configuration->sent_mb()/(float)(time(1)-start_time+1)* +  tmp = (int)(current_configuration->sent->mb()/(float)(time(1)-start_time+1)*    QUERY(copies));    -  res = ("<table><tr align=right><td><b>Sent data:</b></td><td>" -  + current_configuration->describe_sent((float)QUERY(copies)) -  + sprintf("</td><td>%.2f Kbit</td>", tmp * 8192.0)); +  res = sprintf("<table><tr align=right><td><b>Sent data:</b></td><td>%.2fMB" +  "</td><td>%.2f Kbit/sec</td>", +  current_configuration->sent->mb()*(float)QUERY(copies), +  tmp * 8192.0);    -  res += ("<td><b>Sent headers:</b></td><td>" -  + current_configuration->describe_hsent((float)QUERY(copies))) -  +"</td>\n"; +  res += sprintf("<td><b>Sent headers:</b></td><td>%.2fMB</td>", +  current_configuration->hsent->mb()*(float)QUERY(copies));    -  tmp=(current_configuration->requests*600)/((time(1)-start_time)+1) -  *QUERY(copies); +  tmp=(int)(((float)current_configuration->requests*(float)600)/ +  (float)((time(1)-start_time)+1)*QUERY(copies));       res += ("<tr align=right><td><b>Number of requests:</b></td><td>"    + sprintf("%8d", current_configuration->requests*QUERY(copies)) -  + sprintf("</td><td>%.2f/min</td>", (float)tmp/(float)10)+ -  "<td><b>Recieved data:</b></td><td>" -  + current_configuration->describe_received((float)QUERY(copies)) -  + "</td>"); +  + sprintf("</td><td>%.2f/min</td><td><b>Recieved data:</b></" +  "td><td>%.2f</td>", (float)tmp/(float)10, +  (current_configuration->received->mb() +  *(float)QUERY(copies))));    - #ifdef USE_RUSAGE -  res += ("<tr>Max request serving time:</td><td>" -  +msectos(current_configuration->maxs) -  +"</td><td>Average request serving time:</td><td>" -  +msectos(current_configuration->avgs) -  +"</td><td>Min request serving time:</td><td></tr><tr>" -  +msectos(current_configuration->mins)+"</td></tr>"); - #endif +     return res +"</table>";   }   
818:       foreach(configurations, conf)    { -  foo[0]+=conf->sent_mb()/(float)(time(1)-start_time+1)*(float)QUERY(copies); -  foo[1]+=conf->describe_sent(1)*(float)QUERY(copies); -  foo[2]+=conf->describe_hsent(1)*(float)QUERY(copies); -  foo[3]+=conf->describe_received(1)*(float)QUERY(copies); -  foo[4]+=conf->requests*QUERY(copies); +  foo[0]+=conf->sent->mb()/(float)(time(1)-start_time+1)*(float)QUERY(copies); +  foo[1]+=conf->sent->mb()*(float)QUERY(copies); +  foo[2]+=conf->hsent->mb()*(float)QUERY(copies); +  foo[3]+=conf->received->mb()*(float)QUERY(copies); +  foo[4]+=conf->requests * QUERY(copies);    }       for(tmp = 1; tmp < 4; tmp ++)    {    if(foo[tmp] < 1024.0) -  foo[tmp] = sprintf("%.2f Mb", foo[tmp]); +  foo[tmp] = sprintf("%.2f MB", foo[tmp]);    else -  foo[tmp] = sprintf("%.2f Gb", foo[tmp]/1024.0); +  foo[tmp] = sprintf("%.2f GB", foo[tmp]/1024.0);    }       res = ("<table><tr align=right><td><b>Sent data:</b></td><td>"+ foo[1]
2438: Inside #if 0 // TBD
  #if 0 // TBD    globvar("cache_minimum_left", 5, "Proxy disk cache: Minimum "    "available free space", TYPE_INT, -  "If less than this amount of disk space (in Mb) is left, " +  "If less than this amount of disk space (in MB) is left, "    "the cache will remove a few files",    0, cache_disabled_p);   #endif       globvar("cache_size", 25, "Proxy disk cache: Size", TYPE_INT, -  "How many Mb may the cache grow to before a garbage collect is done?", +  "How many MB may the cache grow to before a garbage collect is done?",    0, cache_disabled_p);       globvar("bytes_per_second", 50, "Proxy disk cache: Bytes per second",