Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/133e00edbeca192baad67ebaa9a9356ae5788051
...commit
http://git.netsurf-browser.org/netsurf.git/commit/133e00edbeca192baad67ebaa9a9356ae5788051
...tree
http://git.netsurf-browser.org/netsurf.git/tree/133e00edbeca192baad67ebaa9a9356ae5788051
The branch, master has been updated
via 133e00edbeca192baad67ebaa9a9356ae5788051 (commit)
via c88106e02ab1e022f277299a3014e00d0d0926b9 (commit)
via 0b4d1fbb1ba1e2374307e9dfc637c9d3634b77b0 (commit)
via 40cb70b845686236a6e7c73bc6e5f242cbb35da8 (commit)
via a8ffa12cdf43a61a9112203944e6e0a626a048b0 (commit)
from 79821cd9cf31686f583e63b8cde33246f82a1936 (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=133e00edbeca192baad67ebaa9a9356ae5788051
commit 133e00edbeca192baad67ebaa9a9356ae5788051
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
fs_backing_store: 8K metadata blocks, 1K blocks, bump version
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 481519d..5716ea2 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -62,7 +62,7 @@
#define DEFAULT_ENTRY_SIZE 16
/** Backing store file format version */
-#define CONTROL_VERSION 200
+#define CONTROL_VERSION 201
/** Number of milliseconds after a update before control data maintenance is
performed */
#define CONTROL_MAINT_TIME 10000
@@ -77,7 +77,7 @@
#define BLOCK_ADDR_LEN 16
/** log2 number of entries per block file(4k) */
-#define BLOCK_ENTRY_COUNT 12
+#define BLOCK_ENTRY_COUNT 10
/** log2 number of data block files */
#define BLOCK_FILE_COUNT (BLOCK_ADDR_LEN - BLOCK_ENTRY_COUNT)
@@ -86,7 +86,7 @@
#define BLOCK_DATA_SIZE 13
/** log2 size of metadata blocks (1k) */
-#define BLOCK_META_SIZE 10
+#define BLOCK_META_SIZE 13
/** length in bytes of a block files use map */
#define BLOCK_USE_MAP_SIZE (1 << (BLOCK_ENTRY_COUNT - 3))
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c88106e02ab1e022f277299a3014e00d0d0926b9
commit c88106e02ab1e022f277299a3014e00d0d0926b9
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
monkey_driver: Add launch-time option support
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/test/monkey_driver.py b/test/monkey_driver.py
index 20d4994..0a9e29a 100755
--- a/test/monkey_driver.py
+++ b/test/monkey_driver.py
@@ -234,8 +234,12 @@ def run_test_step_action_launch(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
assert ctx.get('browser') is None
assert ctx.get('windows') is None
+ monkey_cmd = [ctx["monkey"]]
+ for option in step.get('launch-options', []):
+ monkey_cmd.append("--{}".format(option))
+ print(get_indent(ctx) + " " + "Command line: " + repr(monkey_cmd))
ctx['browser'] = DriverBrowser(
- monkey_cmd=[ctx["monkey"]],
+ monkey_cmd=monkey_cmd,
quiet=True,
wrapper=ctx.get("wrapper"))
assert_browser(ctx)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0b4d1fbb1ba1e2374307e9dfc637c9d3634b77b0
commit 0b4d1fbb1ba1e2374307e9dfc637c9d3634b77b0
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
monkey: Enable disc cache optionally on monkey
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/frontends/monkey/Makefile.defaults
b/frontends/monkey/Makefile.defaults
index d6a90a3..87b6f3a 100644
--- a/frontends/monkey/Makefile.defaults
+++ b/frontends/monkey/Makefile.defaults
@@ -9,5 +9,6 @@ NETSURF_USE_RSVG := NO
NETSURF_USE_NSSVG := NO
NETSURF_USE_ROSPRITE := NO
NETSURF_USE_HARU_PDF := NO
+NETSURF_FS_BACKING_STORE := YES
CFLAGS += -O2
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index 1aced80..e4d32d8 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -37,6 +37,7 @@
#include "netsurf/url_db.h"
#include "netsurf/cookie_db.h"
#include "content/fetch.h"
+#include "content/backing_store.h"
#include "monkey/output.h"
#include "monkey/dispatch.h"
@@ -355,6 +356,7 @@ main(int argc, char **argv)
.fetch = monkey_fetch_table,
.bitmap = monkey_bitmap_table,
.layout = monkey_layout_table,
+ .llcache = filesystem_llcache_table,
};
ret = netsurf_register(&monkey_table);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=40cb70b845686236a6e7c73bc6e5f242cbb35da8
commit 40cb70b845686236a6e7c73bc6e5f242cbb35da8
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
netsurf_init: Use disc_cache_path if specified, otherwise platform path
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 7577e1f..547365b 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -164,7 +164,10 @@ nserror netsurf_init(const char *store_path)
hlcache_parameters.llcache.store.hysteresis =
(hlcache_parameters.llcache.store.limit * 20) / 100;;
/* set the path to the backing store */
- hlcache_parameters.llcache.store.path = store_path;
+ hlcache_parameters.llcache.store.path =
+ nsoption_charp(disc_cache_path) ?
+ nsoption_charp(disc_cache_path) :
+ store_path;
/* image handler bitmap cache */
ret = image_cache_init(&image_cache_parameters);
diff --git a/docs/netsurf-options.md b/docs/netsurf-options.md
index 4e87d9b..5a723c7 100644
--- a/docs/netsurf-options.md
+++ b/docs/netsurf-options.md
@@ -42,6 +42,7 @@ General Options
memory_cache_size | int | 12MiB | Preferred maximum size of memory
cache in bytes.
disc_cache_size | uint | 1GiB | Preferred expiry size of disc
cache in bytes.
disc_cache_age | int | 28 | Preferred expiry age of disc
cache in days.
+ disc_cache_path | string | NULL | Path to disc cache, NULL means to
use system path |
block_advertisements | bool | false | Whether to block advertisements
do_not_track | bool | false | Disable website tracking [1]
send_referer | bool | true | Whether to send the referer HTTP
header.
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=a8ffa12cdf43a61a9112203944e6e0a626a048b0
commit a8ffa12cdf43a61a9112203944e6e0a626a048b0
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
options: Add disc_cache_path option
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/desktop/options.h b/desktop/options.h
index 326e041..539ff21 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -92,6 +92,9 @@ NSOPTION_STRING(accept_charset, NULL)
/** Preferred maximum size of memory cache / bytes. */
NSOPTION_INTEGER(memory_cache_size, 12 * 1024 * 1024)
+/** Preferred location of disc cache, or NULL for system provided location */
+NSOPTION_STRING(disc_cache_path, NULL)
+
/** Preferred expiry size of disc cache / bytes. */
NSOPTION_UINT(disc_cache_size, 1024 * 1024 * 1024)
-----------------------------------------------------------------------
Summary of changes:
content/fs_backing_store.c | 6 +++---
desktop/netsurf.c | 5 ++++-
desktop/options.h | 3 +++
docs/netsurf-options.md | 1 +
frontends/monkey/Makefile.defaults | 1 +
frontends/monkey/main.c | 2 ++
test/monkey_driver.py | 6 +++++-
7 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 481519d..5716ea2 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -62,7 +62,7 @@
#define DEFAULT_ENTRY_SIZE 16
/** Backing store file format version */
-#define CONTROL_VERSION 200
+#define CONTROL_VERSION 201
/** Number of milliseconds after a update before control data maintenance is
performed */
#define CONTROL_MAINT_TIME 10000
@@ -77,7 +77,7 @@
#define BLOCK_ADDR_LEN 16
/** log2 number of entries per block file(4k) */
-#define BLOCK_ENTRY_COUNT 12
+#define BLOCK_ENTRY_COUNT 10
/** log2 number of data block files */
#define BLOCK_FILE_COUNT (BLOCK_ADDR_LEN - BLOCK_ENTRY_COUNT)
@@ -86,7 +86,7 @@
#define BLOCK_DATA_SIZE 13
/** log2 size of metadata blocks (1k) */
-#define BLOCK_META_SIZE 10
+#define BLOCK_META_SIZE 13
/** length in bytes of a block files use map */
#define BLOCK_USE_MAP_SIZE (1 << (BLOCK_ENTRY_COUNT - 3))
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 7577e1f..547365b 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -164,7 +164,10 @@ nserror netsurf_init(const char *store_path)
hlcache_parameters.llcache.store.hysteresis =
(hlcache_parameters.llcache.store.limit * 20) / 100;;
/* set the path to the backing store */
- hlcache_parameters.llcache.store.path = store_path;
+ hlcache_parameters.llcache.store.path =
+ nsoption_charp(disc_cache_path) ?
+ nsoption_charp(disc_cache_path) :
+ store_path;
/* image handler bitmap cache */
ret = image_cache_init(&image_cache_parameters);
diff --git a/desktop/options.h b/desktop/options.h
index 326e041..539ff21 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -92,6 +92,9 @@ NSOPTION_STRING(accept_charset, NULL)
/** Preferred maximum size of memory cache / bytes. */
NSOPTION_INTEGER(memory_cache_size, 12 * 1024 * 1024)
+/** Preferred location of disc cache, or NULL for system provided location */
+NSOPTION_STRING(disc_cache_path, NULL)
+
/** Preferred expiry size of disc cache / bytes. */
NSOPTION_UINT(disc_cache_size, 1024 * 1024 * 1024)
diff --git a/docs/netsurf-options.md b/docs/netsurf-options.md
index 4e87d9b..5a723c7 100644
--- a/docs/netsurf-options.md
+++ b/docs/netsurf-options.md
@@ -42,6 +42,7 @@ General Options
memory_cache_size | int | 12MiB | Preferred maximum size of memory
cache in bytes.
disc_cache_size | uint | 1GiB | Preferred expiry size of disc
cache in bytes.
disc_cache_age | int | 28 | Preferred expiry age of disc
cache in days.
+ disc_cache_path | string | NULL | Path to disc cache, NULL means to
use system path |
block_advertisements | bool | false | Whether to block advertisements
do_not_track | bool | false | Disable website tracking [1]
send_referer | bool | true | Whether to send the referer HTTP
header.
diff --git a/frontends/monkey/Makefile.defaults
b/frontends/monkey/Makefile.defaults
index d6a90a3..87b6f3a 100644
--- a/frontends/monkey/Makefile.defaults
+++ b/frontends/monkey/Makefile.defaults
@@ -9,5 +9,6 @@ NETSURF_USE_RSVG := NO
NETSURF_USE_NSSVG := NO
NETSURF_USE_ROSPRITE := NO
NETSURF_USE_HARU_PDF := NO
+NETSURF_FS_BACKING_STORE := YES
CFLAGS += -O2
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index 1aced80..e4d32d8 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -37,6 +37,7 @@
#include "netsurf/url_db.h"
#include "netsurf/cookie_db.h"
#include "content/fetch.h"
+#include "content/backing_store.h"
#include "monkey/output.h"
#include "monkey/dispatch.h"
@@ -355,6 +356,7 @@ main(int argc, char **argv)
.fetch = monkey_fetch_table,
.bitmap = monkey_bitmap_table,
.layout = monkey_layout_table,
+ .llcache = filesystem_llcache_table,
};
ret = netsurf_register(&monkey_table);
diff --git a/test/monkey_driver.py b/test/monkey_driver.py
index 20d4994..0a9e29a 100755
--- a/test/monkey_driver.py
+++ b/test/monkey_driver.py
@@ -234,8 +234,12 @@ def run_test_step_action_launch(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
assert ctx.get('browser') is None
assert ctx.get('windows') is None
+ monkey_cmd = [ctx["monkey"]]
+ for option in step.get('launch-options', []):
+ monkey_cmd.append("--{}".format(option))
+ print(get_indent(ctx) + " " + "Command line: " + repr(monkey_cmd))
ctx['browser'] = DriverBrowser(
- monkey_cmd=[ctx["monkey"]],
+ monkey_cmd=monkey_cmd,
quiet=True,
wrapper=ctx.get("wrapper"))
assert_browser(ctx)
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
