general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix benchmark programs by correcting program paths

Browse Source
This commit is contained in:
Tate, Hongliang Tian 2019-12-01 02:59:46 +00:00
parent e09c747b84
commit 7024fa81ec
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Makefile
View File

@ -3,7 +3,7 @@ PROJECT_DIR := $(realpath $(CUR_DIR)/../)
BUILD_DIR := $(PROJECT_DIR)/build BUILD_DIR := $(PROJECT_DIR)/build
# Dependencies: need to be compiled but not to run by any Makefile target # Dependencies: need to be compiled but not to run by any Makefile target
TEST_DEPS := dev_null client TEST_DEPS := client data_sink
# Tests: need to be compiled and run by test-% target # Tests: need to be compiled and run by test-% target
TESTS := empty env hello_world malloc mmap file fs_perms getpid spawn sched pipe time \ TESTS := empty env hello_world malloc mmap file fs_perms getpid spawn sched pipe time \
truncate readdir mkdir link tls pthread uname rlimit server \ truncate readdir mkdir link tls pthread uname rlimit server \

0
test/dev_null/Makefile → test/data_sink/Makefile
View File

1
test/dev_null/main.c → test/data_sink/main.c
View File

@ -5,6 +5,7 @@
#define MIN(x, y) ((x) <= (y) ? (x) : (y)) #define MIN(x, y) ((x) <= (y) ? (x) : (y))
// This program consumes a specific amount of data from stdin
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
// Get the total number of bytes to read // Get the total number of bytes to read
size_t remain_bytes = 0; size_t remain_bytes = 0;

2
test/pipe_throughput/main.c
View File

@ -33,7 +33,7 @@ int main(int argc, const char* argv[]) {
posix_spawn_file_actions_addclose(&file_actions, pipe_wr_fd); posix_spawn_file_actions_addclose(&file_actions, pipe_wr_fd);
int child_pid; int child_pid;
if (posix_spawn(&child_pid, "dev_null", &file_actions, if (posix_spawn(&child_pid, "/bin/data_sink", &file_actions,
NULL, NULL, NULL) < 0) { NULL, NULL, NULL) < 0) {
printf("ERROR: failed to spawn a child process\n"); printf("ERROR: failed to spawn a child process\n");
return -1; return -1;

2
test/spawn_and_exit_latency/main.c
View File

@ -13,7 +13,7 @@ int main(int argc, const char* argv[]) {
gettimeofday(&tv_start, NULL); gettimeofday(&tv_start, NULL);
for (unsigned long i = 0; i < NREPEATS; i++) { for (unsigned long i = 0; i < NREPEATS; i++) {
int child_pid, status; int child_pid, status;
if (posix_spawn(&child_pid, "empty", NULL, NULL, NULL, NULL) <0) { if (posix_spawn(&child_pid, "/bin/empty", NULL, NULL, NULL, NULL) <0) {
printf("ERROR: failed to spawn (# of repeats = %lu)\n", i); printf("ERROR: failed to spawn (# of repeats = %lu)\n", i);
return -1; return -1;
} }

4
test/unix_socket_throughput/main.c
View File

@ -110,8 +110,8 @@ int main(int argc, const char* argv[]) {
int child_pid; int child_pid;
extern char ** environ; extern char ** environ;
char* new_argv[] = {"./dev_null", NULL}; char* new_argv[] = {"/bin/data_sink", NULL};
if (posix_spawn(&child_pid, "dev_null", &file_actions, if (posix_spawn(&child_pid, "/bin/data_sink", &file_actions,
NULL, new_argv, environ) < 0) { NULL, new_argv, environ) < 0) {
printf("ERROR: failed to spawn a child process\n"); printf("ERROR: failed to spawn a child process\n");
return -1; return -1;