Skip to content

Commit ece33ca

Browse files
OverOrionOverOrion
authored
Merge pull request #444 from bazsi/filterx-expr-add-type-field
filterx: use "type" as a description to FilterXExpr type
2 parents 1be49da + 47a5239 commit ece33ca

18 files changed

+30
-34
lines changed

‎lib/filterx/expr-compound.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ filterx_compound_expr_new(gboolean return_value_of_last_expr)
231231
{
232232
FilterXCompoundExpr *self = g_new0(FilterXCompoundExpr, 1);
233233

234-
filterx_expr_init_instance(&self->super);
234+
filterx_expr_init_instance(&self->super, "compound");
235235
self->super.eval = _eval;
236236
self->super.optimize = _optimize;
237237
self->super.init = _init;

‎lib/filterx/expr-condition.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ FilterXExpr *
212212
filterx_conditional_new(FilterXExpr *condition)
213213
{
214214
FilterXConditional *self = g_new0(FilterXConditional, 1);
215-
filterx_expr_init_instance(&self->super);
215+
filterx_expr_init_instance(&self->super, "conditional");
216216
self->super.eval = _eval;
217217
self->super.optimize = _optimize;
218218
self->super.init = _init;

‎lib/filterx/expr-done.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ FilterXExpr *
4040
filterx_expr_done(void)
4141
{
4242
FilterXExpr *self = g_new0(FilterXExpr, 1);
43-
filterx_expr_init_instance(self);
43+
filterx_expr_init_instance(self, "done");
4444
self->eval = _eval;
4545

4646
return self;

‎lib/filterx/expr-drop.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ FilterXExpr *
3939
filterx_expr_drop_msg(void)
4040
{
4141
FilterXExpr *self = g_new0(FilterXExpr, 1);
42-
filterx_expr_init_instance(self);
42+
filterx_expr_init_instance(self, "drop");
4343
self->eval = _eval;
4444

4545
return self;

‎lib/filterx/expr-function.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ _function_free(FilterXExpr *s)
303303
void
304304
filterx_function_init_instance(FilterXFunction *s, const gchar *function_name)
305305
{
306-
filterx_expr_init_instance(&s->super);
306+
filterx_expr_init_instance(&s->super, "function");
307307
s->function_name = g_strdup_printf("%s()", function_name);
308308
s->super.optimize = _function_optimize;
309309
s->super.init = _function_init;

‎lib/filterx/expr-generator.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ filterx_generator_optimize_method(FilterXExpr *s)
6767
void
6868
filterx_generator_init_instance(FilterXExpr *s)
6969
{
70-
filterx_expr_init_instance(s);
70+
filterx_expr_init_instance(s, "generator");
7171
s->optimize = filterx_generator_optimize_method;
7272
s->init = filterx_generator_init_method;
7373
s->deinit = filterx_generator_deinit_method;
@@ -188,7 +188,7 @@ filterx_generator_create_container_new(FilterXExpr *g, FilterXExpr *fillable_par
188188
{
189189
FilterXExprGeneratorCreateContainer *self = g_new0(FilterXExprGeneratorCreateContainer, 1);
190190

191-
filterx_expr_init_instance(&self->super);
191+
filterx_expr_init_instance(&self->super, "create_container");
192192
self->generator = (FilterXExprGenerator *) g;
193193
self->fillable_parent = fillable_parent;
194194
self->super.optimize = _create_container_optimize;

‎lib/filterx/expr-get-subscript.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ filterx_get_subscript_new(FilterXExpr *operand, FilterXExpr *key)
169169
{
170170
FilterXGetSubscript *self = g_new0(FilterXGetSubscript, 1);
171171

172-
filterx_expr_init_instance(&self->super);
172+
filterx_expr_init_instance(&self->super, "get_subscript");
173173
self->super.eval = _eval;
174174
self->super.is_set = _isset;
175175
self->super.unset = _unset;

‎lib/filterx/expr-getattr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ filterx_getattr_new(FilterXExpr *operand, FilterXString *attr_name)
148148
{
149149
FilterXGetAttr *self = g_new0(FilterXGetAttr, 1);
150150

151-
filterx_expr_init_instance(&self->super);
151+
filterx_expr_init_instance(&self->super, "getattr");
152152
self->super.eval = _eval;
153153
self->super.unset = _unset;
154154
self->super.is_set = _isset;

‎lib/filterx/expr-literal-generator.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static void
263263
_literal_inner_generator_init_instance(FilterXLiteralInnerGenerator *self, FilterXExpr *root_literal_generator,
264264
GList *elements)
265265
{
266-
filterx_expr_init_instance(&self->super);
266+
filterx_expr_init_instance(&self->super, "literal_inner_generator");
267267
self->super.free_fn = _literal_inner_generator_free;
268268

269269
/*

‎lib/filterx/expr-literal.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ filterx_literal_new(FilterXObject *object)
4949
{
5050
FilterXLiteral *self = g_new0(FilterXLiteral, 1);
5151

52-
filterx_expr_init_instance(&self->super);
52+
filterx_expr_init_instance(&self->super, "literal");
5353
self->super.eval = _eval;
5454
self->super.free_fn = _free;
5555
self->object = object;

‎lib/filterx/expr-regexp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ filterx_expr_regexp_match_new(FilterXExpr *lhs, const gchar *pattern)
111111
{
112112
FilterXExprRegexpMatch *self = g_new0(FilterXExprRegexpMatch, 1);
113113

114-
filterx_expr_init_instance(&self->super);
114+
filterx_expr_init_instance(&self->super, "regexp_match");
115115
self->super.eval = _regexp_match_eval;
116116
self->super.optimize = _regexp_match_optimize;
117117
self->super.init = _regexp_match_init;

‎lib/filterx/expr-set-subscript.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ filterx_nullv_set_subscript_new(FilterXExpr *object, FilterXExpr *key, FilterXEx
222222
{
223223
FilterXSetSubscript *self = g_new0(FilterXSetSubscript, 1);
224224

225-
filterx_expr_init_instance(&self->super);
225+
filterx_expr_init_instance(&self->super, "nullv_set_subscript");
226226
self->super.eval = _nullv_set_subscript_eval;
227227
self->super.optimize = _optimize;
228228
self->super.init = _init;
@@ -240,7 +240,7 @@ filterx_set_subscript_new(FilterXExpr *object, FilterXExpr *key, FilterXExpr *ne
240240
{
241241
FilterXSetSubscript *self = g_new0(FilterXSetSubscript, 1);
242242

243-
filterx_expr_init_instance(&self->super);
243+
filterx_expr_init_instance(&self->super, "set_subscript");
244244
self->super.eval = _set_subscript_eval;
245245
self->super.optimize = _optimize;
246246
self->super.init = _init;

‎lib/filterx/expr-setattr.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ filterx_nullv_setattr_new(FilterXExpr *object, FilterXString *attr_name, FilterX
196196
{
197197
FilterXSetAttr *self = g_new0(FilterXSetAttr, 1);
198198

199-
filterx_expr_init_instance(&self->super);
199+
filterx_expr_init_instance(&self->super, "nullv_setattr");
200200
self->super.eval = _nullv_setattr_eval;
201201
self->super.optimize = _optimize;
202202
self->super.init = _init;
@@ -217,7 +217,7 @@ filterx_setattr_new(FilterXExpr *object, FilterXString *attr_name, FilterXExpr *
217217
{
218218
FilterXSetAttr *self = g_new0(FilterXSetAttr, 1);
219219

220-
filterx_expr_init_instance(&self->super);
220+
filterx_expr_init_instance(&self->super, "setattr");
221221
self->super.eval = _setattr_eval;
222222
self->super.optimize = _optimize;
223223
self->super.init = _init;

‎lib/filterx/expr-template.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ filterx_template_new(LogTemplate *template)
9999
{
100100
FilterXTemplate *self = g_new0(FilterXTemplate, 1);
101101

102-
filterx_expr_init_instance(&self->super);
102+
filterx_expr_init_instance(&self->super, "template");
103103
self->super.init = _template_init;
104104
self->super.deinit = _template_deinit;
105105
self->super.eval = _eval;

‎lib/filterx/expr-variable.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ filterx_variable_expr_new(FilterXString *name, FilterXVariableType type)
208208
{
209209
FilterXVariableExpr *self = g_new0(FilterXVariableExpr, 1);
210210

211-
filterx_expr_init_instance(&self->super);
211+
filterx_expr_init_instance(&self->super, "variable");
212212
self->super.free_fn = _free;
213213
self->super.init = _init;
214214
self->super.deinit = _deinit;

‎lib/filterx/filterx-expr.c

+9-12
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,20 @@ filterx_expr_free_method(FilterXExpr *self)
118118
}
119119

120120
void
121-
filterx_expr_init_instance(FilterXExpr *self)
121+
filterx_expr_init_instance(FilterXExpr *self, const gchar *type)
122122
{
123123
self->ref_cnt = 1;
124124
self->init = filterx_expr_init_method;
125125
self->deinit = filterx_expr_deinit_method;
126126
self->free_fn = filterx_expr_free_method;
127+
self->type = type;
127128
}
128129

129130
FilterXExpr *
130131
filterx_expr_new(void)
131132
{
132133
FilterXExpr *self = g_new0(FilterXExpr, 1);
133-
filterx_expr_init_instance(self);
134+
filterx_expr_init_instance(self, "expr");
134135
return self;
135136
}
136137

@@ -180,7 +181,7 @@ filterx_unary_op_init_method(FilterXExpr *s, GlobalConfig *cfg)
180181

181182
stats_lock();
182183
StatsClusterKey sc_key;
183-
StatsClusterLabel labels[] = { stats_cluster_label("name", self->name) };
184+
StatsClusterLabel labels[] = { stats_cluster_label("name", self->super.type) };
184185
stats_cluster_single_key_set(&sc_key, "fx_op_evals_total", labels, G_N_ELEMENTS(labels));
185186
stats_register_counter(STATS_LEVEL3, &sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
186187
stats_unlock();
@@ -195,7 +196,7 @@ filterx_unary_op_deinit_method(FilterXExpr *s, GlobalConfig *cfg)
195196

196197
stats_lock();
197198
StatsClusterKey sc_key;
198-
StatsClusterLabel labels[] = { stats_cluster_label("name", self->name) };
199+
StatsClusterLabel labels[] = { stats_cluster_label("name", self->super.type) };
199200
stats_cluster_single_key_set(&sc_key, "fx_op_evals_total", labels, G_N_ELEMENTS(labels));
200201
stats_unregister_counter(&sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
201202
stats_unlock();
@@ -216,14 +217,12 @@ filterx_unary_op_free_method(FilterXExpr *s)
216217
void
217218
filterx_unary_op_init_instance(FilterXUnaryOp *self, const gchar *name, FilterXExpr *operand)
218219
{
219-
filterx_expr_init_instance(&self->super);
220+
filterx_expr_init_instance(&self->super, name);
220221
self->super.optimize = filterx_unary_op_optimize_method;
221222
self->super.init = filterx_unary_op_init_method;
222223
self->super.deinit = filterx_unary_op_deinit_method;
223224
self->super.free_fn = filterx_unary_op_free_method;
224225
self->operand = operand;
225-
226-
self->name = name;
227226
}
228227

229228
void
@@ -259,7 +258,7 @@ filterx_binary_op_init_method(FilterXExpr *s, GlobalConfig *cfg)
259258

260259
stats_lock();
261260
StatsClusterKey sc_key;
262-
StatsClusterLabel labels[] = { stats_cluster_label("name", self->name) };
261+
StatsClusterLabel labels[] = { stats_cluster_label("name", self->super.type) };
263262
stats_cluster_single_key_set(&sc_key, "fx_op_evals_total", labels, G_N_ELEMENTS(labels));
264263
stats_register_counter(STATS_LEVEL3, &sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
265264
stats_unlock();
@@ -274,7 +273,7 @@ filterx_binary_op_deinit_method(FilterXExpr *s, GlobalConfig *cfg)
274273

275274
stats_lock();
276275
StatsClusterKey sc_key;
277-
StatsClusterLabel labels[] = { stats_cluster_label("name", self->name) };
276+
StatsClusterLabel labels[] = { stats_cluster_label("name", self->super.type) };
278277
stats_cluster_single_key_set(&sc_key, "fx_op_evals_total", labels, G_N_ELEMENTS(labels));
279278
stats_unregister_counter(&sc_key, SC_TYPE_SINGLE_VALUE, &self->super.eval_count);
280279
stats_unlock();
@@ -287,7 +286,7 @@ filterx_binary_op_deinit_method(FilterXExpr *s, GlobalConfig *cfg)
287286
void
288287
filterx_binary_op_init_instance(FilterXBinaryOp *self, const gchar *name, FilterXExpr *lhs, FilterXExpr *rhs)
289288
{
290-
filterx_expr_init_instance(&self->super);
289+
filterx_expr_init_instance(&self->super, name);
291290
self->super.optimize = filterx_binary_op_optimize_method;
292291
self->super.init = filterx_binary_op_init_method;
293292
self->super.deinit = filterx_binary_op_deinit_method;
@@ -296,6 +295,4 @@ filterx_binary_op_init_instance(FilterXBinaryOp *self, const gchar *name, Filter
296295
g_assert(rhs);
297296
self->lhs = lhs;
298297
self->rhs = rhs;
299-
300-
self->name = name;
301298
}

‎lib/filterx/filterx-expr.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ struct _FilterXExpr
5656
FilterXExpr *(*optimize)(FilterXExpr *self);
5757
void (*free_fn)(FilterXExpr *self);
5858

59+
/* type of the expr */
5960
const gchar *type;
6061
CFG_LTYPE *lloc;
6162
gchar *expr_text;
@@ -151,7 +152,7 @@ void filterx_expr_set_location(FilterXExpr *self, CfgLexer *lexer, CFG_LTYPE *ll
151152
void filterx_expr_set_location_with_text(FilterXExpr *self, CFG_LTYPE *lloc, const gchar *text);
152153
EVTTAG *filterx_expr_format_location_tag(FilterXExpr *self);
153154
FilterXExpr *filterx_expr_optimize(FilterXExpr *self);
154-
void filterx_expr_init_instance(FilterXExpr *self);
155+
void filterx_expr_init_instance(FilterXExpr *self, const gchar *type);
155156
FilterXExpr *filterx_expr_new(void);
156157
FilterXExpr *filterx_expr_ref(FilterXExpr *self);
157158
void filterx_expr_unref(FilterXExpr *self);
@@ -190,7 +191,6 @@ typedef struct _FilterXUnaryOp
190191
{
191192
FilterXExpr super;
192193
FilterXExpr *operand;
193-
const gchar *name;
194194
} FilterXUnaryOp;
195195

196196
FilterXExpr *filterx_unary_op_optimize_method(FilterXExpr *s);
@@ -203,7 +203,6 @@ typedef struct _FilterXBinaryOp
203203
{
204204
FilterXExpr super;
205205
FilterXExpr *lhs, *rhs;
206-
const gchar *name;
207206
} FilterXBinaryOp;
208207

209208
FilterXExpr *filterx_binary_op_optimize_method(FilterXExpr *s);

‎libtest/filterx-lib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ filterx_dummy_error_new(const gchar *msg)
168168
{
169169
FilterXDummyError *self = g_new0(FilterXDummyError, 1);
170170
self->msg = g_strdup(msg);
171-
filterx_expr_init_instance(&self->super);
171+
filterx_expr_init_instance(&self->super, "dummy");
172172
self->super.eval = _eval;
173173
self->super.free_fn = _free;
174174
return &self->super;

0 commit comments

Comments
 (0)