修改field_stat2

4 files changed, 154 insertions, 106 deletions

diff --git a/example/demo/hos_write_complete.cpp b/example/demo/hos_write_complete.cpp
index 6fc40409..00a78109 100644
--- a/example/demo/hos_write_complete.cpp
+++ b/example/demo/hos_write_complete.cpp
@@ -70,18 +70,15 @@ int main(int argc, char *argv[])
     char *bucket = argv[1];
     char *object = argv[2];
     int test_times = atoi(argv[3]);
-    //int test_times = 10000;
     char *buf = (char *)malloc(1024 * 1024 * 40);
-    //char buf[1024 * 1024 * 4];
-    //char buf[1024 * 4];
     size_t buf_size;
     int mode = FILE_MODE;
     size_t fd[10001] = {0}; 
     userdata_t data = {&finished};
-    //printf("finished:%lu\n", finished.tv_sec * 1000 * 1000 * 1000 + finished.tv_nsec);
 
     file_to_buffer(object, buf, &buf_size);
 
+    hos_init_api();
     debuginfo("hos_client_init start ...\n");
     hos_client_handle handle = hos_client_create("http://192.168.40.223:9098/hos/", "default", "default", 4000);
     //hos_client_handle handle = hos_client_create("http://192.168.32.10:9098/hos/", "default", "default", 4);
@@ -110,11 +107,6 @@ int main(int argc, char *argv[])
     
 #if 1
     mode = FILE_MODE;
-#if 0
-    for (i = 0; i < test_times; i++)
-    {
-    }
-#endif
     debuginfo("hos_upload_file start ...\n");
     clock_gettime(CLOCK_MONOTONIC, &start);
     for (i = 0; i < test_times; i++)
@@ -165,6 +157,7 @@ int main(int argc, char *argv[])
     }
 
     debuginfo("hos_client_close end ...\n");
+    hos_shutdown_api();
     free(buf);
     return 0;
 }
diff --git a/example/performance/HosClientPerformance.cpp b/example/performance/HosClientPerformance.cpp
index c9b10359..e2aa7b23 100644
--- a/example/performance/HosClientPerformance.cpp
+++ b/example/performance/HosClientPerformance.cpp
@@ -13,10 +13,11 @@ extern "C"
 #include<pthread.h>
 #include<dirent.h>
 #include<sys/stat.h>
+#include<math.h>
 }
 #include"../../src/hos_client.h"
 
-#define MAX_THREAD_NUM 16
+#define MAX_THREAD_NUM 32
 #ifndef MIN
 #define MIN(a,b) ((a) > (b)) ? (b) : (a)
 #endif
@@ -30,7 +31,9 @@ typedef struct conf_s
     char file[STRING_SIZE];
     size_t pool_size;
     size_t thread_sum;
-    size_t append_size;
+    size_t size;
+    float append_size;
+    size_t slice;
     int mode;
 }conf_t;
 
@@ -51,6 +54,7 @@ static void configuration_init(conf_t *conf)
     conf->append_size = 1024;
     conf->thread_sum = 1;
     conf->mode = BUFF_MODE;
+    conf->slice = 0;
 
     return ;
 }
