Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/576b1c55bf5a8b37983e1... ...commit http://git.netsurf-browser.org/netsurf.git/commit/576b1c55bf5a8b37983e158... ...tree http://git.netsurf-browser.org/netsurf.git/tree/576b1c55bf5a8b37983e1581a... The branch, master has been updated via 576b1c55bf5a8b37983e1581a6c0cc1a9d7158f5 (commit) from 88711495858ead8749bfcf4c08e1da49a671dd43 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=576b1c55bf5a8b37983... commit 576b1c55bf5a8b37983e1581a6c0cc1a9d7158f5 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; extend backing store logging to show errno values ofter operations diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c index f2e6a38..638a109 100644 --- a/content/fs_backing_store.c +++ b/content/fs_backing_store.c @@ -1603,15 +1603,17 @@ static nserror store_write_block(struct store_state *state, bse->elem[elem_idx].data, bse->elem[elem_idx].size, offst); - - LOG(("Wrote %d of %d bytes from %p at 0x%x block %d", - wr, bse->elem[elem_idx].size, bse->elem[elem_idx].data, - offst, bse->elem[elem_idx].block)); - if (wr != (ssize_t)bse->elem[elem_idx].size) { + LOG(("Write failed %d of %d bytes from %p at 0x%x block %d errno %d", + wr, bse->elem[elem_idx].size, bse->elem[elem_idx].data, + offst, bse->elem[elem_idx].block, errno)); return NSERROR_SAVE_FAILED; } + LOG(("Wrote %d bytes from %p at 0x%x block %d", + wr, bse->elem[elem_idx].data, + offst, bse->elem[elem_idx].block)); + return NSERROR_OK; } @@ -1627,27 +1629,32 @@ static nserror store_write_file(struct store_state *state, struct store_entry *bse, int elem_idx) { - ssize_t written; + ssize_t wr; int fd; + int err; fd = store_open(state, bse->ident, elem_idx, O_CREAT | O_WRONLY); if (fd < 0) { perror(""); - LOG(("Open failed %d", fd)); + LOG(("Open failed %d errno %d", fd, errno)); return NSERROR_SAVE_FAILED; } - written = write(fd, bse->elem[elem_idx].data, bse->elem[elem_idx].size); - - LOG(("Wrote %d of %d bytes from %p", - written, bse->elem[elem_idx].size, bse->elem[elem_idx].data)); + wr = write(fd, bse->elem[elem_idx].data, bse->elem[elem_idx].size); + err = errno; /* close can change errno */ close(fd); - if (written < 0 || (size_t) written < bse->elem[elem_idx].size) { + if (wr != (ssize_t)bse->elem[elem_idx].size) { + LOG(("Write failed %d of %d bytes from %p errno %d", + wr, bse->elem[elem_idx].size, bse->elem[elem_idx].data, + err)); + /** @todo Delete the file? */ return NSERROR_SAVE_FAILED; } + LOG(("Wrote %d bytes from %p", wr, bse->elem[elem_idx].data)); + return NSERROR_OK; } @@ -1742,6 +1749,7 @@ static nserror store_read_block(struct store_state *state, state->blocks[elem_idx][bf].fd = store_open(state, bf, elem_idx + ENTRY_ELEM_COUNT, O_CREAT | O_RDWR); } if (state->blocks[elem_idx][bf].fd == -1) { + LOG(("Open failed errno %d", errno)); return NSERROR_SAVE_FAILED; } @@ -1751,15 +1759,17 @@ static nserror store_read_block(struct store_state *state, bse->elem[elem_idx].data, bse->elem[elem_idx].size, offst); - - LOG(("Read %d of %d bytes into %p from 0x%x block %d", - rd, bse->elem[elem_idx].size, bse->elem[elem_idx].data, - offst, bse->elem[elem_idx].block)); - if (rd != (ssize_t)bse->elem[elem_idx].size) { + LOG(("Failed reading %d of %d bytes into %p from 0x%x block %d errno %d", + rd, bse->elem[elem_idx].size, bse->elem[elem_idx].data, + offst, bse->elem[elem_idx].block, errno)); return NSERROR_SAVE_FAILED; } + LOG(("Read %d bytes into %p from 0x%x block %d", + rd, bse->elem[elem_idx].data, + offst, bse->elem[elem_idx].block)); + return NSERROR_OK; } @@ -1783,20 +1793,17 @@ static nserror store_read_file(struct store_state *state, /* separate file in backing store */ fd = store_open(storestate, bse->ident, elem_idx, O_RDONLY); if (fd < 0) { - LOG(("Open failed")); + LOG(("Open failed %d errno %d", fd, errno)); /** @todo should this invalidate the entry? */ return NSERROR_NOT_FOUND; } - LOG(("Reading %d bytes into %p from file", - bse->elem[elem_idx].size, bse->elem[elem_idx].data)); - while (tot < bse->elem[elem_idx].size) { rd = read(fd, bse->elem[elem_idx].data + tot, bse->elem[elem_idx].size - tot); if (rd <= 0) { - LOG(("read error returned %d", rd)); + LOG(("read error returned %d errno %d", rd, errno)); ret = NSERROR_NOT_FOUND; break; } @@ -1805,6 +1812,8 @@ static nserror store_read_file(struct store_state *state, close(fd); + LOG(("Read %d bytes into %p", tot, bse->elem[elem_idx].data)); + return ret; } ----------------------------------------------------------------------- Summary of changes: content/fs_backing_store.c | 53 ++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c index f2e6a38..638a109 100644 --- a/content/fs_backing_store.c +++ b/content/fs_backing_store.c @@ -1603,15 +1603,17 @@ static nserror store_write_block(struct store_state *state, bse->elem[elem_idx].data, bse->elem[elem_idx].size, offst); - - LOG(("Wrote %d of %d bytes from %p at 0x%x block %d", - wr, bse->elem[elem_idx].size, bse->elem[elem_idx].data, - offst, bse->elem[elem_idx].block)); - if (wr != (ssize_t)bse->elem[elem_idx].size) { + LOG(("Write failed %d of %d bytes from %p at 0x%x block %d errno %d", + wr, bse->elem[elem_idx].size, bse->elem[elem_idx].data, + offst, bse->elem[elem_idx].block, errno)); return NSERROR_SAVE_FAILED; } + LOG(("Wrote %d bytes from %p at 0x%x block %d", + wr, bse->elem[elem_idx].data, + offst, bse->elem[elem_idx].block)); + return NSERROR_OK; } @@ -1627,27 +1629,32 @@ static nserror store_write_file(struct store_state *state, struct store_entry *bse, int elem_idx) { - ssize_t written; + ssize_t wr; int fd; + int err; fd = store_open(state, bse->ident, elem_idx, O_CREAT | O_WRONLY); if (fd < 0) { perror(""); - LOG(("Open failed %d", fd)); + LOG(("Open failed %d errno %d", fd, errno)); return NSERROR_SAVE_FAILED; } - written = write(fd, bse->elem[elem_idx].data, bse->elem[elem_idx].size); - - LOG(("Wrote %d of %d bytes from %p", - written, bse->elem[elem_idx].size, bse->elem[elem_idx].data)); + wr = write(fd, bse->elem[elem_idx].data, bse->elem[elem_idx].size); + err = errno; /* close can change errno */ close(fd); - if (written < 0 || (size_t) written < bse->elem[elem_idx].size) { + if (wr != (ssize_t)bse->elem[elem_idx].size) { + LOG(("Write failed %d of %d bytes from %p errno %d", + wr, bse->elem[elem_idx].size, bse->elem[elem_idx].data, + err)); + /** @todo Delete the file? */ return NSERROR_SAVE_FAILED; } + LOG(("Wrote %d bytes from %p", wr, bse->elem[elem_idx].data)); + return NSERROR_OK; } @@ -1742,6 +1749,7 @@ static nserror store_read_block(struct store_state *state, state->blocks[elem_idx][bf].fd = store_open(state, bf, elem_idx + ENTRY_ELEM_COUNT, O_CREAT | O_RDWR); } if (state->blocks[elem_idx][bf].fd == -1) { + LOG(("Open failed errno %d", errno)); return NSERROR_SAVE_FAILED; } @@ -1751,15 +1759,17 @@ static nserror store_read_block(struct store_state *state, bse->elem[elem_idx].data, bse->elem[elem_idx].size, offst); - - LOG(("Read %d of %d bytes into %p from 0x%x block %d", - rd, bse->elem[elem_idx].size, bse->elem[elem_idx].data, - offst, bse->elem[elem_idx].block)); - if (rd != (ssize_t)bse->elem[elem_idx].size) { + LOG(("Failed reading %d of %d bytes into %p from 0x%x block %d errno %d", + rd, bse->elem[elem_idx].size, bse->elem[elem_idx].data, + offst, bse->elem[elem_idx].block, errno)); return NSERROR_SAVE_FAILED; } + LOG(("Read %d bytes into %p from 0x%x block %d", + rd, bse->elem[elem_idx].data, + offst, bse->elem[elem_idx].block)); + return NSERROR_OK; } @@ -1783,20 +1793,17 @@ static nserror store_read_file(struct store_state *state, /* separate file in backing store */ fd = store_open(storestate, bse->ident, elem_idx, O_RDONLY); if (fd < 0) { - LOG(("Open failed")); + LOG(("Open failed %d errno %d", fd, errno)); /** @todo should this invalidate the entry? */ return NSERROR_NOT_FOUND; } - LOG(("Reading %d bytes into %p from file", - bse->elem[elem_idx].size, bse->elem[elem_idx].data)); - while (tot < bse->elem[elem_idx].size) { rd = read(fd, bse->elem[elem_idx].data + tot, bse->elem[elem_idx].size - tot); if (rd <= 0) { - LOG(("read error returned %d", rd)); + LOG(("read error returned %d errno %d", rd, errno)); ret = NSERROR_NOT_FOUND; break; } @@ -1805,6 +1812,8 @@ static nserror store_read_file(struct store_state *state, close(fd); + LOG(("Read %d bytes into %p", tot, bse->elem[elem_idx].data)); + return ret; } -- NetSurf Browser