Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
verimag
synchrone
lutin
Commits
ce64ac1a
Commit
ce64ac1a
authored
Aug 28, 2017
by
erwan
Browse files
Reflect the changes in rdbg 1.109 done in the Event interface.
Basically, I have added the missing fields
parent
dbb5c443
Changes
5
Hide whitespace changes
Inline
Side-by-side
_oasis
View file @
ce64ac1a
OASISFormat: 0.4
Name: Lutin
Version: 2.2
7
Version: 2.2
8
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: PROP
...
...
@@ -21,7 +21,7 @@ PostInstallCommand: cp utils/simec_trap $exec_prefix/bin; cp utils/read-rif.sh $
Executable lutin
Path: lutin/src
MainIs: main.ml
BuildDepends: str,unix,num,rdbg-plugin (>= 1.
5
1),lutin-utils,ezdl,gbddml,polka,camlp4,camlidl
BuildDepends: str,unix,num,rdbg-plugin (>= 1.1
09
),lutin-utils,ezdl,gbddml,polka,camlp4,camlidl
NativeOpt: -package num # XXX turn around a bug in oasis/ocamlbuild/ocamlfind?
Build: true
Install:true
...
...
ltop/src/lustreRun.ml
View file @
ce64ac1a
(* Time-stamp: <modified the
10
/0
2
/201
6
(at 1
4:47
) by Erwan Jahier> *)
(* Time-stamp: <modified the
28
/0
8
/201
7
(at 1
7:01
) by Erwan Jahier> *)
open
RdbgPlugin
type
vars
=
(
string
*
Data
.
t
)
list
...
...
@@ -108,6 +108,7 @@ let (make_ec : string -> RdbgPlugin.t) =
Event
.
name
=
ec_file
;
Event
.
inputs
=
[]
;
Event
.
outputs
=
[]
;
Event
.
locals
=
[]
;
Event
.
sinfo
=
None
;
Event
.
data
=
ctx
.
Event
.
data
;
Event
.
next
=
(
fun
()
->
cont
(
step
sl
)
ctx
);
...
...
@@ -229,6 +230,7 @@ let (make_socket_do : string -> int -> in_channel * RdbgPlugin.t) =
Event
.
name
=
sock_adr
^
":"
^
(
string_of_int
port
);
Event
.
inputs
=
[]
;
Event
.
outputs
=
[]
;
Event
.
locals
=
[]
;
Event
.
sinfo
=
None
;
Event
.
next
=
(
fun
()
->
cont
(
step
sl
)
ctx
);
Event
.
terminate
=
ctx
.
Event
.
terminate
;
...
...
@@ -334,6 +336,7 @@ let (make_ec_exe : string -> RdbgPlugin.t) =
Event
.
name
=
ec_file
;
Event
.
inputs
=
[]
;
Event
.
outputs
=
[]
;
Event
.
locals
=
[]
;
Event
.
sinfo
=
None
;
Event
.
next
=
(
fun
()
->
cont
(
step
sl
)
ctx
);
Event
.
terminate
=
ctx
.
Event
.
terminate
;
...
...
ltop/src/runDirect.ml
View file @
ce64ac1a
...
...
@@ -457,6 +457,7 @@ let (start : unit -> Event.t) =
Event
.
lang
=
""
;
Event
.
inputs
=
[]
;
Event
.
outputs
=
[]
;
Event
.
locals
=
[]
;
Event
.
sinfo
=
None
;
Event
.
next
=
(
fun
()
->
...
...
@@ -498,6 +499,7 @@ let (start : unit -> Event.t) =
Event
.
depth
=
1
;
Event
.
inputs
=
[]
;
Event
.
outputs
=
[]
;
Event
.
locals
=
[]
;
Event
.
data
=
[]
;
Event
.
terminate
=
(
fun
()
->
killem_all
cov_init
);
Event
.
lang
=
""
;
...
...
lutin/src/lutExe.ml
View file @
ce64ac1a
...
...
@@ -1550,12 +1550,15 @@ let rec (genpath_ldbg :
Event
.
expr
=
cstr
;
Event
.
more
=
None
;
Event
.
atoms
=
si_atoms
;
Event
.
in_subst
=
[]
;
Event
.
out_subst
=
[]
;
});
Event
.
depth
=
ctx
.
Event
.
depth
;
Event
.
step
=
ctx
.
Event
.
step
;
Event
.
name
=
ctx
.
Event
.
name
;
Event
.
inputs
=
ctx
.
Event
.
inputs
;
Event
.
outputs
=
ctx
.
Event
.
outputs
;
Event
.
locals
=
[]
;
(* fixme *)
Event
.
data
=
ctx
.
Event
.
data
;
Event
.
terminate
=
ctx
.
Event
.
terminate
;
}
...
...
@@ -1584,12 +1587,15 @@ let rec (genpath_ldbg :
Event
.
expr
=
cstr
;
Event
.
more
=
Some
lazy_ci
;
Event
.
atoms
=
si_atoms
;
Event
.
in_subst
=
[]
;
Event
.
out_subst
=
[]
;
});
Event
.
depth
=
ctx
.
Event
.
depth
;
Event
.
step
=
ctx
.
Event
.
step
;
Event
.
name
=
ctx
.
Event
.
name
;
Event
.
inputs
=
ctx
.
Event
.
inputs
;
Event
.
outputs
=
ctx
.
Event
.
outputs
;
Event
.
locals
=
[]
;
(* fixme *)
Event
.
data
=
ctx
.
Event
.
data
;
Event
.
terminate
=
ctx
.
Event
.
terminate
;
}
...
...
@@ -1606,12 +1612,15 @@ let rec (genpath_ldbg :
Event
.
expr
=
cstr
;
Event
.
more
=
None
;
Event
.
atoms
=
si_atoms
;
Event
.
in_subst
=
[]
;
Event
.
out_subst
=
[]
;
});
Event
.
depth
=
ctx
.
Event
.
depth
;
Event
.
step
=
ctx
.
Event
.
step
;
Event
.
name
=
ctx
.
Event
.
name
;
Event
.
inputs
=
ctx
.
Event
.
inputs
;
Event
.
outputs
=
ctx
.
Event
.
outputs
;
Event
.
locals
=
[]
;
(* fixme *)
Event
.
data
=
ctx
.
Event
.
data
;
Event
.
terminate
=
ctx
.
Event
.
terminate
;
Event
.
next
=
try_cont
ctx
;
...
...
@@ -2091,6 +2100,7 @@ let rec (genpath_ldbg :
Event
.
name
=
rid
;
Event
.
inputs
=
ctx
.
Event
.
inputs
;
Event
.
outputs
=
ctx
.
Event
.
outputs
;
Event
.
locals
=
[]
;
(* fixme *)
Event
.
data
=
ctx
.
Event
.
data
;
Event
.
sinfo
=
None
;
Event
.
next
=
...
...
@@ -2354,12 +2364,15 @@ and (to_reactive_prg_ldbg :
Event
.
name
=
rid
;
Event
.
inputs
=
ctx
.
Event
.
inputs
;
Event
.
outputs
=
ctx
.
Event
.
outputs
;
Event
.
locals
=
[]
;
(* fixme *)
Event
.
data
=
edata
;
Event
.
sinfo
=
Some
(
fun
()
->
{
Event
.
expr
=
cstr
;
(*Event.str = guard_to_string zeguard; *)
Event
.
more
=
None
;
Event
.
atoms
=
si_atoms
;
Event
.
in_subst
=
[]
;
Event
.
out_subst
=
[]
;
});
Event
.
next
=
(
fun
()
->
...
...
@@ -2382,6 +2395,7 @@ and (to_reactive_prg_ldbg :
Event
.
name
=
rid
;
Event
.
inputs
=
ctx
.
Event
.
inputs
;
Event
.
outputs
=
ctx
.
Event
.
outputs
;
Event
.
locals
=
[]
;
(* fixme *)
Event
.
data
=
edata
@
predata
;
Event
.
next
=
(
fun
()
->
genpath_ldbg
it
data
cstate
ctx
cont2
fail_cont
excn_cont
);
Event
.
terminate
=
ctx
.
Event
.
terminate
;
...
...
@@ -2562,6 +2576,7 @@ let (step_ldbg: ctx -> string -> t -> control_state -> data_state ->
Event
.
name
=
node
;
Event
.
inputs
=
ctx
.
Event
.
inputs
;
Event
.
outputs
=
ctx
.
Event
.
outputs
;
Event
.
locals
=
[]
;
(* fixme *)
Event
.
data
=
edata
;
Event
.
sinfo
=
Some
(
fun
()
->
{
...
...
@@ -2569,6 +2584,8 @@ let (step_ldbg: ctx -> string -> t -> control_state -> data_state ->
(* Event.str = guard_to_string zeguard; *)
Event
.
more
=
None
;
Event
.
atoms
=
si_atoms
;
Event
.
in_subst
=
[]
;
Event
.
out_subst
=
[]
;
});
(* Event.Exit (guard_to_string zeguard, cstr, lazy_si) *)
...
...
lutin/src/version.ml
View file @
ce64ac1a
let
str
=
"2.2
7
"
let
sha
=
"
25eb7e2
"
let
str
=
"2.2
8
"
let
sha
=
"
dbb5c44
"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment