[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/03/04 21:31:40

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverCommands.ml 

Log message:
        patch #5767

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1194&r2=1.1195
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.221&r2=1.222

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1194
retrieving revision 1.1195
diff -u -b -r1.1194 -r1.1195
--- distrib/ChangeLog   4 Mar 2007 21:30:00 -0000       1.1194
+++ distrib/ChangeLog   4 Mar 2007 21:31:40 -0000       1.1195
@@ -15,6 +15,7 @@
 =========
 
 2007/03/04
+5767: HTML: Improve bw_stats
 5768: New default for option messages_filter (thx to atordo)
 5766: Windows/Unicode: Fix broken get_info function for non-ascii filenames
 5782: Improve CommonNetwork.network_display_stats function

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- src/daemon/driver/driverCommands.ml 4 Mar 2007 21:26:35 -0000       1.221
+++ src/daemon/driver/driverCommands.ml 4 Mar 2007 21:31:40 -0000       1.222
@@ -1081,15 +1081,15 @@
             Printf.bprintf buf "\\<td\\>\\<table border=0 cellspacing=0 
cellpadding=0\\>\\<tr\\>";
 
             html_mods_td buf [
-              ("Download KB/s (UDP|TCP)", "bu bbig bbig1 bb4", Printf.sprintf 
"Down: %.1f KB/s (%d|%d)"
-                  dlkbs !udp_download_rate !control_download_rate);
-              ("Upload KB/s (UDP|TCP)", "bu bbig bbig1 bb4", Printf.sprintf 
"Up: %.1f KB/s (%d|%d)"
-                  ulkbs !udp_upload_rate !control_upload_rate);
+              ("Download KB/s (UDP|TCP), total", "bu bbig bbig1 bb4", 
Printf.sprintf "Down: %.1f KB/s (%d|%d), %s"
+                  dlkbs !udp_download_rate !control_download_rate 
(size_of_int64 !download_counter));
+              ("Upload KB/s (UDP|TCP), total", "bu bbig bbig1 bb4", 
Printf.sprintf "Up: %.1f KB/s (%d|%d), %s"
+                  ulkbs !udp_upload_rate !control_upload_rate (size_of_int64 
!upload_counter));
               ("Total shared files/bytes", "bu bbig bbig1 bb4", Printf.sprintf 
"Shared(%d): %s"
                 !nshared_files (size_of_int64 !nshared_bytes));
-              ("Total uploaded bytes", "bu bbig bbig1 bb3", Printf.sprintf 
"Uploaded: %s"
-                (size_of_int64 !upload_counter) ) ];
-
+              ("Bandwidth (Up|Down), open connections 
(max_opened_connections)", "bu bbig bbig1 bb3",
+                Printf.sprintf "DL %d KB/s, UL %d KB/s, Conn: %d (%d)"
+                !!max_hard_download_rate !!max_hard_upload_rate (nb_sockets 
()) !!max_opened_connections) ]; 
 
             Printf.bprintf buf 
"\\</tr\\>\\</table\\>\\</td\\>\\</tr\\>\\</table\\>\\</div\\>";