HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r381:a9b894b0ab6a

Fixed again CPU usage measurement...

jeandet -

parent child

Context file:

r381:a9b894b0ab6a

header/lfr_cpu_usage_report.h +2 0

             unsigned char lfr_rtems_cpu_usage_report( void );
+            #define CONST_10        10
             #define CONST_100       100
+            #define CONST_255       255
             #define CONST_1000      1000
             #define CONST_100000    100000

src/CMakeLists.txt +1 -1

             set(SW_VERSION_N1 "3" CACHE STRING  "Choose N1 FSW Version." FORCE)
             set(SW_VERSION_N2 "2" CACHE STRING  "Choose N2 FSW Version." FORCE)
             set(SW_VERSION_N3 "0" CACHE STRING  "Choose N3 FSW Version." FORCE)
-            set(SW_VERSION_N4 "18" CACHE STRING  "Choose N4 FSW Version." FORCE)
+            set(SW_VERSION_N4 "19" CACHE STRING  "Choose N4 FSW Version." FORCE)
             if(FSW_verbose)
             	add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)

src/fsw_misc.c +1 -1

                 old_avg_pos %= LOAD_AVG_SIZE;
                 // CPU_LOAD_AVE
                 resource_statistics[BYTE_2] = (unsigned char)(cpu_load_avg / LOAD_AVG_SIZE);
+            // this will change the way LFR compute usage
             #ifndef PRINT_TASK_STATISTICS
                     rtems_cpu_usage_reset();
             #endif

src/lfr_cpu_usage_report.c +4 -29

@@ -28,11 +28,7 unsigned char lfr_rtems_cpu_usage_report
28	Timestamp_Control uptime;	28	Timestamp_Control uptime;
29	Timestamp_Control total;	29	Timestamp_Control total;
30	Timestamp_Control ran;	30	Timestamp_Control ran;
31	Timestamp_Control abs_total;
32	Timestamp_Control abs_ran;
33		31
34	static Timestamp_Control last_total={0,0};
35	static Timestamp_Control last_ran={0,0};
36	#else	32	#else
37	#error "Can't compute CPU usage using ticks on LFR"	33	#error "Can't compute CPU usage using ticks on LFR"
38	#endif	34	#endif
@@ -42,8 +38,6 unsigned char lfr_rtems_cpu_usage_report
42	ival = 0;	38	ival = 0;
43	cpu_load = 0;	39	cpu_load = 0;
44		40
45	_TOD_Get_uptime( &uptime );
46	_Timestamp_Subtract( &CPU_usage_Uptime_at_last_reset, &uptime, &abs_total );
47	for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; api_index++ )	41	for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; api_index++ )
48	{	42	{
49	if ( !_Objects_Information_table[ api_index ] ) { }	43	if ( !_Objects_Information_table[ api_index ] ) { }
@@ -59,30 +53,11 unsigned char lfr_rtems_cpu_usage_report
59	if ( the_thread == NULL) { }	53	if ( the_thread == NULL) { }
60	else if(the_thread->Object.id == Task_id[TASKID_SCRB]) // Only measure scrubbing task load, CPU load is 100%-Scrubbing	54	else if(the_thread->Object.id == Task_id[TASKID_SCRB]) // Only measure scrubbing task load, CPU load is 100%-Scrubbing
61	{	55	{
62	/*	56	_TOD_Get_uptime( &uptime );
63	* If this is the currently executing thread, account for time	57	_Timestamp_Subtract( &CPU_usage_Uptime_at_last_reset, &uptime, &total );
64	* since the last context switch.	58	ran = the_thread->cpu_time_used;
65	*/
66	abs_ran = the_thread->cpu_time_used;
67	if ( _Thread_Executing->Object.id == the_thread->Object.id )
68	{
69	Timestamp_Control used;
70	_Timestamp_Subtract(
71	&_Thread_Time_of_last_context_switch, &uptime, &used
72	);
73	_Timestamp_Add_to( &abs_ran, &used );
74	}
75	/*
76	* Only consider the time since last call
77	*/
78	_Timespec_Subtract(&last_ran, &abs_ran, &ran);
79	_Timespec_Subtract(&last_total, &abs_total, &total);
80
81	last_ran = abs_ran;
82	last_total = abs_total;
83
84	_Timestamp_Divide( &ran, &total, &ival, &fval);	59	_Timestamp_Divide( &ran, &total, &ival, &fval);
85	cpu_load = (unsigned char)(CONST_~~100~~ - ival);	60	cpu_load = (unsigned char)(CONST_255 - ((ivalCONST_10+fval/CONST_100)CONST_256/CONST_1000));
86	}	61	}
87	}	62	}
88	}	63	}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages