httpv2.0 rebase onto develop-2.0dev-http-v2.0

1 files changed, 80 insertions, 102 deletions

diff --git a/decoders/http/http_decoder_stat.c b/decoders/http/http_decoder_stat.c
index dec6c91..a8240c2 100644
--- a/decoders/http/http_decoder_stat.c
+++ b/decoders/http/http_decoder_stat.c
@@ -2,126 +2,104 @@
 #include <stdio.h>
 #include <pthread.h>
 #include <unistd.h>
-#include "http_decoder_private.h"
+#include "http_decoder_stat.h"
 
-static const struct hd_stat_config_tuple g_httpd_stat_tuple[HTTP_STAT_MAX] =
-    {
-        {HTTP_C2S_BYTES, "http_c2s_bytes"},
-        {HTTP_S2C_BYTES, "http_s2c_bytes"},
-        {HTTP_C2S_TCP_SEG, "http_c2s_tcp_seg"},
-        {HTTP_S2C_TCP_SEG, "http_s2c_tcp_seg"},
-        {HTTP_C2S_HEADERS, "http_c2s_headers"},
-        {HTTP_S2C_HEADERS, "http_s2c_headers"},
-        {HTTP_C2S_ZIP_BYTES, "http_c2s_zip_bytes"},
-        {HTTP_S2C_ZIP_BYTES, "http_s2c_zip_bytes"},
-        {HTTP_C2S_UNZIP_BYTES, "http_c2s_unzip_bytes"},
-        {HTTP_S2C_UNZIP_BYTES, "http_s2c_unzip_bytes"},
-        {HTTP_URL_BYTES, "http_url_bytes"},
-        {HTTP_SESSION_NEW, "http_session_new"},
-        {HTTP_SESSION_FREE, "http_session_free"},
-        {HTTP_TRANSACTION_NEW, "http_transaction_new"},
-        {HTTP_TRANSACTION_FREE, "http_transaction_free"},
-        {HTTP_C2S_ASYMMETRY_SESSION, "http_c2s_asymmetry_sess"},
-        {HTTP_S2C_ASYMMETRY_SESSION, "http_s2c_asymmetry_sess"},
-        {HTTP_C2S_ASYMMETRY_TRANSACTION, "http_c2s_asymmetry_trans"},
-        {HTTP_S2C_ASYMMETRY_TRANSACTION, "http_s2c_asymmetry_trans"},
-        {HTTP_STAT_PARSE_ERR, "http_parse_error"},
-};
-
-void http_decoder_stat_free(struct http_decoder_stat *hd_stat)
+#ifdef __cplusplus
+extern "C"
 {
-    if (hd_stat->timer_pid != 0)
-    {
-        pthread_cancel(hd_stat->timer_pid);
-    }
-    if (hd_stat->stats != NULL)
-    {
-        free(hd_stat->stats);
-    }
-    if (hd_stat->fse != NULL)
-    {
-        fieldstat_easy_free(hd_stat->fse);
-    }
-}
+#endif
+    static const struct hd_stat_config_tuple g_httpd_stat_tuple[HTTP_STAT_MAX] =
+        {
+            {HTTP_C2S_BYTES, "http_c2s_bytes"},
+            {HTTP_S2C_BYTES, "http_s2c_bytes"},
+            {HTTP_C2S_TCP_SEG, "http_c2s_tcp_seg"},
+            {HTTP_S2C_TCP_SEG, "http_s2c_tcp_seg"},
+            {HTTP_C2S_HEADERS, "http_c2s_headers"},
+            {HTTP_S2C_HEADERS, "http_s2c_headers"},
+            {HTTP_C2S_ZIP_BYTES, "http_c2s_zip_bytes"},
+            {HTTP_S2C_ZIP_BYTES, "http_s2c_zip_bytes"},
+            {HTTP_C2S_UNZIP_BYTES, "http_c2s_unzip_bytes"},
+            {HTTP_S2C_UNZIP_BYTES, "http_s2c_unzip_bytes"},
+            {HTTP_URL_BYTES, "http_url_bytes"},
+            {HTTP_SESSION_NEW, "http_session_new"},
+            {HTTP_SESSION_FREE, "http_session_free"},
+            {HTTP_TRANSACTION_NEW, "http_transaction_new"},
+            {HTTP_TRANSACTION_FREE, "http_transaction_free"},
+            {HTTP_C2S_ASYMMETRY_SESSION, "http_c2s_asymmetry_sess"},
+            {HTTP_S2C_ASYMMETRY_SESSION, "http_s2c_asymmetry_sess"},
+            {HTTP_C2S_ASYMMETRY_TRANSACTION, "http_c2s_asymmetry_trans"},
+            {HTTP_S2C_ASYMMETRY_TRANSACTION, "http_s2c_asymmetry_trans"},
+            {HTTP_STAT_PARSE_ERR, "http_parse_error"},
+    };
 
-static void *httpd_stat_timer_thread(void *arg)
-{
-    pthread_setname_np(pthread_self(), "http_decoder_timer_thread");
-    struct http_decoder_stat *hd_stat = (struct http_decoder_stat *)arg;
-    struct timespec res;
-    while (1)
+    void http_stat_free(struct http_stat *hd_stat)
     {
-        clock_gettime(CLOCK_MONOTONIC, &res);
-        hd_stat->current_time_ms = (res.tv_sec * 1000) + (res.tv_nsec / 1000000);
-        usleep(800);
+        if (hd_stat->fs4_ins != NULL)
+        {
+            fieldstat_easy_free(hd_stat->fs4_ins);
+        }
     }
-    return NULL;
-}
 
-int http_decoder_stat_init(struct http_decoder_stat *hd_stat, int thread_max, int stat_interval_pkts, int stat_interval_time)
-{
-    assert(sizeof(g_httpd_stat_tuple) / sizeof(struct hd_stat_config_tuple) == HTTP_STAT_MAX);
-    if (sizeof(g_httpd_stat_tuple) / sizeof(struct hd_stat_config_tuple) != HTTP_STAT_MAX)
-    {
-        fprintf(stderr, "enum http_decoder_stat_type number not match with g_httpd_stat_tuple!");
-        return -1;
-    }
-    hd_stat->fse = fieldstat_easy_new(thread_max, "http_decoder_statistics", NULL, 0);
-    if (NULL == hd_stat->fse)
+    static struct fieldstat_easy *http_get_fs4_ins(struct module_manager *mod_mgr)
     {
-        fprintf(stderr, "fieldstat_easy_new failed.");
-        return -1;
+        // todo: use stellar global fieldstat4 instance
+        struct fieldstat_easy *fs4 = fieldstat_easy_new(module_manager_get_max_thread_num(mod_mgr), "HTTP", NULL, 0);
+        fieldstat_easy_enable_auto_output(fs4, "./log/http.fs4", 1);
+        return fs4;
     }
 
-    for (int i = 0; i < HTTP_STAT_MAX; i++)
+    int http_stat_init(struct module_manager *mod_mgr, struct http_stat *hd_stat)
     {
-        hd_stat->field_stat_id[i] = fieldstat_easy_register_counter(hd_stat->fse, g_httpd_stat_tuple[i].name);
-        if (hd_stat->field_stat_id[i] < 0)
+        assert(sizeof(g_httpd_stat_tuple) / sizeof(struct hd_stat_config_tuple) == HTTP_STAT_MAX);
+        if (sizeof(g_httpd_stat_tuple) / sizeof(struct hd_stat_config_tuple) != HTTP_STAT_MAX)
         {
-            fprintf(stderr, "fieldstat_easy_register_counter %s failed.", g_httpd_stat_tuple[i].name);
-            fieldstat_easy_free(hd_stat->fse);
-            hd_stat->fse = NULL;
+            fprintf(stderr, "enum http_decoder_stat_type number not match with g_httpd_stat_tuple!");
+            return -1;
+        }
+        hd_stat->fs4_ins = http_get_fs4_ins(mod_mgr);
+        if (NULL == hd_stat->fs4_ins)
+        {
+            fprintf(stderr, "fieldstat_easy_new failed.");
             return -1;
         }
-    }
 
-    int ret = fieldstat_easy_enable_auto_output(hd_stat->fse, FILEDSTAT_OUTPUT_FILE, stat_interval_time);
-    if (ret < 0)
-    {
-        fprintf(stderr, "fieldstat_easy_enable_auto_output failed.");
-        fieldstat_easy_free(hd_stat->fse);
-        hd_stat->fse = NULL;
-        return -1;
+        for (int i = 0; i < HTTP_STAT_MAX; i++)
+        {
+            hd_stat->field_stat_id[i] = fieldstat_easy_register_counter(hd_stat->fs4_ins, g_httpd_stat_tuple[i].name);
+            if (hd_stat->field_stat_id[i] < 0)
+            {
+                fprintf(stderr, "fieldstat_easy_register_counter %s failed.", g_httpd_stat_tuple[i].name);
+                fieldstat_easy_free(hd_stat->fs4_ins);
+                hd_stat->fs4_ins = NULL;
+                return -1;
+            }
+        }
+        return 0;
     }
-    hd_stat->stats = (struct hd_statistics *)calloc(thread_max, sizeof(struct hd_statistics));
-    hd_stat->stat_interval_pkts = stat_interval_pkts;
-    hd_stat->stat_interval_time = stat_interval_time;
-    pthread_create(&hd_stat->timer_pid, NULL, httpd_stat_timer_thread, hd_stat);
-    pthread_detach(hd_stat->timer_pid);
-    return 0;
-}
-
-void http_decoder_stat_update(struct http_decoder_stat *hd_stat, int thread_id, enum http_decoder_stat_type type, long long value)
-{
-    assert(hd_stat);
-    assert(thread_id >= 0);
-    assert(type < HTTP_STAT_MAX);
 
-    if (unlikely(hd_stat->stats == NULL))
+    void http_stat_update(struct http_stat *hd_stat, int thread_id, enum http_decoder_stat_type type, long long value)
     {
-        return;
+        assert(hd_stat);
+        assert(thread_id >= 0);
+        assert(type < HTTP_STAT_MAX);
+        // todo: performance optimization, use batch update
+        fieldstat_easy_counter_incrby(hd_stat->fs4_ins, thread_id, hd_stat->field_stat_id[type], NULL, 0, value);
     }
 
-    struct hd_statistics *cur_hds = &hd_stat->stats[thread_id];
-
-    cur_hds->counter[type] += value;
-    cur_hds->batch[type]++;
-
-    if (cur_hds->batch[type] >= hd_stat->stat_interval_pkts || cur_hds->time_ms[type] + 1000 < hd_stat->current_time_ms)
+    void http_stat_update_tcp_seg(struct http_stat *stat, int thread_id, enum flow_type ftype, long long value)
     {
-        fieldstat_easy_counter_incrby(hd_stat->fse, thread_id, hd_stat->field_stat_id[type], NULL, 0, cur_hds->counter[type]);
-        cur_hds->counter[type] = 0;
-        cur_hds->batch[type] = 0;
-        cur_hds->time_ms[type] = hd_stat->current_time_ms;
+        if (FLOW_TYPE_C2S == ftype)
+        {
+            http_stat_update(stat, thread_id, HTTP_C2S_BYTES, value);
+            http_stat_update(stat, thread_id, HTTP_C2S_TCP_SEG, 1);
+        }
+        else
+        {
+            http_stat_update(stat, thread_id, HTTP_S2C_BYTES, value);
+            http_stat_update(stat, thread_id, HTTP_S2C_TCP_SEG, 1);
+        }
     }
-}
\ No newline at end of file
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file