支持-d读包模式不退出进程, 便于插件测试;

解决重复调用getopt()时, optind没有重置为1的BUG;
解决-d -p timestamp模式, 初始时间差值没有初始化的BUG;

1 files changed, 9 insertions, 3 deletions

diff --git a/src/inner_plug/sapp_assistant.cpp b/src/inner_plug/sapp_assistant.cpp
index 373bf5c..7519d44 100644
--- a/src/inner_plug/sapp_assistant.cpp
+++ b/src/inner_plug/sapp_assistant.cpp
@@ -1041,9 +1041,9 @@ int sapp_independent_thread_init(void)
 
 int sapp_assistant_init(void)
 {
-	sapp_fs2_init();
+	int ret = sapp_fs2_init();
 	
-	return 0;
+	return ret;
 }
 
 
@@ -1093,6 +1093,10 @@ static int fs2_plug_entry_historgram_init(void *fs2_handle)
 								  1,                  //��׷�ٵ���Сֵ
 								  1000000,            //��׷�ٵ����ֵ
 								  2);                 //���ȣ���С�����λ����Χ1~4
+		if(pfs_para->fs_latency_plug_entrg_id_array[i] < 0){
+			sapp_runtime_log(RLOG_LV_FATAL, "FS_register_histogram() error, plug name:%s", g_plug_global_entry[i].plug_entry_name);
+			return -1;
+		}
 	}
 
 	return 0;
@@ -1290,7 +1294,9 @@ static int sapp_fs2_init(void)
             }
 		}
 
-		fs2_plug_entry_historgram_init(fs2_handle);
+		if(fs2_plug_entry_historgram_init(fs2_handle) < 0){
+			return -1;
+		}
 	}
 	FS_start(fs2_handle);