Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/360997c265c10a47a5421c4c1e74ece5a4d46725
...commit
http://git.netsurf-browser.org/netsurf.git/commit/360997c265c10a47a5421c4c1e74ece5a4d46725
...tree
http://git.netsurf-browser.org/netsurf.git/tree/360997c265c10a47a5421c4c1e74ece5a4d46725
The branch, master has been updated
via 360997c265c10a47a5421c4c1e74ece5a4d46725 (commit)
from f3a0e9f0a19f6b88f13b0ad7a11392f0a9b5269e (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=360997c265c10a47a5421c4c1e74ece5a4d46725
commit 360997c265c10a47a5421c4c1e74ece5a4d46725
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
fs_backing_store: Clear entry memory flags on read
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 71d1c83..272f251 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -1194,8 +1194,13 @@ read_entries(struct store_state *state)
nsurl_unref(nsurl);
NSLOG(netsurf, DEBUG, "Successfully read entry for %s",
nsurl_access(ent->url));
read_entries++;
+ /* Note the size allocation */
state->total_alloc += ent->elem[ENTRY_ELEM_DATA].size;
state->total_alloc += ent->elem[ENTRY_ELEM_META].size;
+ /* And ensure we don't pretend to have this in memory
yet */
+ ent->elem[ENTRY_ELEM_DATA].flags &=
~(ENTRY_ELEM_FLAG_HEAP | ENTRY_ELEM_FLAG_MMAP);
+ ent->elem[ENTRY_ELEM_META].flags &=
~(ENTRY_ELEM_FLAG_HEAP | ENTRY_ELEM_FLAG_MMAP);
+
}
close(fd);
}
-----------------------------------------------------------------------
Summary of changes:
content/fs_backing_store.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 71d1c83..272f251 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -1194,8 +1194,13 @@ read_entries(struct store_state *state)
nsurl_unref(nsurl);
NSLOG(netsurf, DEBUG, "Successfully read entry for %s",
nsurl_access(ent->url));
read_entries++;
+ /* Note the size allocation */
state->total_alloc += ent->elem[ENTRY_ELEM_DATA].size;
state->total_alloc += ent->elem[ENTRY_ELEM_META].size;
+ /* And ensure we don't pretend to have this in memory
yet */
+ ent->elem[ENTRY_ELEM_DATA].flags &=
~(ENTRY_ELEM_FLAG_HEAP | ENTRY_ELEM_FLAG_MMAP);
+ ent->elem[ENTRY_ELEM_META].flags &=
~(ENTRY_ELEM_FLAG_HEAP | ENTRY_ELEM_FLAG_MMAP);
+
}
close(fd);
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
