aniani/elinks
0
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-06-30 22:19:29 -04:00
Code

[document] format_cache implemented as std::list

Browse Source 
Slower, but works for my testcase.
This commit is contained in:
Witold Filipczyk 2023-09-28 19:44:09 +02:00
parent 61466065a2
commit 7fc8c2088f
1 changed files with 69 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/document/document.cpp
View File

@ -89,7 +89,9 @@
#include "util/string.h" #include "util/string.h"
#include "viewer/text/link.h" #include "viewer/text/link.h"
static INIT_LIST_OF(struct document, format_cache); #include <list>
static std::list<struct document *> format_cache;
const char *script_event_hook_name[] = { const char *script_event_hook_name[] = {
"click", "click",
@ -106,6 +108,18 @@ const char *script_event_hook_name[] = {
NULL NULL
}; };
#if 0
static void
dump_format_cache(int line)
{
fprintf(stderr, "line=%d size=%ld", line, format_cache.size());
for (auto it = format_cache.begin(); it != format_cache.end(); it++) {
fprintf(stderr, " %p", *it);
}
fprintf(stderr, "\n");
}
#endif
#ifdef HAVE_INET_NTOP #ifdef HAVE_INET_NTOP
/* DNS callback. */ /* DNS callback. */
static void static void
@ -181,8 +195,7 @@ init_document(struct cache_entry *cached, struct document_options *options)
object_lock(document); object_lock(document);
copy_opt(&document->options, options); copy_opt(&document->options, options);
format_cache.push_back(document);
add_to_list(format_cache, document);
return document; return document;
} }
@ -425,7 +438,7 @@ done_document(struct document *document)
mem_free_if(document->slines2); mem_free_if(document->slines2);
mem_free_if(document->search_points); mem_free_if(document->search_points);
del_from_list(document); format_cache.remove(document);
mem_free(document); mem_free(document);
} }
@ -448,7 +461,9 @@ release_document(struct document *document)
free_list(document->timeouts); free_list(document->timeouts);
#endif #endif
object_unlock(document); object_unlock(document);
move_to_top_of_list(format_cache, document);
format_cache.remove(document);
format_cache.push_front(document);
} }
int int
@ -507,7 +522,8 @@ update_cached_document_options(struct session *ses)
active_link.underline = get_opt_bool("document.browse.links.active_link.underline", ses); active_link.underline = get_opt_bool("document.browse.links.active_link.underline", ses);
active_link.bold = get_opt_bool("document.browse.links.active_link.bold", ses); active_link.bold = get_opt_bool("document.browse.links.active_link.bold", ses);
foreach (document, format_cache) { for (auto it = format_cache.begin(); it != format_cache.end(); it++) {
document = *it;
copy_struct(&document->options.active_link, &active_link); copy_struct(&document->options.active_link, &active_link);
} }
} }
@ -515,9 +531,12 @@ update_cached_document_options(struct session *ses)
struct document * struct document *
get_cached_document(struct cache_entry *cached, struct document_options *options) get_cached_document(struct cache_entry *cached, struct document_options *options)
{ {
struct document *document, *next; struct document *ret = NULL;
std::list<struct document *> to_remove;
for (auto it = format_cache.begin(); it != format_cache.end(); it++) {
struct document *document = *it;
foreachsafe (document, next, format_cache) {
if (!compare_uri(document->uri, cached->uri, 0) if (!compare_uri(document->uri, cached->uri, 0)
|| compare_opt(&document->options, options)) || compare_opt(&document->options, options))
continue; continue;
@ -526,17 +545,25 @@ get_cached_document(struct cache_entry *cached, struct document_options *options
|| cached->cache_id != document->cache_id || cached->cache_id != document->cache_id
|| !check_document_css_magic(document)) { || !check_document_css_magic(document)) {
if (!is_object_used(document)) { if (!is_object_used(document)) {
done_document(document); to_remove.push_back(document);
} }
continue; continue;
} }
ret = document;
break;
}
for (auto it = to_remove.begin(); it != to_remove.end(); it++) {
done_document(*it);
}
to_remove.clear();
if (ret) {
/* Reactivate */ /* Reactivate */
move_to_top_of_list(format_cache, document); format_cache.remove(ret);
format_cache.push_front(ret);
object_lock(ret);
object_lock(document); return ret;
return document;
} }
return NULL; return NULL;
@ -545,11 +572,14 @@ get_cached_document(struct cache_entry *cached, struct document_options *options
void void
shrink_format_cache(int whole) shrink_format_cache(int whole)
{ {
struct document *document, *next; struct document *document;
int format_cache_size = get_opt_int("document.cache.format.size", NULL); int format_cache_size = get_opt_int("document.cache.format.size", NULL);
int format_cache_entries = 0; int format_cache_entries = 0;
std::list<struct document *> to_remove;
for (auto it = format_cache.begin(); it != format_cache.end(); it++) {
document = *it;
foreachsafe (document, next, format_cache) {
if (is_object_used(document)) continue; if (is_object_used(document)) continue;
format_cache_entries++; format_cache_entries++;
@ -559,14 +589,21 @@ shrink_format_cache(int whole)
if (document->cached->cache_id == document->cache_id) if (document->cached->cache_id == document->cache_id)
continue; continue;
done_document(document); to_remove.push_back(document);
format_cache_entries--; format_cache_entries--;
} }
assertm(format_cache_entries >= 0, "format_cache_entries underflow on entry"); assertm(format_cache_entries >= 0, "format_cache_entries underflow on entry");
if_assert_failed format_cache_entries = 0; if_assert_failed format_cache_entries = 0;
foreachbacksafe (document, next, format_cache) { for (auto it = to_remove.begin(); it != to_remove.end(); it++) {
done_document(*it);
}
to_remove.clear();
for (auto it = format_cache.rbegin(); it != format_cache.rend(); it++) {
document = *it;
if (is_object_used(document)) continue; if (is_object_used(document)) continue;
/* If we are not purging the whole format cache, stop /* If we are not purging the whole format cache, stop
@ -574,9 +611,13 @@ shrink_format_cache(int whole)
if (!whole && format_cache_entries <= format_cache_size) if (!whole && format_cache_entries <= format_cache_size)
break; break;
done_document(document); to_remove.push_back(document);
format_cache_entries--; format_cache_entries--;
} }
for (auto it = to_remove.begin(); it != to_remove.end(); it++) {
done_document(*it);
}
to_remove.clear();
assertm(format_cache_entries >= 0, "format_cache_entries underflow"); assertm(format_cache_entries >= 0, "format_cache_entries underflow");
if_assert_failed format_cache_entries = 0; if_assert_failed format_cache_entries = 0;
@ -585,7 +626,7 @@ shrink_format_cache(int whole)
int int
get_format_cache_size(void) get_format_cache_size(void)
{ {
return list_size(&format_cache); return format_cache.size();
} }
int int
@ -594,8 +635,10 @@ get_format_cache_used_count(void)
struct document *document; struct document *document;
int i = 0; int i = 0;
foreach (document, format_cache) for (auto it = format_cache.begin(); it != format_cache.end(); it++) {
document = *it;
i += is_object_used(document); i += is_object_used(document);
}
return i; return i;
} }
@ -605,10 +648,14 @@ get_format_cache_refresh_count(void)
struct document *document; struct document *document;
int i = 0; int i = 0;
foreach (document, format_cache) for (auto it = format_cache.begin(); it != format_cache.end(); it++) {
document = *it;
if (document->refresh if (document->refresh
&& document->refresh->timer != TIMER_ID_UNDEF) && document->refresh->timer != TIMER_ID_UNDEF) {
i++; i++;
}
}
return i; return i;
} }