Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
why3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
119
Issues
119
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Why3
why3
Commits
88ce0c36
Commit
88ce0c36
authored
Apr 14, 2016
by
Johannes Kanig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve handling of runstdin command
parent
11317218
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
src/driver/call_provers.ml
src/driver/call_provers.ml
+1
-0
src/driver/prove_client.ml
src/driver/prove_client.ml
+7
-1
src/driver/prove_client.mli
src/driver/prove_client.mli
+1
-1
src/server/server-unix.c
src/server/server-unix.c
+1
-1
No files found.
src/driver/call_provers.ml
View file @
88ce0c36
...
...
@@ -359,6 +359,7 @@ let call_on_file ~command ~limit ~res_parser ~printer_mapping
Hashtbl
.
add
saved_data
id
save
;
let
timelimit
=
get_time
limit
in
let
memlimit
=
get_mem
limit
in
let
use_stdin
=
if
use_stdin
then
Some
fin
else
None
in
Prove_client
.
send_request
~
use_stdin
~
id
~
timelimit
~
memlimit
~
cmd
;
ServerCall
id
...
...
src/driver/prove_client.ml
View file @
88ce0c36
...
...
@@ -95,7 +95,7 @@ let set_max_running_provers x =
let
send_request
~
use_stdin
~
id
~
timelimit
~
memlimit
~
cmd
=
force_connect
()
;
let
buf
=
Buffer
.
create
128
in
let
servercommand
=
if
use_stdin
then
"runstdin;"
else
"run;"
in
let
servercommand
=
if
use_stdin
<>
None
then
"runstdin;"
else
"run;"
in
Buffer
.
add_string
buf
servercommand
;
Buffer
.
add_string
buf
(
string_of_int
id
);
Buffer
.
add_char
buf
'
;
'
;
...
...
@@ -106,6 +106,12 @@ let send_request ~use_stdin ~id ~timelimit ~memlimit ~cmd =
Buffer
.
add_char
buf
'
;
'
;
Buffer
.
add_string
buf
x
)
cmd
;
begin
match
use_stdin
with
|
None
->
()
|
Some
s
->
Buffer
.
add_char
buf
'
;
'
;
Buffer
.
add_string
buf
s
end
;
Buffer
.
add_char
buf
'\n'
;
let
s
=
Buffer
.
contents
buf
in
send_request_string
s
...
...
src/driver/prove_client.mli
View file @
88ce0c36
...
...
@@ -6,7 +6,7 @@ val set_max_running_provers : int -> unit
val
connect
:
unit
->
unit
val
send_request
:
use_stdin
:
bool
->
use_stdin
:
string
option
->
id
:
int
->
timelimit
:
int
->
memlimit
:
int
->
...
...
src/server/server-unix.c
View file @
88ce0c36
...
...
@@ -257,7 +257,7 @@ pid_t create_process(char* cmd,
unix_argv
=
(
char
**
)
malloc
(
sizeof
(
char
*
)
*
(
argc
+
2
));
unix_argv
[
0
]
=
cmd
;
unix_argv
[
argc
+
1
]
=
NULL
;
for
(
i
=
0
;
i
<
argc
;
i
++
)
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
unix_argv
[
i
+
1
]
=
argv
[
i
];
}
...
...
Write
Preview
Markdown
is supported
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