Commit 3b134c21 authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.118 Wed, 18 Dec 2002 16:40:23 +0100 by jahier

Parent-Version:      0.117
Version-Log:

source/command_line_luc_exe.ml:
   Various minor fixes in printed messages.

remark. The increasing of minor page faults is due to the fact that
ossau kernel has been upgraded ...

Project-Description: Lurette
parent fa2dfd3a
......@@ -22,14 +22,14 @@
(source/ne.ml 9371 1037625990 c/21_ne.ml 1.3)
(source/prevar.ml 981 1037192189 d/18_prevar.ml 1.1)
(source/value.mli 1101 1033723811 c/24_value.mli 1.1)
(user-rules.skel 973 1034006019 c/25_user-rules 1.1)
(user-rules.skel 1167 1040226023 c/25_user-rules 1.2)
(source/Makefile.gen_stubs 212 1036048863 b/42_Makefile.g 1.5)
(test/temp_int.luc 685 1033723811 b/50_temp_int.e 1.3)
(source/luc_exe.ml 12235 1037625990 b/32_ima_exe.ml 1.23)
(source/prevar.mli 623 1037192189 d/19_prevar.mli 1.1)
(test/heater_float.rif.exp 1485 1034951022 b/30_heater_flo 1.11)
(source/graph.ml 2339 1037625990 14_graph.ml 1.8)
(ihm/xlurette/makefile 1583 1036048863 c/16_makefile 1.6)
(ihm/xlurette/makefile 1601 1040226023 c/16_makefile 1.7)
(test/usager.luc 495 1032789516 b/14_usager.env 1.9)
(mlcuddidl/manager.ml 8017 1034006019 c/47_manager.ml 1.1)
(cuddaux/cuddauxInt.h 2058 1034006019 c/28_cuddauxInt 1.1)
......@@ -53,7 +53,7 @@
(source/Makefile 1377 1036585364 c/20_Makefile 1.9)
(source/util.ml 20862 1037625990 35_util.ml 1.36)
(mlcuddidl/manager.mli 7912 1034006019 c/46_manager.ml 1.1)
(test/time.res 6326 1037625990 b/49_time.res 1.25)
(test/time.res 6395 1040226023 b/49_time.res 1.26)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(source/sim2chro.mli 1524 1037625990 b/23_sim2chro.m 1.6)
(source/command_line_luc_exe.mli 1055 1036675177 b/34_command_li 1.6)
......@@ -73,7 +73,7 @@
(make_lurette 1306 1034006019 27_make_luret 1.17)
(source/control.ml 4445 1036675177 c/4_control.ml 1.4)
(ihm/xlurette/xlurette_glade_interface.ml 32774 1035885606 c/15_xlurette_g 1.8)
(source/lurettetop.ml 30402 1036048863 c/1_lurettetop 1.22)
(source/lurettetop.ml 30395 1040226023 c/1_lurettetop 1.23)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(source/Makefile.lurettetop 368 1037192189 d/14_Makefile.l 1.2)
......@@ -86,7 +86,7 @@
(source/env.mli 2027 1033738731 15_env.mli 1.16)
(mlcuddidl/rdd_caml.c 41613 1034006019 c/39_rdd_caml.c 1.1)
(Makefile.common.in 528 1034951022 d/12_Makefile.c 1.2)
(user-rules 14581 1037192189 c/14_myrules 1.19)
(user-rules 14791 1040226023 c/14_myrules 1.20)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(source/lurette.mli 448 1016027474 11_lurette.ml 1.12)
(source/gne.mli 1552 1033397911 b/36_gne.mli 1.4)
......@@ -138,10 +138,10 @@
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
(source/rnumsolver.mli 2198 1033732198 b/26_rnumsolver 1.9)
(source/sim2chro.ml 2721 1033397911 b/24_sim2chro.m 1.14)
(source/command_line_luc_exe.ml 2759 1036675177 b/33_command_li 1.8)
(source/command_line_luc_exe.ml 2748 1040226023 b/33_command_li 1.9)
(mlcuddidl/cudd_caml.h 1210 1034006019 d/2_cudd_caml. 1.1)
(source/value.ml 2355 1033723811 c/23_value.ml 1.1)
(test/time.exp 6326 1037625990 b/48_time.exp 1.22)
(test/time.exp 6395 1040226023 b/48_time.exp 1.23)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(lurette.depfull.dot 49 1007651448 b/5_lurette.de 1.2)
(mlcuddidl/idd.mli 5470 1034006019 c/51_idd.mli 1.1)
......
......@@ -32,7 +32,7 @@ xlurette.opt_opt: dummy
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -pp "camlp4o" -c -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx util.cmx \
ocamlopt.opt -linkall -I +lablgtk -I +str -labels -o xlurette str.cmxa unix.cmxa lablgtk.cmxa gtkInit.cmx util.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 117)
(Parent-Version lurette 0 116)
(Project-Version lurette 0 118)
(Parent-Version lurette 0 117)
(Version-Log "
source/command_line_luc_exe.ml:
Various minor fixes in printed messages.
Various minor fixes in the documentation
+ Use a version of ocaml-3.06 that has been configured with -no-curses,
which make things sligthly slower, but that avoid the need to find
the curses lib...
source/ne.ml:
source/*.ml:
Ne.find now returns an option value instead of raising a Not_found
exp, which was not trap in some circumstances...
source/ne.ml:
Also, fix a couple of bugs where the code was supposing (falsely)
that the constant (empty string) was always in the Map.
remark. The increasing of minor page faults is due to the fact that
ossau kernel has been upgraded ...
")
(New-Version-Log ""
)
(Checkin-Time "Mon, 18 Nov 2002 14:26:30 +0100")
(Checkin-Time "Wed, 18 Dec 2002 16:40:23 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -36,7 +27,7 @@ source/ne.ml:
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.2 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.23 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.8 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.9 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.6 644))
;; Sources files for lurette only
......@@ -88,7 +79,7 @@ source/ne.ml:
(source/gne.mli (lurette/b/36_gne.mli 1.4 644))
(source/gne.ml (lurette/b/37_gne.ml 1.4 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.22 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.23 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.41 644))
(source/control.mli (lurette/c/3_control.ml 1.3 644))
......@@ -117,8 +108,8 @@ source/ne.ml:
(Makefile.common.in (lurette/d/12_Makefile.c 1.2 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.46 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.15 644))
(user-rules (lurette/c/14_myrules 1.19 644))
(user-rules.skel (lurette/c/25_user-rules 1.1 644))
(user-rules (lurette/c/14_myrules 1.20 644))
(user-rules.skel (lurette/c/25_user-rules 1.2 644))
(Makefile (lurette/d/13_Makefile 1.1 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.2 644))
......@@ -144,8 +135,8 @@ source/ne.ml:
(lurette.depfull.dot (lurette/b/5_lurette.de 1.2 644))
(TAGS (lurette/21_TAGS 1.6 644))
(test/time.exp (lurette/b/48_time.exp 1.22 644))
(test/time.res (lurette/b/49_time.res 1.25 644))
(test/time.exp (lurette/b/48_time.exp 1.23 644))
(test/time.res (lurette/b/49_time.res 1.26 644))
;; Various files used for testing purposes
(test/usager.luc (lurette/b/14_usager.env 1.9 644))
......@@ -186,7 +177,7 @@ source/ne.ml:
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.15 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.9 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.8 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.6 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.7 644))
;; cudaux
......
......@@ -40,7 +40,7 @@ let (option_to_usage: cmd_line_optionT -> string) =
fun opt ->
match opt with
Boot -> "The automata starts generating values.\n"
| ShowAut -> "Run lucky showing the lucky automata step.\n"
| ShowAut -> "Run lucky showing the lucky automata.\n"
| NoShowAut -> "Do not show the luc automata (Default).\n"
| Seed -> "Set the value of the seed the random engine is initialized with (0 lets the system draw a seed).\n"
| Verbose -> "Set on a verbose mode.\n"
......@@ -69,7 +69,7 @@ let usage_options =
(List.rev (group_common_options string_to_option))
let usage =
("\n\nusage: ./lucky [options]* <file>.luc ([x] <file>.luc)* \n" ^
("\n\nusage: lucky [options]* <file>.luc ([x] <file>.luc)* \n" ^
" where: " ^
"\n\t o `<file>.luc contains an environment automata. Environments " ^
"\n\t separated by `x' will executed as if their automata where " ^
......@@ -78,7 +78,7 @@ let usage =
"\n\t o `options' is a list of options. The available options are: " ^
usage_options ^ "\n\n" ^
"Example: ./lucky env1.luc x env2.luc x env3.luc env4\n\t" ^
"Example: lucky env1.luc x env2.luc x env3.luc env4\n\t" ^
"will run the environment `env1', `env2', and `env3' as a product, \n\t" ^
"and `env4' in parallel.\n\n ")
......
......@@ -128,17 +128,17 @@ let rec speclist =
"--test-length", Arg.Int (fun i -> flag.step_nb <- i),
"<int>\tNumber of steps to be done";
"-l", Arg.Int (fun i -> flag.step_nb <- i),
("<int>\t\t(default=" ^ (string_of_int flag.step_nb) ^ ").\n");
("<int>\t\t(currently, " ^ (string_of_int flag.step_nb) ^ ").\n");
"--thick-form", Arg.Int (fun i -> flag.formula_nb <- i),
"<int>\tNumber of formula to be drawn at each step";
"-tf", Arg.Int (fun i -> flag.formula_nb <- i),
("<int>\t\t(default=" ^ (string_of_int flag.formula_nb) ^ ").\n");
("<int>\t\t(currently, " ^ (string_of_int flag.formula_nb) ^ ").\n");
"--thick-draw", Arg.Int (fun i -> flag.draw_nb <- i),
"<int>\tNumber of draw to be done in each formula ";
"-td", Arg.Int (fun i -> flag.draw_nb <- i),
("<int>\t\tat each step (default=" ^
("<int>\t\tat each step (currently, " ^
(string_of_int flag.draw_nb) ^ ").\n");
"--draw-inside", Arg.Unit (fun _ -> flag.draw_mode <- Inside),
......@@ -158,10 +158,10 @@ let rec speclist =
(* This option is not meant to be available to end-users... *)
"--make-opt", Arg.String (fun s -> flag.make_opt <- s),
("<string>\tOptions to call make with when building \n" ^
"\t\t\tlurette (default=\"" ^ flag.make_opt ^ "\").\n");
"\t\t\tlurette (currently, \"" ^ flag.make_opt ^ "\").\n");
"--output", Arg.String (fun s -> flag.output <- s),
("<string>\tSet the output file name (default is \"" ^
("<string>\tSet the output file name (currently, \"" ^
flag.output ^ "\").");
"-o", Arg.String (fun s -> flag.output <- s), "<string>\n";
......@@ -201,7 +201,7 @@ let rec speclist =
"-ns2c", Arg.Clear flag.display_sim2chro, "\n";
"--local-var", Arg.Set flag.display_local_var,
"\t\tDisplay environment local variables in sim2chro (default).";
"\t\tDisplay environment local variables in sim2chro (on).";
"--no-local-var", Arg.Clear flag.display_local_var,
"\tDo not display environment local variables in sim2chro.\n" ;
......@@ -277,7 +277,7 @@ let (build : string -> string -> string -> bool) =
flag.sut_node = ""
then
(* try to guess the node name if not given *)
let base = Filename.basename flag.sut_node in
let base = Filename.basename flag.sut in
try Filename.chop_extension base
with _ -> base
else flag.sut_node
......@@ -286,7 +286,7 @@ let (build : string -> string -> string -> bool) =
if flag.oracle_node = ""
then
(* try to guess the node name if not given *)
let base = Filename.basename flag.oracle_node in
let base = Filename.basename oracle in
try Filename.chop_extension base
with _ -> base
else flag.oracle_node
......
Command being timed: "/tmp/lurette62/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 11.31
System time (seconds): 0.10
Percent of CPU this job got: 85%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:13.36
Linux ossau 2.4.18-bf2.4 #1 Son Apr 14 09:53:28 CEST 2002 i686 unknown
Command being timed: "/tmp/lurette6/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 12.33
System time (seconds): 0.60
Percent of CPU this job got: 92%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:13.96
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 274
Minor (reclaiming a frame) page faults: 2465
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 18592
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -22,19 +23,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 25.18
System time (seconds): 0.46
Percent of CPU this job got: 94%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:27.25
Command being timed: "/tmp/lurette6/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 27.36
System time (seconds): 0.89
Percent of CPU this job got: 97%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:29.05
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 274
Minor (reclaiming a frame) page faults: 17414
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 33565
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -46,19 +47,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 100 50 50 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 58.23
System time (seconds): 0.84
Percent of CPU this job got: 90%
Elapsed (wall clock) time (h:mm:ss or m:ss): 1:05.31
Command being timed: "/tmp/lurette6/lurette 100 50 50 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 63.20
System time (seconds): 1.17
Percent of CPU this job got: 96%
Elapsed (wall clock) time (h:mm:ss or m:ss): 1:06.86
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 274
Minor (reclaiming a frame) page faults: 37392
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 53539
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -70,19 +71,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 3.74
System time (seconds): 0.06
Percent of CPU this job got: 92%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.12
Command being timed: "/tmp/lurette6/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 4.14
System time (seconds): 0.44
Percent of CPU this job got: 74%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:06.17
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 297
Minor (reclaiming a frame) page faults: 2458
Major (requiring I/O) page faults: 233
Minor (reclaiming a frame) page faults: 18585
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -94,19 +95,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 9.20
System time (seconds): 0.18
Percent of CPU this job got: 94%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.96
Command being timed: "/tmp/lurette6/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 9.98
System time (seconds): 0.52
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:11.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 297
Minor (reclaiming a frame) page faults: 7364
Major (requiring I/O) page faults: 233
Minor (reclaiming a frame) page faults: 23510
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -118,19 +119,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 3.13
System time (seconds): 0.09
Percent of CPU this job got: 90%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.55
Command being timed: "/tmp/lurette6/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 3.49
System time (seconds): 0.47
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.16
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 292
Minor (reclaiming a frame) page faults: 2458
Major (requiring I/O) page faults: 231
Minor (reclaiming a frame) page faults: 18585
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -142,19 +143,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 10.89
System time (seconds): 0.19
Percent of CPU this job got: 93%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:11.80
Command being timed: "/tmp/lurette6/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 11.88
System time (seconds): 0.59
Percent of CPU this job got: 97%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:12.79
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 292
Minor (reclaiming a frame) page faults: 7761
Major (requiring I/O) page faults: 231
Minor (reclaiming a frame) page faults: 23913
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......
Command being timed: "/tmp/lurette62/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 11.31
System time (seconds): 0.10
Percent of CPU this job got: 85%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:13.36
Linux ossau 2.4.18-bf2.4 #1 Son Apr 14 09:53:28 CEST 2002 i686 unknown
Command being timed: "/tmp/lurette6/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 12.33
System time (seconds): 0.60
Percent of CPU this job got: 92%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:13.96
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 274
Minor (reclaiming a frame) page faults: 2465
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 18592
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -22,19 +23,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 25.18
System time (seconds): 0.46
Percent of CPU this job got: 94%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:27.25
Command being timed: "/tmp/lurette6/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 27.36
System time (seconds): 0.89
Percent of CPU this job got: 97%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:29.05
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 274
Minor (reclaiming a frame) page faults: 17414
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 33565
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -46,19 +47,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 100 50 50 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 58.23
System time (seconds): 0.84
Percent of CPU this job got: 90%
Elapsed (wall clock) time (h:mm:ss or m:ss): 1:05.31
Command being timed: "/tmp/lurette6/lurette 100 50 50 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/tram.luc /home/jahier/lurette/test/usager.luc /home/jahier/lurette/test/porte.luc /home/jahier/lurette/test/passerelle.luc"
User time (seconds): 63.20
System time (seconds): 1.17
Percent of CPU this job got: 96%
Elapsed (wall clock) time (h:mm:ss or m:ss): 1:06.86
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 274
Minor (reclaiming a frame) page faults: 37392
Major (requiring I/O) page faults: 216
Minor (reclaiming a frame) page faults: 53539
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -70,19 +71,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 3.74
System time (seconds): 0.06
Percent of CPU this job got: 92%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.12
Command being timed: "/tmp/lurette6/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 4.14
System time (seconds): 0.44
Percent of CPU this job got: 74%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:06.17
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 297
Minor (reclaiming a frame) page faults: 2458
Major (requiring I/O) page faults: 233
Minor (reclaiming a frame) page faults: 18585
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -94,19 +95,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 9.20
System time (seconds): 0.18
Percent of CPU this job got: 94%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.96
Command being timed: "/tmp/lurette6/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_float.luc"
User time (seconds): 9.98
System time (seconds): 0.52
Percent of CPU this job got: 91%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:11.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 297
Minor (reclaiming a frame) page faults: 7364
Major (requiring I/O) page faults: 233
Minor (reclaiming a frame) page faults: 23510
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -118,19 +119,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 3.13
System time (seconds): 0.09
Percent of CPU this job got: 90%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.55
Command being timed: "/tmp/lurette6/lurette 10000 1 1 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 3.49
System time (seconds): 0.47
Percent of CPU this job got: 95%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.16
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 292
Minor (reclaiming a frame) page faults: 2458
Major (requiring I/O) page faults: 231
Minor (reclaiming a frame) page faults: 18585
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......@@ -142,19 +143,19 @@
Page size (bytes): 4096
Exit status: 0
Command being timed: "/tmp/lurette62/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 10.89
System time (seconds): 0.19
Percent of CPU this job got: 93%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:11.80
Command being timed: "/tmp/lurette6/lurette 10 100 100 --draw-inside -seed 1015403953 --no-oracle -o lurette.rif -ns2c -nlv /home/jahier/lurette/test/temp_int.luc"
User time (seconds): 11.88
System time (seconds): 0.59
Percent of CPU this job got: 97%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:12.79
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 0
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 292
Minor (reclaiming a frame) page faults: 7761
Major (requiring I/O) page faults: 231
Minor (reclaiming a frame) page faults: 23913
Voluntary context switches: 0
Involuntary context switches: 0
Swaps: 0
......
......@@ -20,13 +20,15 @@ tags:
# Generates the modules dependency graph using ocamldot
# (results in lurette.dep.ps and lurette.depfull.ps).
REALLY_ALL_SOURCES = $(ALL_SOURCES) luc_exe.ml luc_exe.mli gen_fake_lutin.ml lurettetop.ml show_luc.ml gen_stubs.ml
dot:
pushd ../source ; touch $(RESULT).dep.dot ; touch $(RESULT).dep.ps ; \
\rm $(RESULT).dep.ps $(RESULT).dep.dot ; \
touch $(RESULT).depfull.dot ; touch $(RESULT).depfull.ps ; \
\rm $(RESULT).depfull.ps $(RESULT).depfull.dot ; \
ocamldep $(ALL_SOURCES) | $(OCAMLDOT) -fullgraph -lr > $(RESULT).depfull.dot ; \
ocamldep $(ALL_SOURCES) | $(OCAMLDOT) > $(RESULT).dep.dot ; \
ocamldep $(REALLY_ALL_SOURCES) | $(OCAMLDOT) -fullgraph -lr > $(RESULT).depfull.dot ; \
ocamldep $(REALLY_ALL_SOURCES) | $(OCAMLDOT) > $(RESULT).dep.dot ; \
dot -Tps $(RESULT).depfull.dot > $(RESULT).depfull.ps ; \
dot -Tps $(RESULT).dep.dot > $(RESULT).dep.ps ; \
cp $(RESULT).dep.ps ../doc ; cp $(RESULT).depfull.ps ../doc ; popd
......@@ -57,6 +59,7 @@ giro:
time:
rm -f time.res; touch time.res ; \
uname -a >> time.res
$(LURETTE_PATH)/bin/lurettetop --prefix "/usr/bin/time -o time.res -a -v " -go -l 10000 -td 1 -tf 1 \
--do-not-show-step --no-local-var -sut ControleurPorte -seed 1015403953 -ns2c tram usager porte passerelle ;\
echo " " >> time.res;\
......@@ -90,20 +93,20 @@ time:
test1:
rm -f ControleurPorte.rif; touch ControleurPorte.rif; \
$(LURETTE_PATH)/bin/lurettetop --sut ControleurPorte.lus -l 100 -tf 10 -td 10 \
$(LURETTE_PATH)/bin/lurettetop --sut ControleurPorte.lus -msn ControleurPorte -l 100 -tf 10 -td 10 \
--do-not-show-step -o ControleurPorte.rif --seed 1013219512 -ns2c -go \
tram.luc usager.luc porte.luc passerelle.luc ;\
rm -f test1.res; diff -u ControleurPorte.rif.exp ControleurPorte.rif > test1.res
test2:
rm -f heater_int.rif; touch heater_int.rif; \
$(LURETTE_PATH)/bin/lurettetop -l 30 -tf 10 -td 10 --sut heater_int --seed 1013219512 \
$(LURETTE_PATH)/bin/lurettetop -l 30 -tf 10 -td 10 --sut heater_int -msn heater_int --seed 1013219512 \
--do-not-show-step -ns2c -go -o heater_int.rif -go temp_int ;\
rm -f test3.res; diff -u heater_int.rif.exp heater_int.rif > test2.res
test3:
rm -f heater_float.rif; touch heater_float.rif; \
$(LURETTE_PATH)/bin/lurettetop -go -l 30 -tf 10 -td 10 --sut heater_float --seed 1013219512 \
$(LURETTE_PATH)/bin/lurettetop -go -l 30 -tf 10 -td 10 -msn heater_float --sut heater_float --seed 1013219512 \
--do-not-show-step -ns2c -o heater_float.rif temp_float;\
rm -f test3.res; diff -u heater_float.rif.exp heater_float.rif > test3.res
......
......@@ -9,24 +9,24 @@
# Non regression test
test1:
rm -f ControleurPorte.rif; touch ControleurPorte.rif; \
lurettetop --sut ControleurPorte -l 100 -tf 10 -td 10 \
-o ControleurPorte.rif --seed 1013219512 -ns2c -go \
tram usager porte passerelle ;\
$(LURETTE_PATH)/bin/lurettetop --sut ControleurPorte.lus -msn ControleurPorte -l 100 -tf 10 -td 10 \
--do-not-show-step -o ControleurPorte.rif --seed 1013219512 -ns2c -go \
tram.luc usager.luc porte.luc passerelle.luc ;\
rm -f test1.res; diff -u ControleurPorte.rif.exp ControleurPorte.rif > test1.res
test2:
rm -f heater_int.rif; touch heater_int.rif; \
lurettetop -l 30 -tf 10 -td 10 --sut heater_int --seed 1013219512 \
-ns2c -go -o heater_int.rif -go temp_int ;\
$(LURETTE_PATH)/bin/lurettetop -l 30 -tf 10 -td 10 --sut heater_int -msn heater_int --seed 1013219512 \
--do-not-show-step -ns2c -go -o heater_int.rif -go temp_int ;\
rm -f test3.res; diff -u heater_int.rif.exp heater_int.rif > test2.res
test3:
rm -f heater_float.rif; touch heater_float.rif; \
lurettetop -go -l 30 -tf 10 -td 10 --sut heater_float --seed 1013219512 \
-ns2c -o heater_float.rif temp_float;\
$(LURETTE_PATH)/bin/lurettetop -go -l 30 -tf 10 -td 10 -msn heater_float --sut heater_float --seed 1013219512 \
--do-not-show-step -ns2c -o heater_float.rif temp_float;\
rm -f test3.res; diff -u heater_float.rif.exp heater_float.rif > test3.res
test: test1 test2 test3