aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Bug 951: Revert "Garbage-collect SMJS objects before flushing caches."

Browse Source 
This reverts commit c33d195ff4.
ELinks no longer needs to collect garbage in this situation
because it can now free cache entries even if the corresponding
SMJS objects remain.
This commit is contained in:
Kalle Olavi Niemitalo 2008-07-05 05:23:21 +03:00 committed by Kalle Olavi Niemitalo
parent 06c39a8ac4
commit 8ee5e8c4a1
3 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/events.txt
View File

@ -113,26 +113,6 @@ Description:
Open Lua console dialog. Open Lua console dialog.
-------------------------------------------------------------------------------
Name: flush-caches
Managed By: The scripting subsystem/backends
Triggered When:
Elinks is going to free its caches. This happens when the user chooses
ACT_MAIN_CACHE_MINIMIZE, but currently also on ACT_MAIN_FORGET_CREDENTIALS
and when ELinks is quitting.
Arguments:
None
Description:
If scripting backends hold pointers to cache entries, they should try
to release those pointers so that ELinks can free the entries. This
may involve a full garbage collection. Also, if backends have some
caches of their own, they should flush them.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Name: follow-url Name: follow-url
Managed By: The scripting subsystem/backends Managed By: The scripting subsystem/backends

7
src/main/main.c
View File

@ -306,13 +306,6 @@ terminate_all_subsystems(void)
void void
shrink_memory(int whole) shrink_memory(int whole)
{ {
#ifdef CONFIG_SCRIPTING
/* The SMJS pre-format-html hook constructs an SMJS object for
* each cache entry. Give all scripting modules a cue to garbage
* collect any such objects so that the entries can be freed. */
if (whole)
trigger_event_name("flush-caches");
#endif
shrink_dns_cache(whole); shrink_dns_cache(whole);
shrink_format_cache(whole); shrink_format_cache(whole);
garbage_collection(whole); garbage_collection(whole);

16
src/scripting/smjs/hooks.c
View File

@ -89,26 +89,10 @@ end:
return ret; return ret;
} }
static enum evhook_status
script_hook_flush_caches(va_list ap, void *data)
{
/* script_hook_pre_format_html() calls smjs_get_cache_entry_object()
* for each struct cache_entry. The resulting SMJS objects hold
* references to the structs, and these references prevent ELinks
* from freeing the cache entries. (The resource info dialog shows
* that the entries are "in use".) SMJS does not immediately collect
* these objects as garbage. If we're really trying to flush the
* caches then ask SMJS to run a check. */
if (smjs_ctx)
JS_GC(smjs_ctx);
return EVENT_HOOK_STATUS_NEXT;
}
struct event_hook_info smjs_scripting_hooks[] = { struct event_hook_info smjs_scripting_hooks[] = {
{ "goto-url", 0, script_hook_url, "goto_url_hook" }, { "goto-url", 0, script_hook_url, "goto_url_hook" },
{ "follow-url", 0, script_hook_url, "follow_url_hook" }, { "follow-url", 0, script_hook_url, "follow_url_hook" },
{ "pre-format-html", 0, script_hook_pre_format_html, NULL }, { "pre-format-html", 0, script_hook_pre_format_html, NULL },
{ "flush-caches", 0, script_hook_flush_caches, NULL },
NULL_EVENT_HOOK_INFO, NULL_EVENT_HOOK_INFO,
}; };