summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>1996-04-29 14:06:05 +0000
committerXavier Leroy <xavier.leroy@inria.fr>1996-04-29 14:06:05 +0000
commit041ba4a44d22ad5c75bda8d27e0a2f1be761e042 (patch)
treea3930e7d101a6b40fac58d55d94cb88b119157ab
parent80bfb86576a34fb34d5125f4b239ffab79f83abf (diff)
MAJ jeu de tests
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@775 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--otherlibs/threads/Tests/sieve.ml4
-rw-r--r--otherlibs/threads/Tests/sorts.ml10
-rw-r--r--otherlibs/threads/Tests/test1.ml14
-rw-r--r--otherlibs/threads/Tests/test2.ml4
-rw-r--r--otherlibs/threads/Tests/test3.ml2
-rw-r--r--otherlibs/threads/Tests/test4.ml2
-rw-r--r--otherlibs/threads/Tests/test5.ml6
-rw-r--r--otherlibs/threads/Tests/test6.ml2
-rw-r--r--otherlibs/threads/Tests/test7.ml6
-rw-r--r--otherlibs/threads/Tests/test7instr.ml6
-rw-r--r--otherlibs/threads/Tests/test8.ml6
-rw-r--r--otherlibs/threads/Tests/test9.ml2
-rw-r--r--otherlibs/threads/Tests/testA.ml14
-rw-r--r--otherlibs/threads/Tests/testio.ml4
-rw-r--r--otherlibs/threads/Tests/testsocket.ml6
-rw-r--r--otherlibs/threads/Tests/torture.ml10
16 files changed, 49 insertions, 49 deletions
diff --git a/otherlibs/threads/Tests/sieve.ml b/otherlibs/threads/Tests/sieve.ml
index 2fe50f745..4153693eb 100644
--- a/otherlibs/threads/Tests/sieve.ml
+++ b/otherlibs/threads/Tests/sieve.ml
@@ -19,13 +19,13 @@ let rec print_primes ch max =
else begin
printf "%d\n" n; flush stdout;
let ch_after_n = Event.new_channel ()
- in new (sieve n ch) ch_after_n;
+ in Thread.create (sieve n ch) ch_after_n;
print_primes ch_after_n max
end
let go max =
let ch = Event.new_channel ()
- in new (integers 2) ch;
+ in Thread.create (integers 2) ch;
print_primes ch max;;
let _ = go 1000
diff --git a/otherlibs/threads/Tests/sorts.ml b/otherlibs/threads/Tests/sorts.ml
index 184cda455..e4fcb0b76 100644
--- a/otherlibs/threads/Tests/sorts.ml
+++ b/otherlibs/threads/Tests/sorts.ml
@@ -17,7 +17,7 @@ type graphic_context =
(* Array assignment and exchange with screen update *)
-let screen_mutex = Mutex.new()
+let screen_mutex = Mutex.create()
let draw gc i v =
fill_rect (gc.x0 + (gc.width * i) / gc.nelts)
@@ -63,17 +63,17 @@ let initialize name array maxval x y w h =
(* Main animation function *)
let display functs nelts maxval =
- let a = Array.new nelts 0 in
+ let a = Array.create nelts 0 in
for i = 0 to nelts - 1 do
a.(i) <- Random.int maxval
done;
let num_finished = ref 0 in
- let lock_finished = Mutex.new() in
- let cond_finished = Condition.new() in
+ let lock_finished = Mutex.create() in
+ let cond_finished = Condition.create() in
for i = 0 to Array.length functs - 1 do
let (name, funct, x, y, w, h) = functs.(i) in
let gc = initialize name a maxval x y w h in
- Thread.new
+ Thread.create
(fun () ->
funct gc;
Mutex.lock lock_finished;
diff --git a/otherlibs/threads/Tests/test1.ml b/otherlibs/threads/Tests/test1.ml
index 91b951039..a0645b1bd 100644
--- a/otherlibs/threads/Tests/test1.ml
+++ b/otherlibs/threads/Tests/test1.ml
@@ -8,13 +8,13 @@ type 'a prodcons =
notempty: Condition.t;
notfull: Condition.t }
-let new size init =
- { buffer = Array.new size init;
- lock = Mutex.new();
+let create size init =
+ { buffer = Array.create size init;
+ lock = Mutex.create();
readpos = 0;
writepos = 0;
- notempty = Condition.new();
- notfull = Condition.new() }
+ notempty = Condition.create();
+ notfull = Condition.create() }
let put p data =
Mutex.lock p.lock;
@@ -39,7 +39,7 @@ let get p =
(* Test *)
-let buff = new 20 0
+let buff = create 20 0
let rec produce n =
print_int n; print_string "-->"; print_newline();
@@ -52,7 +52,7 @@ let rec consume () =
consume ()
let _ =
- Thread.new produce 0;
+ Thread.create produce 0;
consume()
diff --git a/otherlibs/threads/Tests/test2.ml b/otherlibs/threads/Tests/test2.ml
index e4763e58e..6ab7522fe 100644
--- a/otherlibs/threads/Tests/test2.ml
+++ b/otherlibs/threads/Tests/test2.ml
@@ -4,6 +4,6 @@ let print_message c =
done
let _ =
- let t1 = Thread.new print_message 'a' in
- let t2 = Thread.new print_message 'b' in
+ let t1 = Thread.create print_message 'a' in
+ let t2 = Thread.create print_message 'b' in
Thread.join t1; Thread.join t2; exit 0
diff --git a/otherlibs/threads/Tests/test3.ml b/otherlibs/threads/Tests/test3.ml
index 5f37775a5..c6df3326e 100644
--- a/otherlibs/threads/Tests/test3.ml
+++ b/otherlibs/threads/Tests/test3.ml
@@ -4,5 +4,5 @@ let print_message delay c =
done
let _ =
- Thread.new (print_message 0.6666666666) 'a';
+ Thread.create (print_message 0.6666666666) 'a';
print_message 1.0 'b'
diff --git a/otherlibs/threads/Tests/test4.ml b/otherlibs/threads/Tests/test4.ml
index 2c9fedbef..ff08109c2 100644
--- a/otherlibs/threads/Tests/test4.ml
+++ b/otherlibs/threads/Tests/test4.ml
@@ -8,7 +8,7 @@ let fibtask n =
done
let _ =
- Thread.new fibtask 28;
+ Thread.create fibtask 28;
while true do
let l = read_line () in
print_string ">> "; print_string l; print_newline()
diff --git a/otherlibs/threads/Tests/test5.ml b/otherlibs/threads/Tests/test5.ml
index a1ebcefdf..2baffe024 100644
--- a/otherlibs/threads/Tests/test5.ml
+++ b/otherlibs/threads/Tests/test5.ml
@@ -12,9 +12,9 @@ let rec receiver name =
receiver name
let _ =
- Thread.new sender "hello";
- Thread.new sender "world";
- Thread.new receiver "A";
+ Thread.create sender "hello";
+ Thread.create sender "world";
+ Thread.create receiver "A";
receiver "B";
exit 0
diff --git a/otherlibs/threads/Tests/test6.ml b/otherlibs/threads/Tests/test6.ml
index 0d5283c4f..b846858e5 100644
--- a/otherlibs/threads/Tests/test6.ml
+++ b/otherlibs/threads/Tests/test6.ml
@@ -10,7 +10,7 @@ let rec f tag msg =
f tag msg
let _ =
- Thread.new (f "A") "hello";
+ Thread.create (f "A") "hello";
f "B" "world";
exit 0
diff --git a/otherlibs/threads/Tests/test7.ml b/otherlibs/threads/Tests/test7.ml
index 58d3fde32..e6bd1d810 100644
--- a/otherlibs/threads/Tests/test7.ml
+++ b/otherlibs/threads/Tests/test7.ml
@@ -18,9 +18,9 @@ let read () =
print_int(sync(receive read_ch)); print_newline()
let main () =
- Thread.new accu 0;
- Thread.new (sender add_ch) 1;
- Thread.new (sender sub_ch) 1;
+ Thread.create accu 0;
+ Thread.create (sender add_ch) 1;
+ Thread.create (sender sub_ch) 1;
while true do read() done
let _ = Printexc.catch main ()
diff --git a/otherlibs/threads/Tests/test7instr.ml b/otherlibs/threads/Tests/test7instr.ml
index c845fac84..8982ea7df 100644
--- a/otherlibs/threads/Tests/test7instr.ml
+++ b/otherlibs/threads/Tests/test7instr.ml
@@ -22,9 +22,9 @@ let read () =
print_int(sync(receive read_ch)); print_newline()
let main () =
- Thread.new accu 0;
- Thread.new adder 1;
- Thread.new subber 1;
+ Thread.create accu 0;
+ Thread.create adder 1;
+ Thread.create subber 1;
while true do read() done
let _ = Printexc.catch main ()
diff --git a/otherlibs/threads/Tests/test8.ml b/otherlibs/threads/Tests/test8.ml
index 37ad9289a..cc587b0a7 100644
--- a/otherlibs/threads/Tests/test8.ml
+++ b/otherlibs/threads/Tests/test8.ml
@@ -5,7 +5,7 @@ type 'a buffer_channel = { input: 'a channel; output: 'a channel }
let new_buffer_channel() =
let ic = new_channel() in
let oc = new_channel() in
- let buff = Queue.new() in
+ let buff = Queue.create() in
let rec buffer_process front rear =
match (front, rear) with
([], []) -> buffer_process [sync(receive ic)] []
@@ -15,7 +15,7 @@ let new_buffer_channel() =
wrap (send oc hd) (fun () -> buffer_process tl rear)
]
| ([], _) -> buffer_process (List.rev rear) [] in
- Thread.new (buffer_process []) [];
+ Thread.create (buffer_process []) [];
{ input = ic; output = oc }
let buffer_send bc data =
@@ -40,7 +40,7 @@ let g () =
print_string (sync(buffer_receive box)); print_newline()
let _ =
- Thread.new f ();
+ Thread.create f ();
g()
diff --git a/otherlibs/threads/Tests/test9.ml b/otherlibs/threads/Tests/test9.ml
index ae169d8cd..1f80beb8f 100644
--- a/otherlibs/threads/Tests/test9.ml
+++ b/otherlibs/threads/Tests/test9.ml
@@ -21,6 +21,6 @@ let g () =
print_string "g "; print_string res; print_newline()
let _ =
- let id = Thread.new f () in
+ let id = Thread.create f () in
g ();
Thread.join id
diff --git a/otherlibs/threads/Tests/testA.ml b/otherlibs/threads/Tests/testA.ml
index f46143be4..b1999b87b 100644
--- a/otherlibs/threads/Tests/testA.ml
+++ b/otherlibs/threads/Tests/testA.ml
@@ -1,5 +1,5 @@
-let private_data = (Hashtbl.new 17 : (Thread.t, string) Hashtbl.t)
-let private_data_lock = Mutex.new()
+let private_data = (Hashtbl.create 17 : (Thread.t, string) Hashtbl.t)
+let private_data_lock = Mutex.create()
let set_private_data data =
Mutex.lock private_data_lock;
@@ -15,10 +15,10 @@ let process id data =
print_newline()
let _ =
- let t1 = Thread.new (process 1) "un" in
- let t2 = Thread.new (process 2) "deux" in
- let t3 = Thread.new (process 3) "trois" in
- let t4 = Thread.new (process 4) "quatre" in
- let t5 = Thread.new (process 5) "cinq" in
+ let t1 = Thread.create (process 1) "un" in
+ let t2 = Thread.create (process 2) "deux" in
+ let t3 = Thread.create (process 3) "trois" in
+ let t4 = Thread.create (process 4) "quatre" in
+ let t5 = Thread.create (process 5) "cinq" in
List.iter Thread.join [t1;t2;t3;t4;t5]
diff --git a/otherlibs/threads/Tests/testio.ml b/otherlibs/threads/Tests/testio.ml
index 987ea0aba..8f07027c6 100644
--- a/otherlibs/threads/Tests/testio.ml
+++ b/otherlibs/threads/Tests/testio.ml
@@ -9,8 +9,8 @@ let test msg producer consumer src dst =
let (in_fd, out_fd) = ThreadUnix.pipe() in
let ipipe = Unix.in_channel_of_descr in_fd in
let opipe = Unix.out_channel_of_descr out_fd in
- let prod = Thread.new producer (ic, opipe) in
- let cons = Thread.new consumer (ipipe, oc) in
+ let prod = Thread.create producer (ic, opipe) in
+ let cons = Thread.create consumer (ipipe, oc) in
Thread.join prod;
Thread.join cons;
if ThreadUnix.system ("cmp " ^ src ^ " " ^ dst) = Unix.WEXITED 0
diff --git a/otherlibs/threads/Tests/testsocket.ml b/otherlibs/threads/Tests/testsocket.ml
index 50a7115e0..44d14e9c8 100644
--- a/otherlibs/threads/Tests/testsocket.ml
+++ b/otherlibs/threads/Tests/testsocket.ml
@@ -16,13 +16,13 @@ let engine number address =
close_in ic; close_out oc
let main() =
- let addresses = Array.new (Array.length Sys.argv - 1) inet_addr_any in
+ let addresses = Array.create (Array.length Sys.argv - 1) inet_addr_any in
for i = 1 to Array.length Sys.argv - 1 do
addresses.(i - 1) <- (gethostbyname Sys.argv.(i)).h_addr_list.(0)
done;
- let processes = Array.new (Array.length addresses) (Thread.self()) in
+ let processes = Array.create (Array.length addresses) (Thread.self()) in
for i = 0 to Array.length addresses - 1 do
- processes.(i) <- Thread.new (engine i) addresses.(i)
+ processes.(i) <- Thread.create (engine i) addresses.(i)
done;
for i = 0 to Array.length processes - 1 do
Thread.join processes.(i)
diff --git a/otherlibs/threads/Tests/torture.ml b/otherlibs/threads/Tests/torture.ml
index 792d07faf..48f58b2cc 100644
--- a/otherlibs/threads/Tests/torture.ml
+++ b/otherlibs/threads/Tests/torture.ml
@@ -31,13 +31,13 @@ let reader_thread (ic, size) =
done
let main() =
- Thread.new gc_thread ();
+ Thread.create gc_thread ();
let (out1, in1) = Unix.pipe() in
- Thread.new writer_thread (in1, 4096);
- Thread.new reader_thread (out1, 4096);
+ Thread.create writer_thread (in1, 4096);
+ Thread.create reader_thread (out1, 4096);
let (out2, in2) = Unix.pipe() in
- Thread.new writer_thread (in2, 16);
- Thread.new reader_thread (out2, 16);
+ Thread.create writer_thread (in2, 16);
+ Thread.create reader_thread (out2, 16);
stdin_thread()
let _ = main()