filterx: stack allocate strings where it is possible and useful

Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>

Author: alltilla

lib/filterx/expr-regexp-search.c

@@ -68,7 +68,7 @@ _store_matches_to_list(pcre2_code_8 *pattern, const FilterXReMatchState *state,
       if (begin_index < 0 || end_index < 0)
         continue;
 
-      FilterXObject *value = filterx_string_new(state->lhs_str + begin_index, end_index - begin_index);
+      FILTERX_STRING_DECLARE_ON_STACK(value, state->lhs_str + begin_index, end_index - begin_index);
       gboolean success = filterx_list_append(fillable, &value);
       filterx_object_unref(value);
 
@@ -101,8 +101,8 @@ _store_matches_to_dict(pcre2_code_8 *pattern, const FilterXReMatchState *state,
         continue;
 
       g_snprintf(num_str_buf, sizeof(num_str_buf), "%" G_GUINT32_FORMAT, i);
-      FilterXObject *key = filterx_string_new(num_str_buf, -1);
-      FilterXObject *value = filterx_string_new(state->lhs_str + begin_index, end_index - begin_index);
+      FILTERX_STRING_DECLARE_ON_STACK(key, num_str_buf, -1);
+      FILTERX_STRING_DECLARE_ON_STACK(value, state->lhs_str + begin_index, end_index - begin_index);
 
       gboolean success = filterx_object_set_subscript(fillable, key, &value);
 
@@ -135,8 +135,8 @@ _store_matches_to_dict(pcre2_code_8 *pattern, const FilterXReMatchState *state,
         continue;
 
       g_snprintf(num_str_buf, sizeof(num_str_buf), "%" G_GUINT32_FORMAT, n);
-      FilterXObject *num_key = filterx_string_new(num_str_buf, -1);
-      FilterXObject *key = filterx_string_new(namedgroup_name, -1);
+      FILTERX_STRING_DECLARE_ON_STACK(num_key, num_str_buf, -1);
+      FILTERX_STRING_DECLARE_ON_STACK(key, namedgroup_name, -1);
       FilterXObject *value = filterx_object_get_subscript(fillable, num_key);
 
       gboolean success = filterx_object_set_subscript(fillable, key, &value);

lib/filterx/filterx-object.c

@@ -30,7 +30,7 @@
 FilterXObject *
 filterx_object_getattr_string(FilterXObject *self, const gchar *attr_name)
 {
-  FilterXObject *attr = filterx_string_new(attr_name, -1);
+  FILTERX_STRING_DECLARE_ON_STACK(attr, attr_name, -1);
   FilterXObject *res = filterx_object_getattr(self, attr);
   filterx_object_unref(attr);
   return res;
@@ -39,7 +39,7 @@ filterx_object_getattr_string(FilterXObject *self, const gchar *attr_name)
 gboolean
 filterx_object_setattr_string(FilterXObject *self, const gchar *attr_name, FilterXObject **new_value)
 {
-  FilterXObject *attr = filterx_string_new(attr_name, -1);
+  FILTERX_STRING_DECLARE_ON_STACK(attr, attr_name, -1);
   gboolean res = filterx_object_setattr(self, attr, new_value);
   filterx_object_unref(attr);
   return res;

lib/filterx/func-sdata.c

@@ -172,8 +172,9 @@ _extract_sd_components(const gchar *key, gssize key_len, const gchar **sd_id_sta
 static gboolean
 _insert_into_dict(FilterXObject *dict, const gchar *key, gssize key_len, const gchar *value, gssize value_len)
 {
-  FilterXObject *fob_key = filterx_string_new(key, key_len);
-  FilterXObject *fob_value = filterx_string_new(value, value_len);
+  FILTERX_STRING_DECLARE_ON_STACK(fob_key, key, key_len);
+  FILTERX_STRING_DECLARE_ON_STACK(fob_value, value, value_len);
+
   gboolean res = filterx_object_set_subscript(dict, fob_key, &fob_value);
 
   filterx_object_unref(fob_key);
@@ -254,7 +255,7 @@ _generate(FilterXExprGenerator *s, FilterXObject *fillable)
         return FALSE;
       i += num_insertions + 1;
 
-      FilterXObject *sd_id_key = filterx_string_new(current_sd_id_start, current_sd_id_len);
+      FILTERX_STRING_DECLARE_ON_STACK(sd_id_key, current_sd_id_start, current_sd_id_len);
       filterx_object_set_subscript(fillable, sd_id_key, &inner_dict);
       filterx_object_unref(inner_dict);
       filterx_object_unref(sd_id_key);

lib/filterx/func-vars.c

@@ -50,7 +50,7 @@ _add_to_dict(FilterXVariable *variable, gpointer user_data)
       name_len = name_buf->len;
     }
 
-  FilterXObject *name = filterx_string_new(name_str, name_len);
+  FILTERX_STRING_DECLARE_ON_STACK(name, name_str, name_len);
 
   FilterXObject *value = filterx_variable_get_value(variable);
   FilterXObject *cloned_value = filterx_object_clone(value);

lib/filterx/object-metrics-labels.c

@@ -172,8 +172,8 @@ _iter(FilterXDict *s, FilterXDictIterFunc func, gpointer user_data)
     {
       StatsClusterLabel *label = &g_array_index(self->labels, StatsClusterLabel, i);
 
-      FilterXObject *name = filterx_string_new(label->name, -1);
-      FilterXObject *value = filterx_string_new(label->value, -1);
+      FILTERX_STRING_DECLARE_ON_STACK(name, label->name, -1);
+      FILTERX_STRING_DECLARE_ON_STACK(value, label->value, -1);
 
       gboolean success = func(name, value, user_data);
 

modules/cef/event-format-parser.c

@@ -86,8 +86,8 @@ _set_dict_value(FilterXObject *out,
                 const gchar *key, gsize key_len,
                 const gchar *value, gsize value_len)
 {
-  FilterXObject *dict_key = filterx_string_new(key, key_len);
-  FilterXObject *dict_val = filterx_string_new(value, value_len);
+  FILTERX_STRING_DECLARE_ON_STACK(dict_key, key, key_len);
+  FILTERX_STRING_DECLARE_ON_STACK(dict_val, value, value_len);
 
   gboolean ok = filterx_object_set_subscript(out, dict_key, &dict_val);
 
@@ -156,7 +156,7 @@ _match_field_to_column(EventParserContext *ctx, Field *field, const gchar *input
   gboolean ok = FALSE;
   if (!*error && val)
     {
-      FilterXObject *key = filterx_string_new(field->name, -1);
+      FILTERX_STRING_DECLARE_ON_STACK(key, field->name, -1);
       ok = filterx_object_set_subscript(fillable, key, &val);
       filterx_object_unref(key);
     }

modules/grpc/otel/filterx/object-otel-kvlist.cpp

@@ -36,6 +36,7 @@
 #include <google/protobuf/util/json_util.h>
 
 #include <stdexcept>
+#include <string.h>
 
 /* The deprecated MutableRepeatedPtrField() does not have a proper alternative. */
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -234,7 +235,8 @@ KVList::iter(FilterXDictIterFunc func, gpointer user_data) const
   for (int i = 0; i < repeated_kv->size(); i++)
     {
       KeyValue &kv = repeated_kv->at(i);
-      FilterXObject *key = filterx_string_new(kv.key().c_str(), kv.key().length());
+
+      FILTERX_STRING_DECLARE_ON_STACK(key, kv.key().c_str(), kv.key().length());
       FilterXObject *value = converter->Get(&kv, "value");
 
       bool result = func(key, value, user_data);

modules/grpc/otel/filterx/otel-field.cpp

@@ -45,6 +45,7 @@
 
 #include "opentelemetry/proto/logs/v1/logs.pb.h"
 
+#include <string.h>
 
 using namespace syslogng::grpc::otel;
 using namespace google::protobuf;
@@ -377,7 +378,7 @@ syslogng::grpc::otel::iter_on_otel_protobuf_message_fields(google::protobuf::Mes
           ProtoReflectors field_reflectors(message, name);
           ProtobufField *converter = syslogng::grpc::otel::otel_converter_by_field_descriptor(field_reflectors.fieldDescriptor);
 
-          FilterXObject *key = filterx_string_new(name.c_str(), name.size());
+          FILTERX_STRING_DECLARE_ON_STACK(key, name.c_str(), name.size());
           FilterXObject *value = converter->Get(&message, name);
           if (!value)
             {

modules/kvformat/filterx-func-parse-kv.c

@@ -80,8 +80,8 @@ _set_dict_value(FilterXObject *out,
                 const gchar *key, gsize key_len,
                 const gchar *value, gsize value_len)
 {
-  FilterXObject *dict_key = filterx_string_new(key, key_len);
-  FilterXObject *dict_val = filterx_string_new(value, value_len);
+  FILTERX_STRING_DECLARE_ON_STACK(dict_key, key, key_len);
+  FILTERX_STRING_DECLARE_ON_STACK(dict_val, value, value_len);
 
   gboolean ok = filterx_object_set_subscript(out, dict_key, &dict_val);