Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
f02ebf08
Commit
f02ebf08
authored
9 months ago
by
David Bühler
Browse files
Options
Downloads
Patches
Plain Diff
[Ivette] Adds a better error message when a request is rejected by Frama-C.
Also adds a warning from the Frama-C server.
parent
efc1edbd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ivette/src/frama-c/server.ts
+4
-1
4 additions, 1 deletion
ivette/src/frama-c/server.ts
src/plugins/server/main.ml
+1
-0
1 addition, 0 deletions
src/plugins/server/main.ml
with
5 additions
and
1 deletion
ivette/src/frama-c/server.ts
+
4
−
1
View file @
f02ebf08
...
@@ -880,7 +880,10 @@ client.onKilled((id: string) => {
...
@@ -880,7 +880,10 @@ client.onKilled((id: string) => {
client
.
onRejected
((
id
:
string
)
=>
{
client
.
onRejected
((
id
:
string
)
=>
{
const
p
=
pending
.
get
(
id
);
const
p
=
pending
.
get
(
id
);
if
(
p
)
{
if
(
p
)
{
p
.
reject
(
'
rejected
'
);
const
err
=
'
Request rejected by Frama-C: the related plugin may not be loaded,
'
+
'
or the Frama-C version is incompatible.
'
;
p
.
reject
(
err
);
_resolved
(
id
);
_resolved
(
id
);
logModel
.
registerRequest
(
logModel
.
registerRequest
(
{
rid
:
id
,
statut
:
statutLog
.
REJECTED
}
{
rid
:
id
,
statut
:
statutLog
.
REJECTED
}
...
...
This diff is collapsed.
Click to expand it.
src/plugins/server/main.ml
+
1
−
0
View file @
f02ebf08
...
@@ -279,6 +279,7 @@ let process_request (server : 'a server) (request : 'a request) : unit =
...
@@ -279,6 +279,7 @@ let process_request (server : 'a server) (request : 'a request) : unit =
begin
begin
match
find
request
with
match
find
request
with
|
None
->
|
None
->
Senv
.
warning
~
once
:
true
"Unknown request %s"
request
;
Senv
.
debug
"Rejected %a"
server
.
pretty
id
;
Senv
.
debug
"Rejected %a"
server
.
pretty
id
;
Queue
.
push
(
`Rejected
id
)
server
.
q_out
Queue
.
push
(
`Rejected
id
)
server
.
q_out
|
Some
(
kind
,
handler
)
->
|
Some
(
kind
,
handler
)
->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment