filterx/expr-literal-container: use plist to store list of key-values

Signed-off-by: Balazs Scheidler <[email protected]>

Author: bazsi

lib/filterx/expr-literal-container.c

@@ -26,6 +26,7 @@
 #include "filterx/object-primitive.h"
 #include "filterx/object-dict.h"
 #include "filterx/object-list.h"
+#include "filterx/filterx-plist.h"
 
 /* Object Members (e.g. key-value) */
 
@@ -91,28 +92,42 @@ struct FilterXLiteralContainer_
 {
   FilterXExpr super;
   FilterXObject *(*create_container)(FilterXLiteralContainer *self);
-  GList *elements;
+  FilterXPointerList elements;
 };
 
 gsize
 filterx_literal_container_len(FilterXExpr *s)
 {
-  GList *elements = NULL;
-
-  elements = ((FilterXLiteralContainer *) s)->elements;
-  return g_list_length(elements);
+  FilterXLiteralContainer *self = (FilterXLiteralContainer *) s;
+  return filterx_pointer_list_get_length(&self->elements);
 }
 
-static FilterXObject *
-_literal_container_eval(FilterXExpr *s)
+/*
+ * This is an inline version with two variants,
+ *
+ * "fastpath" == TRUE means we * are doing this at eval time by which point
+ *                    we already did a filterx_plist_seal()
+ *
+ * "fastpath" == FALSE means we are still doing this at compilation time and
+ *               seal is yet to be called.
+ */
+static inline FilterXObject *
+_literal_container_eval_adaptive(FilterXExpr *s, gboolean fastpath)
 {
   FilterXLiteralContainer *self = (FilterXLiteralContainer *) s;
 
   FilterXObject *result = self->create_container(self);
   filterx_object_cow_prepare(&result);
-  for (GList *link = self->elements; link; link = link->next)
+
+  gsize len = filterx_pointer_list_get_length(&self->elements);
+  for (gsize i = 0; i < len; i++)
     {
-      FilterXLiteralElement *elem = (FilterXLiteralElement *) link->data;
+      FilterXLiteralElement *elem;
+
+      if (fastpath)
+        elem = (FilterXLiteralElement *) filterx_pointer_list_index_fast(&self->elements, i);
+      else
+        elem = (FilterXLiteralElement *) filterx_pointer_list_index(&self->elements, i);
 
       FilterXObject *key = NULL;
       if (elem->key)
@@ -145,22 +160,29 @@ _literal_container_eval(FilterXExpr *s)
   return NULL;
 }
 
+static FilterXObject *
+_literal_container_eval(FilterXExpr *s)
+{
+  return _literal_container_eval_adaptive(s, TRUE);
+}
+
 static FilterXExpr *
 _literal_container_optimize(FilterXExpr *s)
 {
   FilterXLiteralContainer *self = (FilterXLiteralContainer *) s;
 
   gboolean literal = TRUE;
-  for (GList *link = self->elements; link; link = link->next)
+  gsize len = filterx_pointer_list_get_length(&self->elements);
+  for (gsize i = 0; i < len; i++)
     {
-      FilterXLiteralElement *elem = (FilterXLiteralElement *) link->data;
+      FilterXLiteralElement *elem = (FilterXLiteralElement *) filterx_pointer_list_index(&self->elements, i);
 
       _literal_element_optimize(elem);
       if (!elem->literal)
         literal = FALSE;
     }
   if (literal)
-    return filterx_literal_new(_literal_container_eval(s));
+    return filterx_literal_new(_literal_container_eval_adaptive(s, FALSE));
 
   return NULL;
 }
@@ -170,21 +192,12 @@ _literal_container_init(FilterXExpr *s, GlobalConfig *cfg)
 {
   FilterXLiteralContainer *self = (FilterXLiteralContainer *) s;
 
-  for (GList *link = self->elements; link; link = link->next)
+  filterx_pointer_list_seal(&self->elements);
+  if (!filterx_pointer_list_foreach(&self->elements, (FilterXPointerListForeachFunc) _literal_element_init, cfg))
     {
-      FilterXLiteralElement *elem = (FilterXLiteralElement *) link->data;
-
-      if (!_literal_element_init(elem, cfg))
-        {
-          for (GList *deinit_link = self->elements; deinit_link != link; deinit_link = deinit_link->next)
-            {
-              elem = (FilterXLiteralElement *) deinit_link->data;
-              _literal_element_deinit(elem, cfg);
-            }
-          return FALSE;
-        }
+      filterx_pointer_list_foreach(&self->elements, (FilterXPointerListForeachFunc) _literal_element_deinit, cfg);
+      return FALSE;
     }
-
   return filterx_expr_init_method(s, cfg);
 }
 
@@ -193,12 +206,7 @@ _literal_container_deinit(FilterXExpr *s, GlobalConfig *cfg)
 {
   FilterXLiteralContainer *self = (FilterXLiteralContainer *) s;
 
-  for (GList *link = self->elements; link; link = link->next)
-    {
-      FilterXLiteralElement *elem = (FilterXLiteralElement *) link->data;
-      _literal_element_deinit(elem, cfg);
-    }
-
+  filterx_pointer_list_foreach(&self->elements, (FilterXPointerListForeachFunc) _literal_element_deinit, cfg);
   filterx_expr_deinit_method(s, cfg);
 }
 
@@ -207,7 +215,7 @@ _literal_container_free(FilterXExpr *s)
 {
   FilterXLiteralContainer *self = (FilterXLiteralContainer *) s;
 
-  g_list_free_full(self->elements, (GDestroyNotify) _literal_element_free);
+  filterx_pointer_list_clear(&self->elements, (GDestroyNotify) _literal_element_free);
   filterx_expr_free_method(s);
 }
 
@@ -220,18 +228,20 @@ _literal_container_init_instance(FilterXLiteralContainer *self, const gchar *typ
   self->super.init = _literal_container_init;
   self->super.deinit = _literal_container_deinit;
   self->super.free_fn = _literal_container_free;
+  filterx_pointer_list_init(&self->elements);
 }
 
 /* Literal dict objects */
 
 gboolean
 filterx_literal_dict_foreach(FilterXExpr *s, FilterXLiteralDictForeachFunc func, gpointer user_data)
 {
-  GList *elements = ((FilterXLiteralContainer *) s)->elements;
+  FilterXLiteralContainer *self = (FilterXLiteralContainer *) s;
 
-  for (GList *link = elements; link; link = link->next)
+  gsize len = filterx_pointer_list_get_length(&self->elements);
+  for (gsize i = 0; i < len; i++)
     {
-      FilterXLiteralElement *elem = (FilterXLiteralElement *) link->data;
+      FilterXLiteralElement *elem = (FilterXLiteralElement *) filterx_pointer_list_index(&self->elements, i);
 
       if (!func(elem->key, elem->value, user_data))
         return FALSE;
@@ -253,7 +263,7 @@ filterx_literal_dict_new(GList *elements)
 
   _literal_container_init_instance(self, FILTERX_EXPR_TYPE_NAME(literal_dict));
   self->create_container = _literal_dict_create;
-  self->elements = elements;
+  filterx_pointer_list_add_list(&self->elements, elements);
 
   return &self->super;
 }
@@ -263,17 +273,15 @@ filterx_literal_dict_new(GList *elements)
 gboolean
 filterx_literal_list_foreach(FilterXExpr *s, FilterXLiteralListForeachFunc func, gpointer user_data)
 {
-  GList *elements = ((FilterXLiteralContainer *) s)->elements;
+  FilterXLiteralContainer *self = (FilterXLiteralContainer *) s;
 
-  gsize i = 0;
-  for (GList *link = elements; link; link = link->next)
+  gsize len = filterx_pointer_list_get_length(&self->elements);
+  for (gsize i = 0; i < len; i++)
     {
-      FilterXLiteralElement *elem = (FilterXLiteralElement *) link->data;
+      FilterXLiteralElement *elem = (FilterXLiteralElement *) filterx_pointer_list_index(&self->elements, i);
 
       if (!func(i, elem->value, user_data))
         return FALSE;
-
-      i++;
     }
 
   return TRUE;
@@ -292,7 +300,7 @@ filterx_literal_list_new(GList *elements)
 
   _literal_container_init_instance(self, FILTERX_EXPR_TYPE_NAME(literal_list));
   self->create_container = _literal_list_create;
-  self->elements = elements;
+  filterx_pointer_list_add_list(&self->elements, elements);
 
   return &self->super;
 }