Start rework

1 files changed, 21 insertions, 6 deletions

diff --git a/src/libstat/stat_internal.h b/src/libstat/stat_internal.h
index 640196788..18d412ce3 100644
--- a/src/libstat/stat_internal.h
+++ b/src/libstat/stat_internal.h
@@ -69,10 +69,20 @@ struct rspamd_classifier_runtime {
 	gboolean skipped;
 };
 
-struct rspamd_token_result {
-	double value;
-	struct rspamd_statfile_runtime *st_runtime;
-	struct rspamd_classifier_runtime *cl_runtime;
+/* Common classifier structure */
+struct rspamd_classifier {
+	struct rspamd_stat_cache *cache;
+	gpointer cachecf;
+	GArray *statfiles_ids;
+	struct rspamd_classifier_config *cfg;
+};
+
+struct rspamd_statfile {
+	gint id;
+	struct rspamd_statfile_config *stcf;
+	struct rspamd_classifier *classifier;
+	struct rspamd_stat_backend *backend;
+	gpointer bkcf;
 };
 
 #define RSPAMD_MAX_TOKEN_LEN 16
@@ -80,10 +90,11 @@ typedef struct token_node_s {
 	guchar data[RSPAMD_MAX_TOKEN_LEN];
 	guint window_idx;
 	guint datalen;
-	GArray *results;
+	gdouble values[1];
 } rspamd_token_t;
 
 struct rspamd_stat_ctx {
+	/* Subroutines for all objects */
 	struct rspamd_stat_classifier *classifiers;
 	guint classifiers_count;
 	struct rspamd_stat_tokenizer *tokenizers;
@@ -93,8 +104,12 @@ struct rspamd_stat_ctx {
 	struct rspamd_stat_cache *caches;
 	guint caches_count;
 
-	guint statfiles;
+	/* Runtime configuration */
+	GPtrArray *statfiles; /* struct statfile */
 	struct rspamd_config *cfg;
+	/* Global tokenizer */
+	struct rspamd_stat_tokenizer *tokenizer;
+	gpointer tkcf;
 };
 
 typedef enum rspamd_learn_cache_result {