@@ -136,14 +140,20 @@ static int upload_file(char *file, char *buff, int buff_len, int test_times, thr
     size_t fd[3000];
     conf_t *conf = &thread_info->conf;
     struct timespec tstart, tend, twrite;
-    size_t time_write, time_upload;
+    long time_write = 0, time_upload = 0;
     size_t len = strlen(performance_info);
     char file_size[128];
+    long record[1000] = {0};
+    double variance = 0.00;
+    double average = 0.00;
+    long time = 0;
+    int success_cnt;
     //写文件
     
-    clock_gettime(CLOCK_MONOTONIC, &tstart);
+    //clock_gettime(CLOCK_MONOTONIC, &tstart);
     for (i = 0; i < test_times; i++)
     {
+        clock_gettime(CLOCK_MONOTONIC, &tstart);
         fp = fopen(file, "w+");
         if (fp == NULL)
         {
@@ -157,31 +167,44 @@ static int upload_file(char *file, char *buff, int buff_len, int test_times, thr
             return -1;
         }
         fclose(fp);
+        clock_gettime(CLOCK_MONOTONIC, &twrite);
+        record[i] = calc_time(tstart, twrite);
+        time_write += record[i];
     }
-    clock_gettime(CLOCK_MONOTONIC, &twrite);
-    time_write = calc_time(tstart, twrite);
+    //clock_gettime(CLOCK_MONOTONIC, &twrite);
+    //time_write = calc_time(tstart, twrite);
     time_write /= test_times;
 
     //上传文件
-    clock_gettime(CLOCK_MONOTONIC, &tstart);
+    //clock_gettime(CLOCK_MONOTONIC, &tstart);
     for (i = 0; i < test_times; i++)
     {
+        clock_gettime(CLOCK_MONOTONIC, &tstart);
         fd[i] = hos_open_fd(thread_info->handle, conf->bucket, conf->object, callback, NULL, thread_info->thread_num, conf->mode);
         if (hos_write(fd[i], file, 0, thread_info->thread_num) != HOS_CLIENT_OK)
         {
             printf("error:hos_write file:%s\n", file);
             return -1;
         }
+        clock_gettime(CLOCK_MONOTONIC, &tend);
+        time = calc_time(tstart, tend);
+        time_upload += time;
+        record[i] += time;
     }
-    clock_gettime(CLOCK_MONOTONIC, &tend);
-    time_upload = calc_time(tstart, tend);
+    //clock_gettime(CLOCK_MONOTONIC, &tend);
+    //time_upload = calc_time(tstart, tend);
     time_upload /= test_times;
 
-    sprintf(file_size, "%dk", buff_len / 1024);
-    sprintf(&performance_info[len], "%-20lu%-20s%-20lu%-20lu%-20lu\n",
-            thread_info->thread_num, file_size, time_write, time_upload, time_write + time_upload);
+    average = time_write + time_upload;
+    for (i = 0; i < test_times; i++)
+    {
+        variance += pow((record[i] - average), 2);
+    }
+    variance /= test_times;
 
-    //hos_close_fd(fd, thread_info->thread_num);
+    sprintf(file_size, "%dk", buff_len / 1024);
+    sprintf(&performance_info[len], "%-20lu%-20s%-20ld%-20ld%-20lf%-20lf\n",
+            thread_info->thread_num, file_size, time_write, time_upload, average, sqrt(variance));
     
     return 0;
 }
@@ -201,109 +224,127 @@ static int upload_buff(char * buff, int buff_len, int test_times, thread_info_t
     char append_size[128];
     size_t success_cnt = 0;
     int ret = 0;
+    int drop = 0;
+    double variance = 0.00;
+    double average = 0.00;
+    long record[1000] = {0};
 
-#if 0
-    size_t time_tmp = 0;
-    while(1)
+    if (conf->slice)
     {
-        tmp = j * conf->append_size;
-        rest = buff_len - tmp;
-        if (rest < conf->append_size)
+        fd = hos_open_fd(thread_info->handle, conf->bucket, conf->object, callback, NULL, thread_info->thread_num, conf->mode);
+        for (i = 0; i < test_times; i++)
         {
+            j = 0;
             clock_gettime(CLOCK_MONOTONIC, &tstart);
-            for (i = 0; i < test_times; i++)
+            while(1)
             {
-                hos_write(fd, &buff[tmp], rest, thread_info->thread_num);
+                tmp = j * conf->slice;
+                rest = buff_len - tmp;
+                if (rest < conf->slice)
+                {
+                    hos_write(fd, &buff[tmp], rest, thread_info->thread_num);
+                    break;
+                }
+                hos_write(fd, &buff[tmp], conf->slice, thread_info->thread_num);
+                j++;
             }
             clock_gettime(CLOCK_MONOTONIC, &ttmp);
-            time_tmp = calc_time(tstart, ttmp);
-            time_tmp /= test_times;
-            time += time_tmp;
-
-            sprintf(file_size, "%dk", buff_len / 1024);
-            sprintf(append_size, "%luk", conf->append_size / 1024);
-            len = strlen(performance_info);
-            sprintf(&performance_info[len], "%-20lu%-20s%-20s%-20lu%-20lu\n",
-                    thread_info->thread_num, file_size, append_size, time_tmp, time);
-            break;
+            record[i] = calc_time(tstart, ttmp);
+            average += record[i];
         }
-        clock_gettime(CLOCK_MONOTONIC, &tstart);
+        average /= test_times;
+
         for (i = 0; i < test_times; i++)
         {
-            hos_write(fd, &buff[tmp], conf->append_size, thread_info->thread_num);
+            variance += pow((record[i] - average), 2);
         }
-        clock_gettime(CLOCK_MONOTONIC, &ttmp);
-        time_tmp = calc_time(tstart, ttmp);
-        time_tmp /= test_times;
-        time += time_tmp;
+        variance /= test_times;
 
         sprintf(file_size, "%dk", buff_len / 1024);
-        sprintf(append_size, "%luk", conf->append_size / 1024);
+        sprintf(append_size, "%gk", conf->append_size / 1024);
         len = strlen(performance_info);
-        sprintf(&performance_info[len], "%-20lu%-20s%-20s%-20lu%-20lu\n",
-                thread_info->thread_num, file_size, append_size, time_tmp, time);
+        sprintf(&performance_info[len], "%-20lu%-20s%-20s%-20d%-20lf%-20lf\n",
+                thread_info->thread_num, file_size, append_size, 0, average, sqrt(variance));
+    }else{
 
-        j++;
-    }
-#else
-    if (conf->mode & APPEND_MODE)
-    {
-        fd = hos_open_fd(thread_info->handle, conf->bucket, conf->object, callback, NULL, thread_info->thread_num, conf->mode);
-        clock_gettime(CLOCK_MONOTONIC, &tstart);
-        for (i = 0; i < test_times; i++)
+        if (conf->mode & APPEND_MODE)
         {
-            while(1)
+            fd = hos_open_fd(thread_info->handle, conf->bucket, conf->object, callback, NULL, thread_info->thread_num, conf->mode);
+#if 1
+            for (i = 0; i < test_times; i++)
             {
-                tmp = j * conf->append_size;
-                rest = buff_len - tmp;
-                if (rest < conf->append_size)
+                clock_gettime(CLOCK_MONOTONIC, &tstart);
+#endif
+                j = 0;
+                while(1)
                 {
-                    hos_write(fd, &buff[tmp], rest, thread_info->thread_num);
-                    break;
+                    tmp = j * conf->append_size;
+                    rest = buff_len - tmp;
+                    if (rest < conf->append_size)
+                    {
+                        hos_write(fd, &buff[tmp], rest, thread_info->thread_num);
+                        break;
+                    }
+                    hos_write(fd, &buff[tmp], conf->append_size, thread_info->thread_num);
+                    j++;
                 }
-                hos_write(fd, &buff[tmp], conf->append_size, thread_info->thread_num);
-                j++;
+#if 1
+                clock_gettime(CLOCK_MONOTONIC, &ttmp);
+                record[i] = calc_time(tstart, ttmp);
+                average += record[i];
             }
-        }
-        clock_gettime(CLOCK_MONOTONIC, &ttmp);
-        time = calc_time(tstart, ttmp);
-        time /= test_times;
+            average /= test_times;
+#endif
 
-        sprintf(file_size, "%dk", buff_len / 1024);
-        sprintf(append_size, "%luk", conf->append_size / 1024);
-        len = strlen(performance_info);
-        sprintf(&performance_info[len], "%-20lu%-20s%-20s%-20d%-20lu\n",
-                thread_info->thread_num, file_size, append_size, 0, time);
-    }else
-    {
-        clock_gettime(CLOCK_MONOTONIC, &tstart);
-        for (i = 0; i < test_times; i++)
+            for (i = 0; i < test_times; i++)
+            {
+                variance += pow((record[i] - average), 2);
+            }
+            variance /= test_times;
+
+            sprintf(file_size, "%dk", buff_len / 1024);
+            sprintf(append_size, "%gk", conf->append_size / 1024);
+            len = strlen(performance_info);
+            sprintf(&performance_info[len], "%-20lu%-20s%-20s%-20d%-20lf%-20lf\n",
+                    thread_info->thread_num, file_size, append_size, 0, average,sqrt(variance));
+        }else
         {
-            fd = hos_open_fd(thread_info->handle, conf->bucket, conf->object, callback, NULL, thread_info->thread_num, conf->mode);
-            ret = hos_write(fd, buff, buff_len, thread_info->thread_num);
-            if (ret == HOS_CLIENT_OK)
+            for (i = 0; i < test_times; i++)
             {
-                success_cnt++;
-            }else
+                clock_gettime(CLOCK_MONOTONIC, &tstart);
+                fd = hos_open_fd(thread_info->handle, conf->bucket, conf->object, callback, NULL, thread_info->thread_num, conf->mode);
+                ret = hos_write(fd, buff, buff_len, thread_info->thread_num);
+                if (ret == HOS_CLIENT_OK)
+                {
+                    success_cnt++;
+                }else
+                {
+                    printf("error code:%d, thread_id:%d\n", ret, thread_info->thread_num);
+                    //break;
+                }
+                clock_gettime(CLOCK_MONOTONIC, &ttmp);
+                record[i] = calc_time(tstart, ttmp);
+                average += record[i];
+            }
+            if (success_cnt)
+                average /= success_cnt;
+            else
+                average /= test_times;
+
+            for (i = 0; i < test_times; i++)
             {
-                printf("error code:%d\n", ret);
+                variance += pow((record[i] - average), 2);
             }
-        }
-        clock_gettime(CLOCK_MONOTONIC, &ttmp);
-        time = calc_time(tstart, ttmp);
-        if (success_cnt)
-            time /= success_cnt;
-        else
-            time /= test_times;
+            variance /= test_times;
 
-        sprintf(file_size, "%dk", buff_len / 1024);
-        sprintf(append_size, "%luk", conf->append_size / 1024);
-        len = strlen(performance_info);
-        sprintf(&performance_info[len], "%-20lu%-20s%-20d%-20d%-20lu\n",
-                thread_info->thread_num, file_size, 0, 0, time);
+            sprintf(file_size, "%dk", buff_len / 1024);
+            sprintf(append_size, "%luk", conf->append_size / 1024);
+            len = strlen(performance_info);
+            sprintf(&performance_info[len], "%-20lu%-20s%-20d%-20d%-20lf%-20lf\n",
+                    thread_info->thread_num, file_size, 0, 0, average, sqrt(variance));
+        }
     }
 
