From 8ee5e8c4a1e355b42df555e93ac1e356395bef51 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 5 Jul 2008 05:23:21 +0300
Subject: [PATCH] Bug 951: Revert "Garbage-collect SMJS objects before flushing
 caches."

This reverts commit c33d195ff49597a808324791cb93a91cd37a868d.
ELinks no longer needs to collect garbage in this situation
because it can now free cache entries even if the corresponding
SMJS objects remain.
---
 doc/events.txt             | 20 --------------------
 src/main/main.c            |  7 -------
 src/scripting/smjs/hooks.c | 16 ----------------
 3 files changed, 43 deletions(-)

diff --git a/doc/events.txt b/doc/events.txt
index ed0fca2e0..ca1291940 100644
--- a/doc/events.txt
+++ b/doc/events.txt
@@ -113,26 +113,6 @@ Description:
 
  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
 Managed By:	The scripting subsystem/backends
diff --git a/src/main/main.c b/src/main/main.c
index 8b34d16b2..aa6b773f1 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -306,13 +306,6 @@ terminate_all_subsystems(void)
 void
 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_format_cache(whole);
 	garbage_collection(whole);
diff --git a/src/scripting/smjs/hooks.c b/src/scripting/smjs/hooks.c
index f2c0289ab..647d2887f 100644
--- a/src/scripting/smjs/hooks.c
+++ b/src/scripting/smjs/hooks.c
@@ -89,26 +89,10 @@ end:
 	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[] = {
 	{ "goto-url", 0, script_hook_url, "goto_url_hook" },
 	{ "follow-url", 0, script_hook_url, "follow_url_hook" },
 	{ "pre-format-html", 0, script_hook_pre_format_html, NULL },
-	{ "flush-caches", 0, script_hook_flush_caches, NULL },
 
 	NULL_EVENT_HOOK_INFO,
 };