Commit: 3b1c48b44029ec44728339f26399cd591bc65898 - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Révision: 3b1c48b44029ec44728339f26399cd591bc65898 (tree)
• l'heure: 2022-07-23 14:43:40
• Auteur: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Message de Log

Improve Put messages from asynchronus to synchronus for ErrInfo Window.

Change Summary

• modified: src/errinfo.c
• modified: src/test_errinfo.c
• modified: src/tuierrinfo.c

Modification

--- a/src/errinfo.c
+++ b/src/errinfo.c
@@ -95,10 +95,10 @@ int
 	int		i_remain;
 	ErrInfo	*p_now;
 
-	if( 0 >= gi_get_remain )	{ return 0; }
+	if( 0 >= gi_get_remain )	{ return -0x01; }
 
 	if( NULL == p_errinfo )
-		{ return -0x01; }
+		{ return -0x02; }
 
 	pthread_mutex_lock( &gt_errmtx );
 
@@ -189,10 +189,12 @@ int
 			break;
 	}
 
+	/*
 	if( ERRINFO_FLAG_TUIWIN & gb_flag )	{
 		if( gb_errlevel >= b_level )
 			{ TuiErrInfo_PrintErrInfo( p_err ); }
 	}
+	*/
 
 	if( ERRINFO_FLAG_SYSLOG & gb_flag )	{
 		if( NULL != pstr_param )	{

--- a/src/test_errinfo.c
+++ b/src/test_errinfo.c
@@ -253,6 +253,10 @@ void
 		CU_ASSERT_STRING_EQUAL( str_msg, t_err.str_param );
 	}
 
+	// Test Phase 5 ---
+	i_err	= ErrInfo_GetMessage( &t_err );
+	CU_ASSERT( i_err == -0x01 );
+
 	i_err	= ErrInfo_Term();
 	CU_ASSERT( 0x00 == i_err );
 

--- a/src/tuierrinfo.c
+++ b/src/tuierrinfo.c
@@ -76,9 +76,37 @@ int
 	TuiErrInfo_Update(
 		void )
 {
+	int		i_errs	= 0;
+	int		i_remains;
+	ErrInfo	t_err;
+	struct	tm	t_tm;
 
 	touchwin( gp_errinfo_win );
 	touchwin( gp_errinfo_subwin );
+
+	while((256 > i_errs++) && ( 0 <= ErrInfo_GetMessage( &t_err )))	{
+		localtime_r( &(t_err.t_errtime), &t_tm );
+
+		if( '\0' != t_err.str_param[0] )    {
+			wprintw( gp_errinfo_subwin,
+				" %04d/%02d/%02d %02d:%02d:%02d %s: %s errno=%2d <H:%2d,G:%2d,Rq:%2d> (%d : %s) [%s:%3d]\n",
+				(t_tm.tm_year + 1900), t_tm.tm_mon, t_tm.tm_mday, t_tm.tm_hour, t_tm.tm_min, t_tm.tm_sec,
+				t_err.str_level, t_err.str_errormsg, t_err.i_errno,
+				t_err.i_hvisor, t_err.i_guest, t_err.i_request,
+				t_err.i_param, t_err.str_param,
+				t_err.str_srcfile, t_err.i_srcline);
+		}
+		else    {
+			wprintw( gp_errinfo_subwin,
+				" %04d/%02d/%02d %02d:%02d:%02d %s: %s errno=%2d <H:%2d,G:%2d,Rq:%2d> (%d) [%s:%3d]\n",
+				(t_tm.tm_year + 1900), t_tm.tm_mon, t_tm.tm_mday, t_tm.tm_hour, t_tm.tm_min, t_tm.tm_sec,
+				t_err.str_level, t_err.str_errormsg, t_err.i_errno,
+				t_err.i_hvisor, t_err.i_guest, t_err.i_request,
+				t_err.i_param,
+				t_err.str_srcfile, t_err.i_srcline);
+		}
+	}
+
 	wnoutrefresh( gp_errinfo_win );
 
 	return 0x00;