Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds a FLUSH io function #392

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Adds a FLUSH io function #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13c8d18
fix off by one string length error
enricozb Jun 18, 2024
5938a0b
add io flush
enricozb Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions src/run.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ Str readback_str(Net* net, Book* book, Port port) {
case LIST_CONS: {
if (ctr.args_len != 2) break;
if (get_tag(ctr.args_buf[0]) != NUM) break;
if (str.text_len >= 256) { printf("ERROR: for now, HVM can only readback strings of length <256."); break; }
if (str.text_len >= 255) { printf("ERROR: for now, HVM can only readback strings of length <=255."); break; }

str.text_buf[str.text_len++] = get_u24(get_val(ctr.args_buf[0]));
boot_redex(net, new_pair(ctr.args_buf[1], ROOT));
port = ROOT;
Expand Down Expand Up @@ -341,7 +342,7 @@ Port io_open(Net* net, Book* book, Port argm) {
Port io_close(Net* net, Book* book, Port argm) {
FILE* fp = readback_file(argm);
if (fp == NULL) {
fprintf(stderr, "io_close: failed to close\n");
fprintf(stderr, "io_close: invalid file descriptor\n");
return new_port(ERA, 0);
}

Expand Down Expand Up @@ -382,6 +383,23 @@ Port io_write(Net* net, Book* book, Port argm) {
return new_port(ERA, 0);
}

// Flushes an output stream.
Port io_flush(Net* net, Book* book, Port argm) {
FILE* fp = readback_file(argm);
if (fp == NULL) {
fprintf(stderr, "io_flush: invalid file descriptor\n");
return new_port(ERA, 0);
}

int err = fflush(fp) != 0;
if (err != 0) {
fprintf(stderr, "io_flush: failed to flush: %i\n", err);
return new_port(ERA, 0);
}

return new_port(ERA, 0);
}

// Seeks to a position in a file.
// `argm` is a 3-tuple (CON fd (CON offset whence)), where
// - fd is a file descriptor
Expand Down Expand Up @@ -472,6 +490,7 @@ void book_init(Book* book) {
book->ffns_buf[book->ffns_len++] = (FFn){"READ", io_read};
book->ffns_buf[book->ffns_len++] = (FFn){"OPEN", io_open};
book->ffns_buf[book->ffns_len++] = (FFn){"CLOSE", io_close};
book->ffns_buf[book->ffns_len++] = (FFn){"FLUSH", io_flush};
book->ffns_buf[book->ffns_len++] = (FFn){"WRITE", io_write};
book->ffns_buf[book->ffns_len++] = (FFn){"SEEK", io_seek};
book->ffns_buf[book->ffns_len++] = (FFn){"GET_TIME", io_get_time};
Expand All @@ -483,7 +502,10 @@ void book_init(Book* book) {

// Runs an IO computation.
void do_run_io(Net* net, Book* book, Port port) {
book_init(book);
book_init(book);

setlinebuf(stdout);
setlinebuf(stderr);

// IO loop
while (TRUE) {
Expand Down
27 changes: 24 additions & 3 deletions src/run.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Str gnet_readback_str(GNet* gnet, Port port) {
case LIST_CONS: {
if (ctr.args_len != 2) break;
if (get_tag(ctr.args_buf[0]) != NUM) break;
if (str.text_len > 256) { printf("ERROR: for now, HVM can only readback strings of length <256."); break; }
if (str.text_len >= 255) { printf("ERROR: for now, HVM can only readback strings of length <256."); break; }

str.text_buf[str.text_len++] = get_u24(get_val(ctr.args_buf[0]));
gnet_boot_redex(gnet, new_pair(ctr.args_buf[1], ROOT));
Expand Down Expand Up @@ -378,7 +378,7 @@ Port io_open(GNet* gnet, Port argm) {
Port io_close(GNet* gnet, Port argm) {
FILE* fp = readback_file(argm);
if (fp == NULL) {
fprintf(stderr, "io_close: failed to close\n");
fprintf(stderr, "io_close: invalid file descriptor\n");
return new_port(ERA, 0);
}

Expand All @@ -392,6 +392,23 @@ Port io_close(GNet* gnet, Port argm) {
return new_port(ERA, 0);
}

// Flushes an output stream.
Port io_flush(GNet* gnet, Port argm) {
FILE* fp = readback_file(argm);
if (fp == NULL) {
fprintf(stderr, "io_flush: invalid file descriptor\n");
return new_port(ERA, 0);
}

int err = fflush(fp) != 0;
if (err != 0) {
fprintf(stderr, "io_flush: failed to flush: %i\n", err);
return new_port(ERA, 0);
}

return new_port(ERA, 0);
}

// Writes a list of bytes to a file.
// `argm` is a tuple (CON node) of the
// file descriptor and list of bytes to write.
Expand Down Expand Up @@ -502,6 +519,7 @@ void book_init(Book* book) {
book->ffns_buf[book->ffns_len++] = (FFn){"READ", io_read};
book->ffns_buf[book->ffns_len++] = (FFn){"OPEN", io_open};
book->ffns_buf[book->ffns_len++] = (FFn){"CLOSE", io_close};
book->ffns_buf[book->ffns_len++] = (FFn){"FLUSH", io_flush};
book->ffns_buf[book->ffns_len++] = (FFn){"WRITE", io_write};
book->ffns_buf[book->ffns_len++] = (FFn){"SEEK", io_seek};
book->ffns_buf[book->ffns_len++] = (FFn){"GET_TIME", io_get_time};
Expand All @@ -515,7 +533,10 @@ void book_init(Book* book) {

// Runs an IO computation.
void do_run_io(GNet* gnet, Book* book, Port port) {
book_init(book);
book_init(book);

setlinebuf(stdout);
setlinebuf(stderr);

// IO loop
while (TRUE) {
Expand Down
Loading