From e86dba5468cdca00acdcc3dd706d5c9277429f1e Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Wed, 9 Jun 2021 05:03:23 -0400
Subject: [PATCH] [mod_magnet] inline name and etag buffers in cache

also mark cache init and cache free funcs as cold
---
 src/mod_magnet_cache.c | 79 +++++++++++++++++++-----------------------
 src/mod_magnet_cache.h |  8 +++--
 2 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/src/mod_magnet_cache.c b/src/mod_magnet_cache.c
index 54610c82..6bd54be8 100644
--- a/src/mod_magnet_cache.c
+++ b/src/mod_magnet_cache.c
@@ -10,70 +10,61 @@
 #include <lualib.h>
 #include <lauxlib.h>
 
-static script *script_init() {
-	script *sc;
-
-	sc = calloc(1, sizeof(*sc));
-	force_assert(sc);
-	sc->name = buffer_init();
-	sc->etag = buffer_init();
-
-	return sc;
+__attribute_cold__
+static script *script_init(void)
+{
+    script *const sc = calloc(1, sizeof(*sc));
+    force_assert(sc);
+    return sc;
 }
 
-static void script_free(script *sc) {
-	if (!sc) return;
-
-	lua_pop(sc->L, 1); /* the function copy */
-
-	buffer_free(sc->name);
-	buffer_free(sc->etag);
-
-	lua_close(sc->L);
-
-	free(sc);
+__attribute_cold__
+static void script_free(script *sc)
+{
+    if (!sc) return;
+    lua_pop(sc->L, 1); /* the function copy */
+    lua_close(sc->L);
+    free(sc->name.ptr);
+    free(sc->etag.ptr);
+    free(sc);
 }
 
 #if 0
-script_cache *script_cache_init() {
-	script_cache *p = calloc(1, sizeof(script_cache));
-	force_assert(p);
-	return p;
+script_cache *script_cache_init(void)
+{
+    script_cache *p = calloc(1, sizeof(script_cache));
+    force_assert(p);
+    return p;
 }
 #endif
 
-void script_cache_free_data(script_cache *p) {
-	size_t i;
-
-	if (!p) return;
-
-	for (i = 0; i < p->used; i++) {
-		script_free(p->ptr[i]);
-	}
-
-	free(p->ptr);
+void script_cache_free_data(script_cache *p)
+{
+    if (!p) return;
+    for (uint32_t i = 0; i < p->used; ++i)
+        script_free(p->ptr[i]);
+    free(p->ptr);
 }
 
-lua_State *script_cache_get_script(script_cache *cache, buffer *name, int etag_flags) {
+lua_State *script_cache_get_script(script_cache *cache, const buffer *name, int etag_flags)
+{
 	script *sc = NULL;
 	stat_cache_entry *sce;
 
 	for (uint32_t i = 0; i < cache->used; ++i, sc = NULL) {
 		sc = cache->ptr[i];
-		if (!buffer_is_equal(name, sc->name)) continue;
-
-			/* oops, the script failed last time */
+		if (!buffer_is_equal(name, &sc->name)) continue;
 
 			if (lua_gettop(sc->L) == 0) break;
 			force_assert(lua_gettop(sc->L) == 1);
-			sce = stat_cache_get_entry(sc->name);
+			sce = stat_cache_get_entry(&sc->name);
 			if (NULL == sce) {
 				lua_pop(sc->L, 1); /* pop the old function */
 				break;
 			}
 
 			const buffer *etag = stat_cache_etag_get(sce, etag_flags);
-			if (NULL == etag || !buffer_is_equal(sc->etag, etag)) {
+			if (NULL == etag || !buffer_is_equal(&sc->etag, etag)) {
 				/* the etag is outdated, reload the function */
 				lua_pop(sc->L, 1);
 				break;
@@ -96,23 +87,23 @@ lua_State *script_cache_get_script(script_cache *cache, buffer *name, int etag_f
 
 		cache->ptr[cache->used++] = sc;
 
-		buffer_copy_buffer(sc->name, name);
+		buffer_copy_buffer(&sc->name, name);
 
 		sc->L = luaL_newstate();
 		luaL_openlibs(sc->L);
 	}
-	buffer_clear(sc->etag);
+	buffer_clear(&sc->etag);
 
 	if (0 != luaL_loadfile(sc->L, name->ptr)) {
 		/* oops, an error, return it */
 		return sc->L;
 	}
 
-	sce = stat_cache_get_entry(sc->name);
+	sce = stat_cache_get_entry(&sc->name);
 	if (sce) {
 		const buffer *etag = stat_cache_etag_get(sce, etag_flags);
 		if (etag)
-			buffer_copy_buffer(sc->etag, etag);
+			buffer_copy_buffer(&sc->etag, etag);
 	}
 
 	force_assert(lua_isfunction(sc->L, -1));
diff --git a/src/mod_magnet_cache.h b/src/mod_magnet_cache.h
index da56612d..587fa27b 100644
--- a/src/mod_magnet_cache.h
+++ b/src/mod_magnet_cache.h
@@ -8,8 +8,8 @@
 #include <lua.h>
 
 typedef struct {
-	buffer *name;
-	buffer *etag;
+	buffer name;
+	buffer etag;
 
 	lua_State *L;
 } script;
@@ -21,13 +21,15 @@ typedef struct {
 } script_cache;
 
 #if 0
+__attribute_cold__
 __attribute_malloc__
 __attribute_returns_nonnull__
 script_cache *script_cache_init(void);
 #endif
 
+__attribute_cold__
 void script_cache_free_data(script_cache *cache);
 
-lua_State *script_cache_get_script(script_cache *cache, buffer *name, int etag_flags);
+lua_State *script_cache_get_script(script_cache *cache, const buffer *name, int etag_flags);
 
 #endif