From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 14 Feb 2018 14:44:17 +0000 (+0000)
Subject: [Feature] Improve allocation policy when interacting with Lua
X-Git-Tag: 1.7.0~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=413bb725fc56ecaea4dde751be4c531486eb4b50;p=thirdparty%2Frspamd.git

[Feature] Improve allocation policy when interacting with Lua
---

diff --git a/contrib/libucl/lua_ucl.c b/contrib/libucl/lua_ucl.c
index 52e787ee5a..15d41471e4 100644
--- a/contrib/libucl/lua_ucl.c
+++ b/contrib/libucl/lua_ucl.c
@@ -301,7 +301,7 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags)
 	size_t keylen;
 	const char *k;
 	bool is_array = true, is_implicit = false, found_mt = false;
-	int max = INT_MIN;
+	size_t max = 0, nelts = 0;
 
 	if (idx < 0) {
 		/* For negative indicies we want to invert them */
@@ -320,10 +320,22 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags)
 			} else if (strcmp (classname, UCL_ARRAY_TYPE_META) == 0) {
 				is_array = true;
 				found_mt = true;
+#if LUA_VERSION_NUM >= 502
+				max = lua_rawlen (L, idx);
+#else
+				max = lua_objlen (L, idx);
+#endif
+				nelts = max;
 			} else if (strcmp (classname, UCL_IMPL_ARRAY_TYPE_META) == 0) {
 				is_array = true;
 				is_implicit = true;
 				found_mt = true;
+#if LUA_VERSION_NUM >= 502
+				max = lua_rawlen (L, idx);
+#else
+				max = lua_objlen (L, idx);
+#endif
+				nelts = max;
 			}
 		}
 
@@ -342,34 +354,24 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags)
 					}
 				} else {
 					/* Keys are not integer */
-					lua_pop (L, 2);
 					is_array = false;
-					break;
 				}
 			} else {
 				/* Keys are not numeric */
-				lua_pop (L, 2);
 				is_array = false;
-				break;
 			}
 			lua_pop (L, 1);
+			nelts ++;
 		}
 	}
 
-	if (is_array) {
-#if LUA_VERSION_NUM >= 502
-		max = lua_rawlen (L, idx);
-#else
-		max = lua_objlen (L, idx);
-#endif
-	}
-
 	/* Table iterate */
 	if (is_array) {
 		int i;
 
 		if (!is_implicit) {
 			top = ucl_object_typed_new (UCL_ARRAY);
+			ucl_object_reserve (top, nelts);
 		}
 		else {
 			top = NULL;
@@ -395,15 +397,18 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags)
 	else {
 		lua_pushnil (L);
 		top = ucl_object_typed_new (UCL_OBJECT);
+		ucl_object_reserve (top, nelts);
+
 		while (lua_next (L, idx) != 0) {
 			/* copy key to avoid modifications */
-			k = lua_tolstring (L, -2, &keylen);
-			obj = ucl_object_lua_fromelt (L, lua_gettop (L), flags);
+			lua_pushvalue (L, -2);
+			k = lua_tolstring (L, -1, &keylen);
+			obj = ucl_object_lua_fromelt (L, lua_gettop (L) - 1, flags);
 
 			if (obj != NULL) {
 				ucl_object_insert_key (top, obj, k, keylen, true);
 			}
-			lua_pop (L, 1);
+			lua_pop (L, 2);
 		}
 	}
 
diff --git a/contrib/libucl/ucl_hash.c b/contrib/libucl/ucl_hash.c
index 92c8b3933c..352ae3a2bb 100644
--- a/contrib/libucl/ucl_hash.c
+++ b/contrib/libucl/ucl_hash.c
@@ -424,11 +424,11 @@ void ucl_hash_reserve (ucl_hash_t *hashlin, size_t sz)
 			khash_t(ucl_hash_caseless_node) *h = (khash_t(
 					ucl_hash_caseless_node) *)
 					hashlin->hash;
-			kh_resize (ucl_hash_caseless_node, h, sz);
+			kh_resize (ucl_hash_caseless_node, h, sz * 2);
 		} else {
 			khash_t(ucl_hash_node) *h = (khash_t(ucl_hash_node) *)
 					hashlin->hash;
-			kh_resize (ucl_hash_node, h, sz);
+			kh_resize (ucl_hash_node, h, sz * 2);
 		}
 	}
 }
\ No newline at end of file