-#endif
     hos_close_fd(fd, thread_info->thread_num);
 
     return 0;
@@ -415,12 +456,12 @@ int main(int argc, char *argv[])
 #endif
     configuration_init(&conf);
     //读取命令行配置
-    while((ch = getopt(argc, argv, "a:e:b:o:f:p:t:k:BFAh")) != -1)
+    while((ch = getopt(argc, argv, "a:e:b:o:f:p:t:k:s:S:BFAh")) != -1)
     {
         switch(ch)
         {
             case 'a':
-                conf.append_size = 1024 * atoi(optarg);
+                conf.append_size = 1024 * atof(optarg);
                 break;
             case 'e':
                 //endpoint
@@ -461,6 +502,12 @@ int main(int argc, char *argv[])
             case 'k':
                 conf.append_size = 1024 * atoi(optarg);
                 break;
+            case 's':
+                conf.size = atoi(optarg);
+                break;
+            case 'S':
+                conf.slice = atoi(optarg);
+                break;
             case 'h':
             default:
                 printf("usage: HosClientPerformance \n[-e set endpoint] \n[-b set bucket] \n"
@@ -492,8 +539,8 @@ int main(int argc, char *argv[])
         return -1;
     }
 
-    set_thread_sum(handle, conf.thread_sum);
-    set_cache_size(handle, conf.append_size);
+    hos_set_thread_sum(handle, conf.thread_sum);
+    hos_set_cache_size(handle, conf.append_size);
 
     //创建bucket
     if (hos_create_bucket(handle, conf.bucket))
@@ -529,7 +576,7 @@ int main(int argc, char *argv[])
         }
 
         CPU_ZERO(&mask);
-        CPU_SET(thread_num + 8, &mask);
+        CPU_SET(thread_num, &mask);
         if (pthread_setaffinity_np(thread[thread_num], sizeof(mask), &mask) != 0)
         {
             printf("warning:could not set CPU affinity, continuing...\n");
diff --git a/example/performance/file/c.sh b/example/performance/file/c.sh
index 974d0741..b98adf7d 100755
--- a/example/performance/file/c.sh
+++ b/example/performance/file/c.sh
@@ -4,7 +4,7 @@
 # Created Time: Tue 13 Oct 2020 06:28:57 PM CST
 #########################################################################
 #!/bin/bash
-size=("1k" "10k" "100k" "1M" "2M" "3M" "4M" "5M" "10M" "20M" "30M")
+size=("100" "200" "300" "400" "500" "600" "700" "800" "900" "1k" "1500" "10k" "100k" "1M" "2M" "3M" "4M" "5M" "10M" "20M" "30M")
 
 num=0
 
diff --git a/example/performance/test.sh b/example/performance/test.sh
index 1c18bc39..19a04113 100755
--- a/example/performance/test.sh
+++ b/example/performance/test.sh
@@ -4,14 +4,22 @@
 # Created Time: Tue 13 Oct 2020 02:28:31 PM CST
 #########################################################################
 #!/bin/bash
-size=(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 200, 300, 400, 500)
+#size=(0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 30 40 50 60 70 80 90 100 110 120 130 140 150 200 300 400 500)
+#size=(100 200 300 400 500 600 700 800 900 1k 1500 10k 100k 1M 2M 3M 4M 5M 10M 20M)
+size=(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32)
 
 num=0
 
 while((${num} < 37))
 do
     #./HosClientPerformance -a ${size[$num]}
-    echo "./HosClientPerformance -a ${size[$num]} -A -f ./file/1M.data"
-    ./HosClientPerformance -a ${size[$num]} -A -f ./file/1M.data
+    #echo "./HosClientPerformance -a ${size[$num]} -A -f ./file/100k.data"
+    #./HosClientPerformance -a ${size[$num]} -A -f ./file/100k.data
+    #echo ./HosClientPerformance -f ./file/${size[$num]}.data -F
+    #./HosClientPerformance -f ./file/${size[$num]}.data -F
+    #echo ./HosClientPerformance -a 100 -A -f ./file/100k.data -t ${size[$num]} -S 1024
+    #./HosClientPerformance -a 100 -A -f ./file/100k.data -t ${size[$num]} -S 1024
+    echo ./HosClientPerformance -a 100 -A -f ./file/100k.data -S ${size[$num]} -t 32
+    ./HosClientPerformance -a 100 -A -f ./file/100k.data -S ${size[$num]} -t 32
     let "num++"
 done