Skip to content

Use -1 as "This fd is closed" instead of 0 #6

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

Open
Jille wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use -1 as "This fd is closed" instead of 0 #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a37435
Use -1 as "This fd is closed" instead of 0, which can be a valid file…
Jille Apr 27, 2012
71e393c
Workaround FreeBSD's sendfile not reading data from the disk. #5
Jille Apr 27, 2012
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
11 changes: 8 additions & 3 deletions berthad-vfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ static void conn_put_free(BProgram* prog, GList* lhconn)
BConnPut* data = conn->state_data;
if (data->checksum)
g_checksum_free(data->checksum);
if (data->fd)
if (data->fd != -1)
close (data->fd);
if (data->tmp_fn) {
unlink(data->tmp_fn->str);
Expand All @@ -589,7 +589,7 @@ static void conn_get_free(BProgram* prog, GList* lhconn)
{
BConn* conn = lhconn->data;
BConnGet* data = conn->state_data;
if (data->fd)
if (data->fd != -1)
close(data->fd);
#ifdef USE_SPLICE
if (data->pipe[0])
Expand Down Expand Up @@ -1019,8 +1019,11 @@ static inline void conn_get_handle__sendfile(BProgram* prog, GList* lhconn)
/* Socket buffers are full */
data->socket_ready = FALSE;
} else if(errno == EBUSY) {
char cbuf;
/* File buffers are depleted */
data->file_ready = FALSE;
/* Trigger the kernel to read from the disk */
res = read(data->fd, &cbuf, 1);
Copy link
Member

@bwesterb bwesterb May 12, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is blocking, right? Would a async read do it?

Copy link
Member Author

@Jille Jille May 12, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 740 marks the file as non-blocking.

Copy link
Member

@bwesterb bwesterb May 12, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A, right :).

} else {
perror("sendfile");
g_error("Sendfile failed?!\n");
Expand All @@ -1035,7 +1038,9 @@ static inline void conn_get_handle__sendfile(BProgram* prog, GList* lhconn)
/* We're done! */
shutdown(conn->sock, SHUT_RDWR);
conn_close(prog, lhconn);
return;
}
lseek(data->fd, data->n_sent, SEEK_SET);
}
#endif /* USE_SENDFILE */

Expand Down Expand Up @@ -1296,7 +1301,7 @@ static void conn_put_handle(BProgram* prog, GList* lhconn)

/* Close the file descriptor */
close(data->fd);
data->fd = 0;
data->fd = -1;

/* Get the final key */
g_checksum_get_digest(data->checksum, key, &len);
Expand Down