[Mldonkey-commits] mldonkey distribChangeLog src/daemon/common/com...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/12 20:47:22

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml commonShared.ml 
                           commonShared.mli commonUploads.ml 
        src/daemon/driver: driverCommands.ml 

Log message:
        patch #5061

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.888&r2=1.889
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.150&r2=1.151
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonShared.ml?cvsroot=mldonkey&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonShared.mli?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonUploads.ml?cvsroot=mldonkey&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.154&r2=1.155

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.888
retrieving revision 1.889
diff -u -b -r1.888 -r1.889
--- distrib/ChangeLog   12 Jun 2006 20:18:09 -0000      1.888
+++ distrib/ChangeLog   12 Jun 2006 20:47:21 -0000      1.889
@@ -15,6 +15,9 @@
 =========
 
 2006/06/12
+5061: New option small_files_slot_limit to push release of small files (pango)
+      all files below the configured file size (default 10kb) are uploaded
+      through one reserved slot
 5144: Increase default max_upload_rate to 10 (schlumpf)
 5177: HTML, Options: update display after changing options (schlumpf)
 5176: Swarming: Change error message text and verbosity for BAD WRITE

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- src/daemon/common/commonOptions.ml  12 Jun 2006 20:18:09 -0000      1.150
+++ src/daemon/common/commonOptions.ml  12 Jun 2006 20:47:21 -0000      1.151
@@ -512,6 +512,10 @@
     "Set aside a single reserved slot to upload to friends"
     bool_option true
 
+let small_files_slot_limit = define_option current_section 
["small_files_slot_limit"]
+  "Maximum file size to benefit from the reserved slot for small files (0 to 
disable)"
+    int64_option 10240L
+
 let dynamic_slots = define_option current_section ["dynamic_slots"]
     "Set this to true if you want to have dynamic upload slot allocation 
(experimental)" bool_option false
 

Index: src/daemon/common/commonShared.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonShared.ml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/daemon/common/commonShared.ml   19 May 2006 23:43:54 -0000      1.32
+++ src/daemon/common/commonShared.ml   12 Jun 2006 20:47:21 -0000      1.33
@@ -166,6 +166,10 @@
   let impl = as_shared_impl s in
   impl.impl_shared_fullname  
 
+let shared_size s =
+  let impl = as_shared_impl s in
+  impl.impl_shared_size
+
 let shared_codedname s =
   let impl = as_shared_impl s in
   impl.impl_shared_codedname  

Index: src/daemon/common/commonShared.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonShared.mli,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/daemon/common/commonShared.mli  12 May 2006 21:08:30 -0000      1.6
+++ src/daemon/common/commonShared.mli  12 Jun 2006 20:47:21 -0000      1.7
@@ -35,6 +35,7 @@
 val new_shared : string -> int -> string -> string -> unit
 val shared_num : CommonTypes.shared -> int
 val shared_fullname : CommonTypes.shared -> string
+val shared_size : CommonTypes.shared -> Int64.t
 val shared_codedname : CommonTypes.shared -> string
 val shared_unshare : CommonTypes.shared -> unit
 val shared_dir : CommonTypes.shared option -> string

Index: src/daemon/common/commonUploads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonUploads.ml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/daemon/common/commonUploads.ml  19 May 2006 23:43:54 -0000      1.43
+++ src/daemon/common/commonUploads.ml  12 Jun 2006 20:47:21 -0000      1.44
@@ -868,18 +868,26 @@
   let csh = client_upload c in
   let cdir = shared_dir csh in
   let cprio = ref (shared_prio csh) in
-  let cfriend = ref (if !!friends_upload_slot then 1 else 0) in
+  let cfriend = ref (if is_friend c && !!friends_upload_slot then 1 else 0) in
+  let csmallfiles = ref (match csh with 
+    | None -> 0
+    | Some sh -> if shared_size sh <= !!small_files_slot_limit then 1 else 0) 
in
   (* if cdir <> "" then
     lprintf "Testing cdir %s\n" cdir; *)
   Intmap.iter (fun _ c ->
     let sh = client_upload c in
     if shared_dir sh = cdir then decr cprio;
     if client_has_a_friend_slot c then decr cfriend;
+    match sh with
+      | None -> ()
+      | Some sh ->
+         if shared_size sh <= !!small_files_slot_limit then
+           decr csmallfiles;
   ) !CommonClient.uploaders;
   (* if cdir <> "" then
-    lprintf "Testing cprio %d cfriend %d\n" !cprio !cfriend; *)
-  if !cprio > 0 || 
-     (is_friend c && !cfriend > 0) then begin
+     lprintf "Testing cprio %d cfriend %d csmallfiles\n" 
+     !cprio !cfriend !csmallfiles; *)
+  if !cprio > 0 || !cfriend > 0 || !csmallfiles > 0 then begin
     remove_pending_slot c;
     if client_is_connected c then begin
       set_client_has_a_slot c true;

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- src/daemon/driver/driverCommands.ml 12 Jun 2006 18:11:53 -0000      1.154
+++ src/daemon/driver/driverCommands.ml 12 Jun 2006 20:47:21 -0000      1.155
@@ -1691,10 +1691,7 @@
                        strings_of_option backup_options_format;
                        strings_of_option backup_options_delay;
                        strings_of_option backup_options_generations;
-                       strings_of_option chat_app_port;
-                       strings_of_option chat_app_host;
-                       strings_of_option chat_console_id;
-                       strings_of_option chat_warning_for_downloaded;
+                       strings_of_option small_files_slot_limit;
                       ]
 
                   | _ ->