Z991239-5462 #comment fea: remove wlogs

Framework/spbase/sp_bcm.c

@@ -391,11 +391,43 @@ static void daemon_on_sys(sp_svc_t *svc,int epid, int state, void *user_data)
 	}
 }
 
+int sp_bcm_deamon_refresh(sp_bcm_daemon_t* daemon)
+{
+	int nelts = sp_mod_mgr_get_entity_array_nelts(sp_get_env()->mod_mgr);
+	int i;
+	DbgWithLinkForC(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM, "entity array nelts:%d", nelts);
+	/*
+	daemon_lock(daemon);
+	int oldNelts = daemon->arr_dst_list->nelts;
+	//array_reserve(daemon->arr_dst_list, nelts);
+	//array_reserve(daemon->arr_src_list, nelts);
+	//array_header_t* old_dst = daemon->arr_dst_list;
+	//array_header_t* old_src = daemon->arr_src_list;
+	//daemon->arr_dst_list = array_make(nelts, sizeof(struct list_head));
+	//daemon->arr_src_list = array_make(nelts, sizeof(struct list_head));
+	/*
+	for (i = 0; i < oldNelts; ++i)
+	{
+		ARRAY_IDX(daemon->arr_dst_list, i, struct list_head*) = ARRAY_IDX(old_dst, i, struct list_head*);
+		ARRAY_IDX(daemon->arr_src_list, i, struct list_head*) = ARRAY_IDX(old_src, i, struct list_head*);
+	}
+	
+	for (i = 0; i < nelts - oldNelts; ++i) {
+		INIT_LIST_HEAD((struct list_head*)array_push(daemon->arr_src_list));
+		INIT_LIST_HEAD((struct list_head*)array_push(daemon->arr_dst_list));
+	}
+
+	
+
+	daemon_unlock(daemon);
+	*/
+}
+
 int sp_bcm_daemon_create(sp_svc_t *svc, sp_bcm_daemon_t **p_daemon)
 {
 	sp_bcm_daemon_t *daemon = ZALLOC_T(sp_bcm_daemon_t);
 	int i;
-	int nelts = sp_mod_mgr_get_entity_array_nelts(sp_get_env()->mod_mgr);
+	int nelts = 100;// sp_mod_mgr_get_entity_array_nelts(sp_get_env()->mod_mgr);
 
 	DbgWithLinkForC(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM, "entity array nelts:%d", nelts);
 

Framework/sphost/sphost.c

@@ -349,7 +349,7 @@ int main(int argc, char *argv[])
 			curModInfo->group = 0;
 			g_saveFile = atoi((dstParam[5]));
 			setCurEntityIdx(atoi(dstParam[6]));
-			WLog_initRVC(dstParam[1]);
+			//WLog_initRVC(dstParam[1]);
 			createLogProducer(dstParam[1], dstParam[2]);
 			if (testDua1 > 100 || testDual2 > 100 || testDual3 > 100 || testDual4 > 100)
 				DbgWithLink_sphost("sphost initTest in %d-%d-%d-%d", testDua1, testDual2, testDual3, testDual4);

Framework/spshell/spshell.cpp

@@ -943,7 +943,7 @@ int main(int argc, char** argv)
 		WLog_initRVC("SpShell");
 	}
 #else
-	WLog_initRVC("SpShell");
+	//WLog_initRVC("SpShell");
     _CrtSetDebugFillThreshold(0);
 #endif //RVC_OS_LINUX
 

Framework/winpr/include/winpr/wlog.h

@@ -185,7 +185,7 @@ extern "C"
 #if defined(_MSC_VER)
 #pragma warning(disable:4996)
 #pragma warning(disable:4474)
-
+	/*
 #define WLog_LVL(tag, lvl, ...) 
 #define WLog_VRB(tag, ...) WLog_WriteLogFile(WLOG_TRACE, __VA_ARGS__)
 #define WLog_DBG(tag, ...) WLog_WriteLogFile(WLOG_DEBUG,__VA_ARGS__)
@@ -193,6 +193,15 @@ extern "C"
 #define WLog_WARN(tag, ...) WLog_WriteLogFile(WLOG_WARN,__VA_ARGS__)
 #define WLog_ERR(tag, ...) WLog_WriteLogFile(WLOG_ERROR, __VA_ARGS__)
 #define WLog_FATAL(tag, ...) WLog_WriteLogFile(WLOG_FATAL,__VA_ARGS__)
+*/
+
+#define WLog_LVL(tag, lvl, ...) 
+#define WLog_VRB(tag, ...)
+#define WLog_DBG(tag, ...)
+#define WLog_INFO(tag, ...)
+#define WLog_WARN(tag, ...)
+#define WLog_ERR(tag, ...)
+#define WLog_FATAL(tag, ...)
 #else
 #define WLog_LVL(tag, lvl, ...) WLog_Print_tag(tag, lvl, __VA_ARGS__)
 #define WLog_VRB(tag, ...) WLog_Print_tag(tag, WLOG_TRACE, __VA_ARGS__)

Module/mod_vtmloader/mod_vtmloader.cpp

@@ -34,6 +34,7 @@ void VtmLoaderServerSession::Handle_DealWithOldEvent(SpReqAnsContext<VtmLoaderSe
 void CVtmLoaderEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext) 
 {
 	m_FSM.Init(this);
+	CloseHandle(CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)&thread_testEvent, this, 0, NULL));
 	pTransactionContext->SendAnswer(Error_Succeed) ;		
 }
 

Module/mod_vtmloader/mod_vtmloader.h

@@ -21,6 +21,19 @@ private:
 	CVtmLoaderEntity* m_pEntity;
 };
 
+DWORD thread_testEvent(LPVOID param)
+{
+	while (true)
+	{
+		//LogEvent(SeverityLevelEnum::Severity_Middle, 0x10f00101, "for test event");
+		//LogWarn(SeverityLevelEnum::Severity_Middle, ErrorCodeEnum::Error_BlockTimeOut, 0x10f00102, "for test Warn");
+		LogError(SeverityLevelEnum::Severity_Middle, ErrorCodeEnum::Error_BlockTimeOut, 0x10f00103, "for test Error");
+		Sleep(500);
+	}
+		
+	return 0;
+}
+
 class CVtmLoaderEntity : public CEntityBase, public ILogListener, public IEntityStateListener
 {
 public:

addin/res/ManagerDesktop/startPage.html

@@ -141,7 +141,7 @@
 		OpenLogSender()
 		function OpenLogSender(){
 			let req = new Request()
-			req.LogType = 'Event';
+            req.LogType = 'Error';
 			req.reserved2 = 0;
 			req.reserved3 = '';
 			GUIConsoleService.OpenLogSender(req,function(ret){