[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/Makefile.in distrib/ChangeLog s...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey config/Makefile.in distrib/ChangeLog s... |
|
Date: |
Tue, 28 Nov 2006 23:58:02 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/11/28 23:58:02
Modified files:
config : Makefile.in
distrib : ChangeLog
src/daemon/common: commonServer.ml commonSources.ml
src/daemon/driver: driverCommands.ml driverInteractive.ml
src/networks/donkey: donkeyInteractive.ml
src/networks/server: serverUdp.ml
Removed files:
src/utils/cdk : sort2.ml sort2.mli
Log message:
patch #5598
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.173&r2=1.174
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1121&r2=1.1122
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonServer.ml?cvsroot=mldonkey&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSources.ml?cvsroot=mldonkey&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.203&r2=1.204
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.140&r2=1.141
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/server/serverUdp.ml?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/sort2.ml?cvsroot=mldonkey&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/sort2.mli?cvsroot=mldonkey&r1=1.1&r2=0
Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -b -r1.173 -r1.174
--- config/Makefile.in 21 Nov 2006 22:29:58 -0000 1.173
+++ config/Makefile.in 28 Nov 2006 23:58:01 -0000 1.174
@@ -148,7 +148,7 @@
$(CDK)/filepath.ml $(CDK)/string2.ml \
$(CDK)/filename2.ml $(CDK)/list2.ml $(CDK)/hashtbl2.ml \
$(CDK)/unix2.ml $(CDK)/file.ml \
- $(CDK)/heap_c.c $(CDK)/array2.ml $(CDK)/sort2.ml
+ $(CDK)/heap_c.c $(CDK)/array2.ml
ifneq ("$(PTHREAD_CFLAGS)" , "")
CFLAGS += $(PTHREAD_CFLAGS)
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1121
retrieving revision 1.1122
diff -u -b -r1.1121 -r1.1122
--- distrib/ChangeLog 28 Nov 2006 23:52:17 -0000 1.1121
+++ distrib/ChangeLog 28 Nov 2006 23:58:02 -0000 1.1122
@@ -15,12 +15,13 @@
=========
2006/11/29
+5598: Remove use of deprecated sort module, remove unused sort2.ml* (pango)
5589: New option create_file_mode,
rename create_dir_mask to create_dir_mode (pango)
5595: EDK: Fully parse emule_miscoptions1/2
5594: EDK: If update_server_list_client true, add yet unknown server
of lowid clients
-
+-------------------------------------------------------------------------------
2006/11/29 version 2.8.2 = tag release-2-8-2
5597: GD: New option html_mods_vd_gfx_h_intervall
(compute values for hourly graph every x minutes) (skeeve)
Index: src/daemon/common/commonServer.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonServer.ml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/daemon/common/commonServer.ml 26 Nov 2006 16:36:29 -0000 1.39
+++ src/daemon/common/commonServer.ml 28 Nov 2006 23:58:02 -0000 1.40
@@ -306,8 +306,8 @@
(try impl.impl_server_ops.op_server_sort impl.impl_server_val
with _ -> 0);
) servers_by_num;
- Sort.list (fun s1 s2 ->
- (as_server_impl s1).impl_server_sort >= (as_server_impl
s2).impl_server_sort
+ List.sort (fun s1 s2 ->
+ compare (as_server_impl s2).impl_server_sort (as_server_impl
s1).impl_server_sort
) !list
let server_iter f =
Index: src/daemon/common/commonSources.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSources.ml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/daemon/common/commonSources.ml 21 Nov 2006 22:34:33 -0000 1.39
+++ src/daemon/common/commonSources.ml 28 Nov 2006 23:58:02 -0000 1.40
@@ -528,9 +528,11 @@
let naact = ref 0 in
let naneed = ref 0 in
let my_file_sources_managers =
- Sort.list
+ List.sort
(fun f1 f2 ->
- file_best_name (f1.manager_file ()) < file_best_name
(f2.manager_file ())
+ let best_name1 = file_best_name (f1.manager_file ()) in
+ let best_name2 = file_best_name (f2.manager_file ()) in
+ String.compare best_name1 best_name2
) (List.filter (fun m -> file_state (m.manager_file ()) =
FileDownloading) !file_sources_managers)
in
(* Files *)
Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -b -r1.203 -r1.204
--- src/daemon/driver/driverCommands.ml 28 Nov 2006 23:52:17 -0000 1.203
+++ src/daemon/driver/driverCommands.ml 28 Nov 2006 23:58:02 -0000 1.204
@@ -1362,7 +1362,7 @@
(if s.search_waiting = 0 then _s "done" else
string_of_int s.search_waiting)
s.search_nresults
- ) (Sort.list (fun f1 f2 -> f1.search_num < f2.search_num)
+ ) (List.sort (fun f1 f2 -> compare f1.search_num f2.search_num)
user.ui_user_searches)
end;
""
Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- src/daemon/driver/driverInteractive.ml 28 Nov 2006 23:17:31 -0000
1.118
+++ src/daemon/driver/driverInteractive.ml 28 Nov 2006 23:58:02 -0000
1.119
@@ -1115,7 +1115,8 @@
if o.conn_output <> HTML && !!improved_telnet then
begin
- let list = Sort.list (fun f1 f2 -> percent f1 >= percent f2) list in
+ let list =
+ List.sort (fun f1 f2 -> compare (percent f2) (percent f1)) list in
simple_print_file_list false buf list o
end
else
@@ -1124,29 +1125,37 @@
let sorter =
match o.conn_sortvd with
- | BySize -> (fun f1 f2 -> f1.file_size >= f2.file_size)
+ | BySize -> (fun f1 f2 -> compare f2.file_size f1.file_size)
| ByRate -> (fun f1 f2 ->
- if stalled f1 then false else
- if stalled f2 then true else
- f1.file_download_rate >= f2.file_download_rate
- )
- | ByName -> (fun f1 f2 -> String.lowercase f1.file_name <=
String.lowercase f2.file_name)
- | ByDone -> (fun f1 f2 -> f1.file_downloaded >= f2.file_downloaded)
- | ByPriority -> (fun f1 f2 -> f1.file_priority >= f2.file_priority)
- | BySources -> (fun f1 f2 -> (number_of_sources f1) >=
(number_of_sources f2))
- | ByASources -> (fun f1 f2 -> (number_of_active_sources f1) >=
(number_of_active_sources f2))
- | ByPercent -> (fun f1 f2 -> percent f1 >= percent f2)
- | ByETA -> (fun f1 f2 -> calc_file_eta f1 <= calc_file_eta f2)
- | ByAge -> (fun f1 f2 -> f1.file_age >= f2.file_age)
- | ByLast -> (fun f1 f2 -> f1.file_last_seen >= f2.file_last_seen)
- | ByNet -> (fun f1 f2 -> net_name f1 <= net_name f2)
- | ByAvail -> (fun f1 f2 -> get_file_availability f1 >=
get_file_availability f2)
- | ByComments -> (fun f1 f2 -> (number_of_comments f1) >=
(number_of_comments f2))
- | ByUser -> (fun f1 f2 -> f1.file_user <= f2.file_user)
- | ByGroup -> (fun f1 f2 -> f1.file_group <= f2.file_group)
+ if stalled f1 then 1 else
+ if stalled f2 then -1 else
+ compare f2.file_download_rate f1.file_download_rate)
+ | ByName -> (fun f1 f2 -> String.compare
+ (String.lowercase f1.file_name)
+ (String.lowercase f2.file_name))
+ | ByDone -> (fun f1 f2 ->
+ compare f2.file_downloaded f1.file_downloaded)
+ | ByPriority -> (fun f1 f2 ->
+ compare f2.file_priority f1.file_priority)
+ | BySources -> (fun f1 f2 -> compare
+ (number_of_sources f2) (number_of_sources f1))
+ | ByASources -> (fun f1 f2 ->
+ compare (number_of_active_sources f2)
+ (number_of_active_sources f1))
+ | ByPercent -> (fun f1 f2 -> compare (percent f2) (percent f1))
+ | ByETA -> (fun f1 f2 -> compare (calc_file_eta f1) (calc_file_eta f2))
+ | ByAge -> (fun f1 f2 -> compare f2.file_age f1.file_age)
+ | ByLast -> (fun f1 f2 -> compare f2.file_last_seen f1.file_last_seen)
+ | ByNet -> (fun f1 f2 -> compare (net_name f1) (net_name f2))
+ | ByAvail -> (fun f1 f2 -> compare
+ (get_file_availability f2) (get_file_availability f1))
+ | ByComments -> (fun f1 f2 -> compare
+ (number_of_comments f2) (number_of_comments f1))
+ | ByUser -> (fun f1 f2 -> compare f1.file_user f2.file_user)
+ | ByGroup -> (fun f1 f2 -> compare f1.file_group f2.file_group)
| NotSorted -> raise Not_found
in
- Sort.list sorter list
+ List.sort sorter list
with _ -> list
in
simple_print_file_list false buf list o
@@ -1704,8 +1713,8 @@
Intmap.iter (fun r_num (avail,rs) ->
let r = IndexedResults.get_result rs in
results := (rs, r, !avail) :: !results) s.search_results;
- let results = Sort.list (fun (_, r1,_) (_, r2,_) ->
- r1.result_size > r2.result_size
+ let results = List.sort (fun (_, r1,_) (_, r2,_) ->
+ compare r2.result_size r1.result_size
) !results in
Printf.bprintf buf "Result of search %d\n" s.search_num;
@@ -2456,10 +2465,10 @@
end;
html_mods_cntr_init ();
- let list = Sort.list (fun f1 f2 ->
- (f1.impl_shared_requests = f2.impl_shared_requests &&
- f1.impl_shared_uploaded > f2.impl_shared_uploaded) ||
- (f1.impl_shared_requests > f2.impl_shared_requests )
+ let list = List.sort (fun f1 f2 ->
+ let c = compare f2.impl_shared_requests f1.impl_shared_requests in
+ if c <> 0 then c else
+ compare f2.impl_shared_uploaded f1.impl_shared_uploaded
) list in
List.iter (fun impl ->
Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- src/networks/donkey/donkeyInteractive.ml 26 Nov 2006 17:27:40 -0000
1.140
+++ src/networks/donkey/donkeyInteractive.ml 28 Nov 2006 23:58:02 -0000
1.141
@@ -275,7 +275,8 @@
match file.file_swarmer with
None -> assert false
| Some swarmer ->
- let absents = Sort.list (fun (p1,_) (p2,_) -> p1 <= p2) absents in
+ let absents =
+ List.sort (fun (p1, _) (p2, _) -> compare p1 p2) absents in
CommonSwarming.set_absent swarmer absents
end;
Index: src/networks/server/serverUdp.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/server/serverUdp.ml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/networks/server/serverUdp.ml 16 Oct 2005 20:42:54 -0000 1.2
+++ src/networks/server/serverUdp.ml 28 Nov 2006 23:58:02 -0000 1.3
@@ -431,7 +431,7 @@
else
dead_servers := s :: !dead_servers
) DonkeyGlobals.servers_by_key;
- let alive_servers = Sort.list (fun s1 s2 ->
+ let alive_servers = List.sort (fun s1 s2 ->
s1.DonkeyTypes.server_last_message >=
s2.DonkeyTypes.server_last_message
) !alive_servers in
Index: src/utils/cdk/sort2.ml
===================================================================
RCS file: src/utils/cdk/sort2.ml
diff -N src/utils/cdk/sort2.ml
--- src/utils/cdk/sort2.ml 22 Apr 2003 22:33:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,97 +0,0 @@
-(***********************************************************************)
-(* *)
-(* Objective Caml *)
-(* *)
-(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
-(* *)
-(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* en Automatique. All rights reserved. This file is distributed *)
-(* under the terms of the GNU Library General Public License, with *)
-(* the special exception on linking described in file ../LICENSE. *)
-(* *)
-(***********************************************************************)
-
-(* Merging and sorting *)
-
-open Array
-
- (*
-let rec merge order l1 l2 =
- match l1 with
- [] -> l2
- | h1 :: t1 ->
- match l2 with
- [] -> l1
- | h2 :: t2 ->
- if order h1 h2
- then h1 :: merge order t1 l2
- else h2 :: merge order l1 t2
-
-let list order l =
- let rec initlist = function
- [] -> []
- | [e] -> [[e]]
- | e1::e2::rest ->
- (if order e1 e2 then [e1;e2] else [e2;e1]) :: initlist rest in
- let rec merge2 = function
- l1::l2::rest -> merge order l1 l2 :: merge2 rest
- | x -> x in
- let rec mergeall = function
- [] -> []
- | [l] -> l
- | llist -> mergeall (merge2 llist) in
- mergeall(initlist l)
- *)
-
-let swap arr i j =
- let tmp = unsafe_get arr i in
- unsafe_set arr i (unsafe_get arr j);
- unsafe_set arr j tmp
-
-let subarray cmp arr pos len =
- let rec qsort lo hi =
- if hi - lo >= 6 then begin
- let mid = (lo + hi) lsr 1 in
- (* Select median value from among LO, MID, and HI. Rearrange
- LO and HI so the three values are sorted. This lowers the
- probability of picking a pathological pivot. It also
- avoids extra comparisons on i and j in the two tight "while"
- loops below. *)
- if cmp (unsafe_get arr mid) (unsafe_get arr lo) <= 0 then swap arr mid
lo;
- if cmp (unsafe_get arr hi) (unsafe_get arr mid) <= 0 then begin
- swap arr mid hi;
- if cmp (unsafe_get arr mid) (unsafe_get arr lo) <= 0 then swap arr mid
lo
- end;
- let pivot = unsafe_get arr mid in
- let i = ref (lo + 1) and j = ref (hi - 1) in
- if not (cmp pivot (unsafe_get arr hi) <= 0)
- || not (cmp (unsafe_get arr lo) pivot <= 0)
- then raise (Invalid_argument "Sort.array");
- while !i < !j do
- while not (cmp pivot (unsafe_get arr !i) <= 0) do incr i done;
- while not (cmp (unsafe_get arr !j) pivot <= 0) do decr j done;
- if !i < !j then swap arr !i !j;
- incr i; decr j
- done;
- (* Recursion on smaller half, tail-call on larger half *)
- if !j - lo <= hi - !i then begin
- qsort lo !j; qsort !i hi
- end else begin
- qsort !i hi; qsort lo !j
- end
- end in
- qsort pos (pos+len-1);
- (* Finish sorting by insertion sort *)
- for i = pos+1 to pos+len - 1 do
- let val_i = (unsafe_get arr i) in
- if not (cmp (unsafe_get arr (i - 1)) val_i <= 0) then begin
- unsafe_set arr i (unsafe_get arr (i - 1));
- let j = ref (i - 1) in
- while !j >= 1 && not (cmp (unsafe_get arr (!j - 1)) val_i <= 0) do
- unsafe_set arr !j (unsafe_get arr (!j - 1));
- decr j
- done;
- unsafe_set arr !j val_i
- end
- done
-
Index: src/utils/cdk/sort2.mli
===================================================================
RCS file: src/utils/cdk/sort2.mli
diff -N src/utils/cdk/sort2.mli
--- src/utils/cdk/sort2.mli 22 Apr 2003 22:33:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-(***********************************************************************)
-(* *)
-(* Objective Caml *)
-(* *)
-(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
-(* *)
-(* Copyright 1996 Institut National de Recherche en Informatique et *)
-(* en Automatique. All rights reserved. This file is distributed *)
-(* under the terms of the GNU Library General Public License, with *)
-(* the special exception on linking described in file ../LICENSE. *)
-(* *)
-(***********************************************************************)
-
-(** Sorting and merging lists.
-
- @deprecated This module is obsolete and exists only for backward
- compatibility.
- The sorting functions in {!Array} and {!List} should be used instead.
- The new functions are faster and use less memory.
-*)
-
-(*
-val list : ('a -> 'a -> bool) -> 'a list -> 'a list
-(** Sort a list in increasing order according to an ordering predicate.
- The predicate should return [true] if its first argument is
- less than or equal to its second argument. *)
-*)
-
-val subarray : ('a -> 'a -> int) -> 'a array -> int -> int -> unit
-(** Sort an array in increasing order according to an
- ordering predicate.
- The predicate should return [true] if its first argument is
- less than or equal to its second argument.
- The array is sorted in place. *)
-
- (*
-val merge : ('a -> 'a -> bool) -> 'a list -> 'a list -> 'a list
-(** Merge two lists according to the given predicate.
- Assuming the two argument lists are sorted according to the
- predicate, [merge] returns a sorted list containing the elements
- from the two lists. The behavior is undefined if the two
- argument lists were not sorted. *)
-*)