October 2009 - netsurf-commits - listmaster.pepperfish.net

r9644 jmb - /branches/jmb/new-cache/test/llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 20:49:43 2009 New Revision: 9644 URL: http://source.netsurf-browser.org?rev=9644&view=rev Log: Don't print notification of progress events -- it's just noise. Attempt to fetch a second object from the cache. Modified: branches/jmb/new-cache/test/llcache.c Modified: branches/jmb/new-cache/test/llcache.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/test/llcache.c?r... ============================================================================== --- branches/jmb/new-cache/test/llcache.c (original) +++ branches/jmb/new-cache/test/llcache.c Wed Oct 14 20:49:43 2009 @@ -111,7 +111,8 @@ }; bool *done = pw; - fprintf(stdout, "%p : %s\n", handle, event_names[event->type]); + if (event->type != LLCACHE_EVENT_PROGRESS) + fprintf(stdout, "%p : %s\n", handle, event_names[event->type]); /* Inform main() that the fetch completed */ if (event->type == LLCACHE_EVENT_DONE) @@ -124,6 +125,7 @@ { nserror error; llcache_handle *handle; + llcache_handle *handle2; bool done = false; /* Initialise subsystems */ @@ -152,7 +154,22 @@ llcache_poll(); } + done = false; + error = llcache_handle_retrieve("http://www.netsurf-browser.org/", + LLCACHE_RETRIEVE_VERIFIABLE, NULL, NULL, + event_handler, &done, &handle2); + if (error != NSERROR_OK) { + fprintf(stderr, "llcache_handle_retrieve: %d\n", error); + return 1; + } + + while (done == false) { + fetch_poll(); + llcache_poll(); + } + /* Cleanup */ + llcache_handle_release(handle2); llcache_handle_release(handle); fetch_quit();

13 years, 7 months

1
0
0 / 0

r9643 jmb - /branches/jmb/new-cache/content/llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 20:44:37 2009 New Revision: 9643 URL: http://source.netsurf-browser.org?rev=9643&view=rev Log: Initialise cache control data before fetching Modified: branches/jmb/new-cache/content/llcache.c Modified: branches/jmb/new-cache/content/llcache.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/llcache.... ============================================================================== --- branches/jmb/new-cache/content/llcache.c (original) +++ branches/jmb/new-cache/content/llcache.c Wed Oct 14 20:44:37 2009 @@ -701,6 +701,19 @@ multipart = object->fetch.post->data.multipart; } + /* Reset cache control data */ + object->cache.req_time = time(NULL); + object->cache.res_time = 0; + object->cache.date = 0; + object->cache.expires = 0; + object->cache.age = INVALID_AGE; + object->cache.max_age = INVALID_AGE; + object->cache.no_cache = false; + free(object->cache.etag); + object->cache.etag = NULL; + object->cache.last_modified = 0; + + /* Kick off fetch */ object->fetch.fetch = fetch_start(object->url, object->fetch.referer, llcache_fetch_callback, object, object->fetch.flags & LLCACHE_RETRIEVE_NO_ERROR_PAGES,

13 years, 7 months

1
0
0 / 0

r9642 jmb - /branches/jmb/new-cache/content/llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 20:24:47 2009 New Revision: 9642 URL: http://source.netsurf-browser.org?rev=9642&view=rev Log: It turns out that fetch_start::headers can't be NULL, and must point to a NULL-terminated array of headers. It'd probably help if this were documented. Then again, fetch_start()'s API is dire, not least with respect to const. Modified: branches/jmb/new-cache/content/llcache.c Modified: branches/jmb/new-cache/content/llcache.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/llcache.... ============================================================================== --- branches/jmb/new-cache/content/llcache.c (original) +++ branches/jmb/new-cache/content/llcache.c Wed Oct 14 20:24:47 2009 @@ -689,7 +689,10 @@ nserror llcache_object_refetch(llcache_object *object) { const char *urlenc = NULL; + /** \todo Why is fetch_start's post_multipart parameter not const? */ struct fetch_multipart_data *multipart = NULL; + /** \todo Why is the headers parameter of fetch_start not const? */ + char *headers = NULL; if (object->fetch.post != NULL) { if (object->fetch.post->type == LLCACHE_POST_URL_ENCODED) @@ -704,7 +707,7 @@ urlenc, multipart, object->fetch.flags & LLCACHE_RETRIEVE_VERIFIABLE, NULL, /** \todo Remove parent from this API */ - NULL /** \todo Generate cache-control headers */); + &headers /** \todo Generate cache-control headers */); if (object->fetch.fetch == NULL) return NSERROR_NOMEM;

13 years, 7 months

1
0
0 / 0

r9641 jmb - /branches/jmb/new-cache/test/llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 20:17:47 2009 New Revision: 9641 URL: http://source.netsurf-browser.org?rev=9641&view=rev Log: Ensure test harness initialises and finalises relevant subsystems correctly. It also helps to call fetch_poll() now and again. Modified: branches/jmb/new-cache/test/llcache.c Modified: branches/jmb/new-cache/test/llcache.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/test/llcache.c?r... ============================================================================== --- branches/jmb/new-cache/test/llcache.c (original) +++ branches/jmb/new-cache/test/llcache.c Wed Oct 14 20:17:47 2009 @@ -1,7 +1,9 @@ #include <stdio.h> #include <stdlib.h> +#include "content/fetch.h" #include "content/llcache.h" +#include "utils/url.h" /****************************************************************************** * Things that we'd reasonably expect to have to implement * @@ -124,12 +126,18 @@ llcache_handle *handle; bool done = false; + /* Initialise subsystems */ + url_init(); + fetch_init(); + + /* Initialise low-level cache */ error = llcache_initialise(query_handler, NULL); if (error != NSERROR_OK) { fprintf(stderr, "llcache_initialise: %d\n", error); return 1; } + /* Retrieve an URL from the low-level cache (may trigger fetch) */ error = llcache_handle_retrieve("http://www.netsurf-browser.org/", LLCACHE_RETRIEVE_VERIFIABLE, NULL, NULL, event_handler, &done, &handle); @@ -138,10 +146,16 @@ return 1; } - while (done == false) + /* Poll relevant components */ + while (done == false) { + fetch_poll(); llcache_poll(); + } + /* Cleanup */ llcache_handle_release(handle); + + fetch_quit(); return 0; }

13 years, 7 months

1
0
0 / 0

r9640 jmb - /branches/jmb/new-cache/content/llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 20:09:07 2009 New Revision: 9640 URL: http://source.netsurf-browser.org?rev=9640&view=rev Log: Check to see if we have a referer/post data before attempting to clone it Modified: branches/jmb/new-cache/content/llcache.c Modified: branches/jmb/new-cache/content/llcache.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/llcache.... ============================================================================== --- branches/jmb/new-cache/content/llcache.c (original) +++ branches/jmb/new-cache/content/llcache.c Wed Oct 14 20:09:07 2009 @@ -654,17 +654,21 @@ const char *referer, const llcache_post_data *post) { nserror error; - char *referer_clone; - llcache_post_data *post_clone; - - referer_clone = strdup(referer); - if (referer_clone == NULL) - return NSERROR_NOMEM; - - error = llcache_post_data_clone(post, &post_clone); - if (error != NSERROR_OK) { - free(referer_clone); - return error; + char *referer_clone = NULL; + llcache_post_data *post_clone = NULL; + + if (referer != NULL) { + referer_clone = strdup(referer); + if (referer_clone == NULL) + return NSERROR_NOMEM; + } + + if (post != NULL) { + error = llcache_post_data_clone(post, &post_clone); + if (error != NSERROR_OK) { + free(referer_clone); + return error; + } } object->fetch.flags = flags;

13 years, 7 months

1
0
0 / 0

r9639 jmb - /branches/jmb/new-cache/content/llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 20:06:44 2009 New Revision: 9639 URL: http://source.netsurf-browser.org?rev=9639&view=rev Log: Fix erroneous return value Modified: branches/jmb/new-cache/content/llcache.c Modified: branches/jmb/new-cache/content/llcache.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/llcache.... ============================================================================== --- branches/jmb/new-cache/content/llcache.c (original) +++ branches/jmb/new-cache/content/llcache.c Wed Oct 14 20:06:44 2009 @@ -728,7 +728,7 @@ *result = obj; - return NSERROR_NOMEM; + return NSERROR_OK; } /**

13 years, 7 months

1
0
0 / 0

r9638 jmb - /branches/jmb/new-cache/test/Makefile

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 20:03:29 2009 New Revision: 9638 URL: http://source.netsurf-browser.org?rev=9638&view=rev Log: This is a test harness -- we want -g -O0 Modified: branches/jmb/new-cache/test/Makefile Modified: branches/jmb/new-cache/test/Makefile URL: http://source.netsurf-browser.org/branches/jmb/new-cache/test/Makefile?re... ============================================================================== --- branches/jmb/new-cache/test/Makefile (original) +++ branches/jmb/new-cache/test/Makefile Wed Oct 14 20:03:29 2009 @@ -1,4 +1,4 @@ -CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \ +CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \ `pkg-config --cflags libxml-2.0 libcurl libparserutils` LDFLAGS := `pkg-config --libs libxml-2.0 libcurl libparserutils`

13 years, 7 months

1
0
0 / 0

r9637 jmb - in /branches/jmb/new-cache/test: ./ Makefile llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 20:02:59 2009 New Revision: 9637 URL: http://source.netsurf-browser.org?rev=9637&view=rev Log: Test harness for low-level cache. It's about time we had the ability to trivially build test harnesses. Added: branches/jmb/new-cache/test/ branches/jmb/new-cache/test/Makefile branches/jmb/new-cache/test/llcache.c Added: branches/jmb/new-cache/test/Makefile URL: http://source.netsurf-browser.org/branches/jmb/new-cache/test/Makefile?re... ============================================================================== --- branches/jmb/new-cache/test/Makefile (added) +++ branches/jmb/new-cache/test/Makefile Wed Oct 14 20:02:59 2009 @@ -1,0 +1,19 @@ +CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \ + `pkg-config --cflags libxml-2.0 libcurl libparserutils` +LDFLAGS := `pkg-config --libs libxml-2.0 libcurl libparserutils` + +llcache_SRCS := content/fetch.c content/fetchers/fetch_curl.c \ + content/fetchers/fetch_data.c content/llcache.c \ + content/urldb.c desktop/options.c desktop/version.c \ + utils/base64.c utils/hashtable.c utils/messages.c \ + utils/url.c utils/useragent.c utils/utf8.c utils/utils.c \ + test/llcache.c + +llcache: $(addprefix ../,$(llcache_SRCS)) + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) + + +.PHONY: clean + +clean: + $(RM) llcache Added: branches/jmb/new-cache/test/llcache.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/test/llcache.c?r... ============================================================================== --- branches/jmb/new-cache/test/llcache.c (added) +++ branches/jmb/new-cache/test/llcache.c Wed Oct 14 20:02:59 2009 @@ -1,0 +1,148 @@ +#include <stdio.h> +#include <stdlib.h> + +#include "content/llcache.h" + +/****************************************************************************** + * Things that we'd reasonably expect to have to implement * + ******************************************************************************/ + +/* desktop/netsurf.h */ +bool verbose_log; + +/* utils/utils.h */ +void die(const char * const error) +{ + fprintf(stderr, "%s\n", error); + + exit(1); +} + +/* utils/utils.h */ +void warn_user(const char *warning, const char *detail) +{ + fprintf(stderr, "%s %s\n", warning, detail); +} + +/* content/fetch.h */ +const char *fetch_filetype(const char *unix_path) +{ + return NULL; +} + +/* content/fetch.h */ +char *fetch_mimetype(const char *ro_path) +{ + return NULL; +} + +/****************************************************************************** + * Things that are absolutely not reasonable, and should disappear * + ******************************************************************************/ + +#include "desktop/cookies.h" +#include "desktop/tree.h" + +/* desktop/cookies.h -- used by urldb + * + * URLdb should have a cookies update event + handler registration + */ +bool cookies_update(const char *domain, const struct cookie_data *data) +{ + return true; +} + +/* image/bitmap.h -- used by urldb + * + * URLdb shouldn't care about bitmaps. + * This is because the legacy RO thumbnail stuff was hacked in and must die. + */ +void bitmap_destroy(void *bitmap) +{ +} + +/* desktop/tree.h -- used by options.c + * + * Why on earth is tree loading and saving in options.c? + */ +void tree_initialise(struct tree *tree) +{ +} + +/* desktop/tree.h */ +struct node *tree_create_folder_node(struct node *parent, const char *title) +{ + return NULL; +} + +/* desktop/tree.h */ +struct node *tree_create_URL_node(struct node *parent, const char *url, + const struct url_data *data, const char *title) +{ + return NULL; +} + +/* desktop/tree.h */ +struct node_element *tree_find_element(struct node *node, node_element_data d) +{ + return NULL; +} + +/****************************************************************************** + * The actual test code * + ******************************************************************************/ + +nserror query_handler(const llcache_query *query, void *pw, + llcache_query_response cb, void *cbpw) +{ + /* I'm too lazy to actually implement this. It should queue the query, + * then deliver the response from main(). */ + + return NSERROR_OK; +} + +nserror event_handler(const llcache_handle *handle, + const llcache_event *event, void *pw) +{ + static char *event_names[] = { + "HAD_HEADERS", "HAD_DATA", "DONE", "ERROR", "PROGRESS" + }; + bool *done = pw; + + fprintf(stdout, "%p : %s\n", handle, event_names[event->type]); + + /* Inform main() that the fetch completed */ + if (event->type == LLCACHE_EVENT_DONE) + *done = true; + + return NSERROR_OK; +} + +int main(int argc, char **argv) +{ + nserror error; + llcache_handle *handle; + bool done = false; + + error = llcache_initialise(query_handler, NULL); + if (error != NSERROR_OK) { + fprintf(stderr, "llcache_initialise: %d\n", error); + return 1; + } + + error = llcache_handle_retrieve("http://www.netsurf-browser.org/", + LLCACHE_RETRIEVE_VERIFIABLE, NULL, NULL, + event_handler, &done, &handle); + if (error != NSERROR_OK) { + fprintf(stderr, "llcache_handle_retrieve: %d\n", error); + return 1; + } + + while (done == false) + llcache_poll(); + + llcache_handle_release(handle); + + return 0; +} +

13 years, 7 months

1
0
0 / 0

r9636 jmb - in /branches/jmb/new-cache/content: fetch.c llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 19:18:41 2009 New Revision: 9636 URL: http://source.netsurf-browser.org?rev=9636&view=rev Log: Purge some more redundant #includes Modified: branches/jmb/new-cache/content/fetch.c branches/jmb/new-cache/content/llcache.c Modified: branches/jmb/new-cache/content/fetch.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/fetch.c?... ============================================================================== --- branches/jmb/new-cache/content/fetch.c (original) +++ branches/jmb/new-cache/content/fetch.c Wed Oct 14 19:18:41 2009 @@ -42,7 +42,6 @@ #include "content/urldb.h" #include "desktop/netsurf.h" #include "desktop/options.h" -#include "render/form.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" Modified: branches/jmb/new-cache/content/llcache.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/llcache.... ============================================================================== --- branches/jmb/new-cache/content/llcache.c (original) +++ branches/jmb/new-cache/content/llcache.c Wed Oct 14 19:18:41 2009 @@ -29,7 +29,6 @@ #include "content/fetch.h" #include "content/llcache.h" -#include "render/form.h" #include "utils/messages.h" #include "utils/url.h" #include "utils/utils.h"

13 years, 7 months

1
0
0 / 0

r9635 jmb - in /branches/jmb/new-cache: beos/beos_fetch_rsrc.cpp content/fetchers/fetch_curl.c content/fetchers/fetch_data.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Oct 14 19:16:41 2009 New Revision: 9635 URL: http://source.netsurf-browser.org?rev=9635&view=rev Log: Purge redundant #includes Modified: branches/jmb/new-cache/beos/beos_fetch_rsrc.cpp branches/jmb/new-cache/content/fetchers/fetch_curl.c branches/jmb/new-cache/content/fetchers/fetch_data.c Modified: branches/jmb/new-cache/beos/beos_fetch_rsrc.cpp URL: http://source.netsurf-browser.org/branches/jmb/new-cache/beos/beos_fetch_... ============================================================================== --- branches/jmb/new-cache/beos/beos_fetch_rsrc.cpp (original) +++ branches/jmb/new-cache/beos/beos_fetch_rsrc.cpp Wed Oct 14 19:16:41 2009 @@ -38,7 +38,6 @@ #include "content/urldb.h" #include "desktop/netsurf.h" #include "desktop/options.h" -#include "render/form.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" Modified: branches/jmb/new-cache/content/fetchers/fetch_curl.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/fetchers... ============================================================================== --- branches/jmb/new-cache/content/fetchers/fetch_curl.c (original) +++ branches/jmb/new-cache/content/fetchers/fetch_curl.c Wed Oct 14 19:16:41 2009 @@ -44,7 +44,6 @@ #include "content/urldb.h" #include "desktop/netsurf.h" #include "desktop/options.h" -#include "render/form.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" Modified: branches/jmb/new-cache/content/fetchers/fetch_data.c URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/fetchers... ============================================================================== --- branches/jmb/new-cache/content/fetchers/fetch_data.c (original) +++ branches/jmb/new-cache/content/fetchers/fetch_data.c Wed Oct 14 19:16:41 2009 @@ -36,7 +36,6 @@ #include "content/urldb.h" #include "desktop/netsurf.h" #include "desktop/options.h" -#include "render/form.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h"

13 years, 7 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits October 2009