WIP: the tip of my filterx performance efforts

configure.ac

@@ -466,6 +466,7 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CC_C99
 AM_PROG_CC_C_O
+AM_PROG_AS
 if test "x$ac_cv_prog_cc_c99" = "xno"; then
 	AC_MSG_ERROR([C99 standard compliant C compiler required. Try GCC 3.x or later.])
 fi

lib/Makefile.am

@@ -29,6 +29,7 @@ include lib/logthrsource/Makefile.am
 include lib/logthrdest/Makefile.am
 include lib/signal-slot-connector/Makefile.am
 include lib/multi-line/Makefile.am
+include lib/perf/Makefile.am
 
 LSNG_RELEASE		= $(shell echo @PACKAGE_VERSION@ | cut -d. -f1,2)
 
@@ -307,7 +308,8 @@ lib_libsyslog_ng_la_SOURCES		= \
 	$(multiline_sources)		\
 	$(logthrsource_sources)		\
 	$(logthrdest_sources) \
-	$(signal_slot_connector_sources)
+	$(signal_slot_connector_sources) \
+	$(perf_sources)
 
 lib_libsyslog_ng_la_CFLAGS		= \
 	$(AM_CFLAGS) \

lib/apphook.c

@@ -49,6 +49,7 @@
 #include "timeutils/cache.h"
 #include "multi-line/multi-line-factory.h"
 #include "filterx/filterx-globals.h"
+#include "perf/perf.h"
 
 #include <iv.h>
 #include <iv_work.h>
@@ -215,6 +216,7 @@ construct_nondumpable_logger(msg_fatal);
 void
 app_startup(void)
 {
+  perf_global_init();
   msg_init(FALSE);
   iv_set_fatal_msg_handler(app_fatal);
   iv_init();
@@ -293,6 +295,7 @@ app_shutdown(void)
   hostname_global_deinit();
   crypto_deinit();
   msg_deinit();
+  perf_global_deinit();
 
 
   /* NOTE: the iv_deinit() call should come here, but there's some exit

lib/filterx/expr-assign.c

@@ -91,16 +91,6 @@ _assign_eval(FilterXExpr *s)
   return _assign(self, value);
 }
 
-FilterXExpr *
-filterx_nullv_assign_new(FilterXExpr *lhs, FilterXExpr *rhs)
-{
-  FilterXBinaryOp *self = g_new0(FilterXBinaryOp, 1);
-
-  filterx_binary_op_init_instance(self, "nullv_assign", lhs, rhs);
-  self->super.eval = _nullv_assign_eval;
-  self->super.ignore_falsy_result = TRUE;
-  return &self->super;
-}
 
 /* NOTE: takes the object reference */
 FilterXExpr *
@@ -113,3 +103,12 @@ filterx_assign_new(FilterXExpr *lhs, FilterXExpr *rhs)
   self->super.ignore_falsy_result = TRUE;
   return &self->super;
 }
+
+FilterXExpr *
+filterx_nullv_assign_new(FilterXExpr *lhs, FilterXExpr *rhs)
+{
+  FilterXExpr *self = filterx_assign_new(lhs, rhs);
+  self->type = "nullv_assign";
+  self->eval = _nullv_assign_eval;
+  return self;
+}

lib/filterx/expr-comparison.c

@@ -198,7 +198,7 @@ _eval_based_on_compare_mode(FilterXExpr *expr, gint compare_mode)
 }
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_comparison(FilterXExpr *s)
 {
   FilterXComparison *self = (FilterXComparison *) s;
 
@@ -250,7 +250,7 @@ _optimize(FilterXExpr *s)
     self->literal_rhs = _eval_based_on_compare_mode(self->super.rhs, compare_mode);
 
   if (self->literal_lhs && self->literal_rhs)
-    return filterx_literal_new(_eval(&self->super.super));
+    return filterx_literal_new(_eval_comparison(&self->super.super));
 
   return NULL;
 }
@@ -273,7 +273,7 @@ filterx_comparison_new(FilterXExpr *lhs, FilterXExpr *rhs, gint operator)
 
   filterx_binary_op_init_instance(&self->super, "comparison", lhs, rhs);
   self->super.super.optimize = _optimize;
-  self->super.super.eval = _eval;
+  self->super.super.eval = _eval_comparison;
   self->super.super.free_fn = _filterx_comparison_free;
   self->operator = operator;
 

lib/filterx/expr-compound.c

@@ -107,7 +107,7 @@ _eval_exprs(FilterXCompoundExpr *self, FilterXObject **result)
 }
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_compound(FilterXExpr *s)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
   FilterXObject *result = NULL;
@@ -168,12 +168,6 @@ _init(FilterXExpr *s, GlobalConfig *cfg)
         }
     }
 
-  stats_lock();
-  StatsClusterKey sc_key;
-  stats_cluster_single_key_set(&sc_key, "fx_compound_evals_total", NULL, 0);
-  stats_register_counter(STATS_LEVEL3, &sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
-  stats_unlock();
-
   return filterx_expr_init_method(s, cfg);
 }
 
@@ -182,12 +176,6 @@ _deinit(FilterXExpr *s, GlobalConfig *cfg)
 {
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
 
-  stats_lock();
-  StatsClusterKey sc_key;
-  stats_cluster_single_key_set(&sc_key, "fx_compound_evals_total", NULL, 0);
-  stats_unregister_counter(&sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
-  stats_unlock();
-
   for (gint i = 0; i < self->exprs->len; i++)
     {
       FilterXExpr *expr = g_ptr_array_index(self->exprs, i);
@@ -231,8 +219,8 @@ filterx_compound_expr_new(gboolean return_value_of_last_expr)
 {
   FilterXCompoundExpr *self = g_new0(FilterXCompoundExpr, 1);
 
-  filterx_expr_init_instance(&self->super);
-  self->super.eval = _eval;
+  filterx_expr_init_instance(&self->super, "compound");
+  self->super.eval = _eval_compound;
   self->super.optimize = _optimize;
   self->super.init = _init;
   self->super.deinit = _deinit;

lib/filterx/expr-condition.c

@@ -60,12 +60,6 @@ _init(FilterXExpr *s, GlobalConfig *cfg)
       return FALSE;
     }
 
-  stats_lock();
-  StatsClusterKey sc_key;
-  stats_cluster_single_key_set(&sc_key, "fx_condition_evals_total", NULL, 0);
-  stats_register_counter(STATS_LEVEL3, &sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
-  stats_unlock();
-
   return filterx_expr_init_method(s, cfg);
 }
 
@@ -74,12 +68,6 @@ _deinit(FilterXExpr *s, GlobalConfig *cfg)
 {
   FilterXConditional *self = (FilterXConditional *) s;
 
-  stats_lock();
-  StatsClusterKey sc_key;
-  stats_cluster_single_key_set(&sc_key, "fx_condition_evals_total", NULL, 0);
-  stats_unregister_counter(&sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
-  stats_unlock();
-
   filterx_expr_deinit(self->condition, cfg);
   filterx_expr_deinit(self->true_branch, cfg);
   filterx_expr_deinit(self->false_branch, cfg);
@@ -98,7 +86,7 @@ _free(FilterXExpr *s)
 }
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_conditional(FilterXExpr *s)
 {
   FilterXConditional *self = (FilterXConditional *) s;
   FilterXObject *condition_value = filterx_expr_eval(self->condition);
@@ -212,8 +200,8 @@ FilterXExpr *
 filterx_conditional_new(FilterXExpr *condition)
 {
   FilterXConditional *self = g_new0(FilterXConditional, 1);
-  filterx_expr_init_instance(&self->super);
-  self->super.eval = _eval;
+  filterx_expr_init_instance(&self->super, "conditional");
+  self->super.eval = _eval_conditional;
   self->super.optimize = _optimize;
   self->super.init = _init;
   self->super.deinit = _deinit;
@@ -227,7 +215,7 @@ FilterXExpr *
 filterx_conditional_find_tail(FilterXExpr *s)
 {
   /* check if this is a FilterXConditional instance */
-  if (s->eval != _eval)
+  if (s->eval != _eval_conditional)
     return NULL;
 
   FilterXConditional *self = (FilterXConditional *) s;

lib/filterx/expr-done.c

@@ -28,7 +28,7 @@
 #include "filterx/object-primitive.h"
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_done(FilterXExpr *s)
 {
   FilterXEvalContext *context = filterx_eval_get_context();
   context->eval_control_modifier = FXC_DONE;
@@ -40,8 +40,8 @@ FilterXExpr *
 filterx_expr_done(void)
 {
   FilterXExpr *self = g_new0(FilterXExpr, 1);
-  filterx_expr_init_instance(self);
-  self->eval = _eval;
+  filterx_expr_init_instance(self, "done");
+  self->eval = _eval_done;
 
   return self;
 }

lib/filterx/expr-drop.c

@@ -27,7 +27,7 @@
 #include "filterx/object-primitive.h"
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_drop(FilterXExpr *s)
 {
   FilterXEvalContext *context = filterx_eval_get_context();
   context->eval_control_modifier = FXC_DROP;
@@ -39,8 +39,8 @@ FilterXExpr *
 filterx_expr_drop_msg(void)
 {
   FilterXExpr *self = g_new0(FilterXExpr, 1);
-  filterx_expr_init_instance(self);
-  self->eval = _eval;
+  filterx_expr_init_instance(self, "drop");
+  self->eval = _eval_drop;
 
   return self;
 }

lib/filterx/expr-function.c

@@ -242,26 +242,12 @@ filterx_function_optimize_method(FilterXFunction *s)
 gboolean
 filterx_function_init_method(FilterXFunction *s, GlobalConfig *cfg)
 {
-  stats_lock();
-  StatsClusterKey sc_key;
-  StatsClusterLabel labels[] = { stats_cluster_label("name", s->function_name) };
-  stats_cluster_single_key_set(&sc_key, "fx_func_evals_total", labels, G_N_ELEMENTS(labels));
-  stats_register_counter(STATS_LEVEL3, &sc_key, SC_TYPE_SINGLE_VALUE, &s->super.eval_count);
-  stats_unlock();
-
   return filterx_expr_init_method(&s->super, cfg);
 }
 
 void
 filterx_function_deinit_method(FilterXFunction *s, GlobalConfig *cfg)
 {
-  stats_lock();
-  StatsClusterKey sc_key;
-  StatsClusterLabel labels[] = { stats_cluster_label("name", s->function_name) };
-  stats_cluster_single_key_set(&sc_key, "fx_func_evals_total", labels, G_N_ELEMENTS(labels));
-  stats_unregister_counter(&sc_key, SC_TYPE_SINGLE_VALUE, &s->super.eval_count);
-  stats_unlock();
-
   filterx_expr_deinit_method(&s->super, cfg);
 }
 
@@ -303,11 +289,12 @@ _function_free(FilterXExpr *s)
 void
 filterx_function_init_instance(FilterXFunction *s, const gchar *function_name)
 {
-  filterx_expr_init_instance(&s->super);
+  filterx_expr_init_instance(&s->super, "call");
   s->function_name = g_strdup_printf("%s()", function_name);
   s->super.optimize = _function_optimize;
   s->super.init = _function_init;
   s->super.deinit = _function_deinit;
+  s->super.name = s->function_name;
   s->super.free_fn = _function_free;
 }
 

lib/filterx/expr-generator.c

@@ -34,7 +34,7 @@ filterx_generator_set_fillable(FilterXExpr *s, FilterXExpr *fillable)
 }
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_generator(FilterXExpr *s)
 {
   FilterXExprGenerator *self = (FilterXExprGenerator *) s;
 
@@ -52,7 +52,7 @@ _eval(FilterXExpr *s)
 gboolean
 filterx_expr_is_generator(FilterXExpr *s)
 {
-  return s && s->eval == _eval;
+  return s && s->eval == _eval_generator;
 }
 
 FilterXExpr *
@@ -67,11 +67,11 @@ filterx_generator_optimize_method(FilterXExpr *s)
 void
 filterx_generator_init_instance(FilterXExpr *s)
 {
-  filterx_expr_init_instance(s);
+  filterx_expr_init_instance(s, "generator");
   s->optimize = filterx_generator_optimize_method;
   s->init = filterx_generator_init_method;
   s->deinit = filterx_generator_deinit_method;
-  s->eval = _eval;
+  s->eval = _eval_generator;
   s->ignore_falsy_result = TRUE;
 }
 
@@ -188,7 +188,7 @@ filterx_generator_create_container_new(FilterXExpr *g, FilterXExpr *fillable_par
 {
   FilterXExprGeneratorCreateContainer *self = g_new0(FilterXExprGeneratorCreateContainer, 1);
 
-  filterx_expr_init_instance(&self->super);
+  filterx_expr_init_instance(&self->super, "create_container");
   self->generator = (FilterXExprGenerator *) g;
   self->fillable_parent = fillable_parent;
   self->super.optimize = _create_container_optimize;

lib/filterx/expr-get-subscript.c

@@ -33,7 +33,7 @@ typedef struct _FilterXGetSubscript
 } FilterXGetSubscript;
 
 static FilterXObject *
-_eval(FilterXExpr *s)
+_eval_get_subscript(FilterXExpr *s)
 {
   FilterXGetSubscript *self = (FilterXGetSubscript *) s;
   FilterXObject *result = NULL;
@@ -129,12 +129,6 @@ _init(FilterXExpr *s, GlobalConfig *cfg)
       return FALSE;
     }
 
-  stats_lock();
-  StatsClusterKey sc_key;
-  stats_cluster_single_key_set(&sc_key, "fx_get_subscript_evals_total", NULL, 0);
-  stats_register_counter(STATS_LEVEL3, &sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
-  stats_unlock();
-
   return filterx_expr_init_method(s, cfg);
 }
 
@@ -143,12 +137,6 @@ _deinit(FilterXExpr *s, GlobalConfig *cfg)
 {
   FilterXGetSubscript *self = (FilterXGetSubscript *) s;
 
-  stats_lock();
-  StatsClusterKey sc_key;
-  stats_cluster_single_key_set(&sc_key, "fx_get_subscript_evals_total", NULL, 0);
-  stats_unregister_counter(&sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
-  stats_unlock();
-
   filterx_expr_deinit(self->operand, cfg);
   filterx_expr_deinit(self->key, cfg);
   filterx_expr_deinit_method(s, cfg);
@@ -169,8 +157,8 @@ filterx_get_subscript_new(FilterXExpr *operand, FilterXExpr *key)
 {
   FilterXGetSubscript *self = g_new0(FilterXGetSubscript, 1);
 
-  filterx_expr_init_instance(&self->super);
-  self->super.eval = _eval;
+  filterx_expr_init_instance(&self->super, "get_subscript");
+  self->super.eval = _eval_get_subscript;
   self->super.is_set = _isset;
   self->super.unset = _unset;
   self->super.optimize = _optimize;