HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r134:25c2cda0d9a4

cpu_load added to the housekeeping packets

paul -

r134:25c2cda0d9a4 VHDLib206

parent child

Context file:

r134:25c2cda0d9a4

Collapse all files

header/lfr_cpu_usage_report.h created 644 +6 0

@@ -0,0 +1,6
	1	#ifndef LFR_CPU_USAGE_REPORT_H
	2	#define LFR_CPU_USAGE_REPORT_H
	3
	4	unsigned char lfr_rtems_cpu_usage_report( void );
	5
	6	#endif // LFR_CPU_USAGE_REPORT_H

FSW-qt/Makefile +9 -4

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.6) on: Thu May 15 08:30:40 2014
+            # Generated by qmake (2.01a) (Qt 4.8.6) on: Fri May 16 07:58:47 2014
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             CC            = sparc-rtems-gcc
             CXX           = sparc-rtems-g++
-            DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=7 -DPRINT_MESSAGES_ON_CONSOLE -DPRINT_TASK_STATISTICS
+            DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=7 -DPRINT_MESSAGES_ON_CONSOLE
             CFLAGS        = -pipe -O3 -Wall $(DEFINES)
             CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/basic_parameters
             		../src/processing/fsw_processing.c \
             		../src/processing/avf0_prc0.c \
             		../src/processing/avf1_prc1.c \
-            		../src/processing/avf2_prc2.c
+            		../src/processing/avf2_prc2.c \
+            		../src/lfr_cpu_usage_report.c
             OBJECTS       = obj/wf_handler.o \
             		obj/tc_handler.o \
             		obj/fsw_misc.o \
             		obj/fsw_processing.o \
             		obj/avf0_prc0.o \
             		obj/avf1_prc1.o \
-            		obj/avf2_prc2.o
+            		obj/avf2_prc2.o \
+            		obj/lfr_cpu_usage_report.o
             DIST          = /usr/lib64/qt4/mkspecs/common/unix.conf \
             		/usr/lib64/qt4/mkspecs/common/linux.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base.conf \
             obj/avf2_prc2.o: ../src/processing/avf2_prc2.c
             	$(CC) -c $(CFLAGS) $(INCPATH) -o obj/avf2_prc2.o ../src/processing/avf2_prc2.c
+            obj/lfr_cpu_usage_report.o: ../src/lfr_cpu_usage_report.c
+            	$(CC) -c $(CFLAGS) $(INCPATH) -o obj/lfr_cpu_usage_report.o ../src/lfr_cpu_usage_report.c
             ####### Install
             install:   FORCE

FSW-qt/fsw-qt.pro +5 -3

             TEMPLATE = app
             # CONFIG += console v8 sim
             # CONFIG options = verbose *** boot_messages *** debug_messages *** cpu_usage_report *** stack_report *** vhdl_dev *** debug_tch
-            CONFIG += console verbose cpu_usage_report
+            CONFIG += console verbose
             CONFIG -= qt
             include(./sparc.pri)
                 ../src/processing/fsw_processing.c \
                 ../src/processing/avf0_prc0.c \
                 ../src/processing/avf1_prc1.c \
-                ../src/processing/avf2_prc2.c
+                ../src/processing/avf2_prc2.c \
+                ../src/lfr_cpu_usage_report.c
             HEADERS += \
                 ../header/wf_handler.h \
                 ../header/processing/avf0_prc0.h \
                 ../header/processing/avf1_prc1.h \
                 ../header/processing/avf2_prc2.h \
-                ../header/fsw_params_wf_handler.h
+                ../header/fsw_params_wf_handler.h \
+                ../header/lfr_cpu_usage_report.h

FSW-qt/fsw-qt.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.1, 2014-05-15T06:56:44. -->
+            <!-- Written by QtCreator 3.0.1, 2014-05-16T15:09:51. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/ccsds_types.h +3 -3

                 unsigned char sid;
                 unsigned char biaStatusInfo;
                 unsigned char acquisitionTime[6];
-                unsigned char source_data_spare[2];
+                unsigned char source_data_spare;
                 unsigned char pa_lfr_bp_blk_nr[2];
             } Header_TM_LFR_SCIENCE_BP_with_spare_t;
                 unsigned char lfr_fpga_version[3];
                 // ressource statistics
                 unsigned char hk_lfr_cpu_load;
-                unsigned char hk_lfr_load_max;
+                unsigned char hk_lfr_cpu_load_max;
-                unsigned char hk_lfr_load_aver;
+                unsigned char hk_lfr_cpu_load_aver;
                 // tc statistics
                 unsigned char hk_lfr_update_info_tc_cnt[2];
                 unsigned char hk_lfr_update_time_tc_cnt[2];

header/fsw_misc.h +4 -1

             #include "fsw_params.h"
             #include "fsw_spacewire.h"
+            #include "lfr_cpu_usage_report.h"
             rtems_name name_hk_rate_monotonic;     // name of the HK rate monotonic
             rtems_id HK_id;         // id of the HK rate monotonic period
             void getTime( unsigned char *time);
             unsigned long long int getTimeAsUnsignedLongLongInt( );
             void send_dumb_hk( void );
-            void get_v_e1_e2_f3 (unsigned char *v, unsigned char *e1, unsigned char *e2);
+            void get_v_e1_e2_f3 (unsigned char *spacecraft_potential);
+            void get_cpu_load( unsigned char *resource_statistics );
             extern int sched_yield( void );
+            extern int rtems_cpu_usage_reset();
             extern ring_node *current_ring_node_f3;
             extern ring_node *ring_node_to_send_cwf_f3;

header/tc_handler.h +2 0

             #include "wf_handler.h"
             #include "fsw_processing.h"
+            #include "lfr_cpu_usage_report.h"
             // MODE PARAMETERS
             extern unsigned int maxCount;

src/fsw_init.c +2 0

                 reset_local_time();
+                rtems_cpu_usage_reset();
                 rtems_status_code status;
                 rtems_status_code status_spw;
                 rtems_isr_entry  old_isr_handler;

src/fsw_misc.c +39 -17

@@ -221,8 +221,8 rtems_task hous_task(rtems_task_argument
221		221
222	spacewire_update_statistics();	222	spacewire_update_statistics();
223		223
224	get_v_e1_e2_f3(	224	get_v_e1_e2_f3( housekeeping_packet.hk_lfr_sc_v_f3 );
225	housekeeping_packet.hk_lfr_sc_v_f3, housekeeping_packet.hk_lfr_sc_e1_f3, housekeeping_packet.hk_lfr_sc_e2_f3 );	225	get_cpu_load( (unsigned char *) &housekeeping_packet.hk_lfr_cpu_load );
226		226
227	// SEND PACKET	227	// SEND PACKET
228	status = rtems_message_queue_urgent( queue_id, &housekeeping_packet,	228	status = rtems_message_queue_urgent( queue_id, &housekeeping_packet,
@@ -436,7 +436,7 void send_dumb_hk( void )
436	PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);	436	PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
437	}	437	}
438		438
439	void get_v_e1_e2_f3( unsigned char v, ~~unsigned~~ ~~char~~ e1, ~~unsigned~~ ~~char~~ *e2 )	439	void get_v_e1_e2_f3( unsigned char *spacecraft_potential )
440	{	440	{
441	unsigned int coarseTime;	441	unsigned int coarseTime;
442	unsigned int acquisitionTime;	442	unsigned int acquisitionTime;
@@ -449,12 +449,12 void get_v_e1_e2_f3( unsigned char *v, u
449		449
450	if (lfrCurrentMode == LFR_MODE_STANDBY)	450	if (lfrCurrentMode == LFR_MODE_STANDBY)
451	{	451	{
452	v[0] = 0x00;	452	spacecraft_potential[0] = 0x00;
453	v[1] = 0x00;	453	spacecraft_potential[1] = 0x00;
454	e1[0] = 0x00;	454	spacecraft_potential[2] = 0x00;
455	e1[1] = 0x00;	455	spacecraft_potential[3] = 0x00;
456	e2[0] = 0x00;	456	spacecraft_potential[4] = 0x00;
457	e2[1] = 0x00;	457	spacecraft_potential[5] = 0x00;
458	}	458	}
459	else	459	else
460	{	460	{
@@ -486,16 +486,38 void get_v_e1_e2_f3( unsigned char *v, u
486	offset_in_samples = NB_SAMPLES_PER_SNAPSHOT -1;	486	offset_in_samples = NB_SAMPLES_PER_SNAPSHOT -1;
487	}	487	}
488	offset_in_bytes = TIME_OFFSET_IN_BYTES + offset_in_samples * NB_WORDS_SWF_BLK * 4;	488	offset_in_bytes = TIME_OFFSET_IN_BYTES + offset_in_samples * NB_WORDS_SWF_BLK * 4;
489	v[0] = bufferPtr[ offset_in_bytes + 0];	489	spacecraft_potential[0] = bufferPtr[ offset_in_bytes + 0];
490	v[1] = bufferPtr[ offset_in_bytes + 1];	490	spacecraft_potential[1] = bufferPtr[ offset_in_bytes + 1];
491	e1[0] = bufferPtr[ offset_in_bytes + 2];	491	spacecraft_potential[2] = bufferPtr[ offset_in_bytes + 2];
492	e1[1] = bufferPtr[ offset_in_bytes + 3];	492	spacecraft_potential[3] = bufferPtr[ offset_in_bytes + 3];
493	e2[0] = bufferPtr[ offset_in_bytes + 4];	493	spacecraft_potential[4] = bufferPtr[ offset_in_bytes + 4];
494	e2[1] = bufferPtr[ offset_in_bytes + 5];	494	spacecraft_potential[5] = bufferPtr[ offset_in_bytes + 5];
495	}	495	}
496	}	496	}
497		497
		498	void get_cpu_load( unsigned char *resource_statistics )
		499	{
		500	unsigned char cpu_load;
		501
		502	cpu_load = lfr_rtems_cpu_usage_report();
		503
		504	// HK_LFR_CPU_LOAD
		505	resource_statistics[0] = cpu_load;
		506
		507	// HK_LFR_CPU_LOAD_MAX
		508	if (cpu_load > resource_statistics[1])
		509	{
		510	resource_statistics[1] = cpu_load;
		511	}
		512
		513	// CPU_LOAD_AVE
		514	resource_statistics[2] = 0;
		515
		516	#ifndef PRINT_TASK_STATISTICS
		517	rtems_cpu_usage_reset();
		518	#endif
		519
		520	}
		521
498		522
499		523
500
501

src/processing/avf0_prc0.c +4 -4

             //            BP1_set( compressed_sm_norm_f0, NB_BINS_COMPRESSED_SM_SBM_F0, bp1_sbm_f0 );
                         // 3) send the BP1 set
                         set_time( packet_sbm_bp1_f0.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                        set_time( packet_sbm_bp1_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                        set_time( packet_sbm_bp1_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                         BP_send( (char *) &packet_sbm_bp1_f0, queue_id,
                                   PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F0 + PACKET_LENGTH_DELTA,
                                  SID_SBM1_BP1_F0);
                             // 2) send the BP2 set
                             set_time( packet_sbm_bp2_f0.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                            set_time( packet_sbm_bp2_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                            set_time( packet_sbm_bp2_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                             BP_send( (char *) &packet_sbm_bp2_f0, queue_id,
                                       PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F0 + PACKET_LENGTH_DELTA,
                                      SID_SBM1_BP2_F0);
             //            BP1_set( compressed_sm_norm_f0, NB_BINS_COMPRESSED_SM_F0, bp1_norm_f0 );
                         // 3) send the BP1 set
                         set_time( packet_norm_bp1_f0.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                        set_time( packet_norm_bp1_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                        set_time( packet_norm_bp1_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                         BP_send( (char *) &packet_norm_bp1_f0, queue_id,
                                   PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F0 + PACKET_LENGTH_DELTA,
                                  SID_NORM_BP1_F0 );
                             // 2) send the BP2 set
                             set_time( packet_norm_bp2_f0.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                            set_time( packet_norm_bp2_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                            set_time( packet_norm_bp2_f0.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                             BP_send( (char *) &packet_norm_bp2_f0, queue_id,
                                       PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F0 + PACKET_LENGTH_DELTA,
                                      SID_NORM_BP2_F0);

src/processing/avf1_prc1.c +3 -3

                         // 3) send the BP1 set
                         set_time( packet_sbm_bp1.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                        set_time( packet_sbm_bp1.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                        set_time( packet_sbm_bp1.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                         BP_send( (char *) &packet_sbm_bp1, queue_id_send,
                                  PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP1_F1 + PACKET_LENGTH_DELTA,
                                  SID_SBM2_BP1_F1 );
                             // 2) send the BP2 set
                             set_time( packet_sbm_bp2.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                            set_time( packet_sbm_bp2.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                            set_time( packet_sbm_bp2.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                             BP_send( (char *) &packet_sbm_bp2, queue_id_send,
                                      PACKET_LENGTH_TM_LFR_SCIENCE_SBM_BP2_F1 + PACKET_LENGTH_DELTA,
                                      SID_SBM2_BP2_F1 );
                             // 2) send the BP2 set
                             set_time( packet_norm_bp2.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                            set_time( packet_norm_bp2.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                            set_time( packet_norm_bp2.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                             BP_send( (char *) &packet_norm_bp2, queue_id_send,
                                      PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F1 + PACKET_LENGTH_DELTA,
                                      SID_NORM_BP2_F1 );

src/processing/avf2_prc2.c +2 -2

                         // 3) send the BP1 set
                         set_time( packet_norm_bp1_f2.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                        set_time( packet_norm_bp1_f2.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                        set_time( packet_norm_bp1_f2.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                         BP_send( (char *) &packet_norm_bp1_f2, queue_id,
                                  PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP1_F2 + PACKET_LENGTH_DELTA,
                                  SID_NORM_BP1_F2 );
                             // 2) send the BP2 set
                             set_time( packet_norm_bp2_f2.header.time,            (unsigned char *) &incomingMsg->coarseTime );
-                            set_time( packet_norm_bp2_f2.header.acquisitionTime, (unsigned char *) &incomingMsg->fineTime   );
+                            set_time( packet_norm_bp2_f2.header.acquisitionTime, (unsigned char *) &incomingMsg->coarseTime );
                             BP_send( (char *) &packet_norm_bp2_f2, queue_id,
                                      PACKET_LENGTH_TM_LFR_SCIENCE_NORM_BP2_F2 + PACKET_LENGTH_DELTA,
                                      SID_NORM_BP2_F2 );

src/processing/fsw_processing.c +7 -6

                     header->time[4] = (unsigned char) (time_management_regs->fine_time>>8);
                     header->time[5] = (unsigned char) (time_management_regs->fine_time);
                     //
-                    header->acquisitionTime[0] = (unsigned char) (time_management_regs->coarse_time>>24);
+                    header->acquisitionTime[0] = header->time[0];
-                    header->acquisitionTime[1] = (unsigned char) (time_management_regs->coarse_time>>16);
+                    header->acquisitionTime[1] = header->time[1];
-                    header->acquisitionTime[2] = (unsigned char) (time_management_regs->coarse_time>>8);
+                    header->acquisitionTime[2] = header->time[2];
-                    header->acquisitionTime[3] = (unsigned char) (time_management_regs->coarse_time);
+                    header->acquisitionTime[3] = header->time[3];
-                    header->acquisitionTime[4] = (unsigned char) (time_management_regs->fine_time>>8);
+                    header->acquisitionTime[4] = header->time[4];
-                    header->acquisitionTime[5] = (unsigned char) (time_management_regs->fine_time);
+                    header->acquisitionTime[5] = header->time[5];
                     // (4) SEND PACKET
                     status =  rtems_message_queue_send( queue_id, spw_ioctl_send, ACTION_MSG_SPW_IOCTL_SEND_SIZE);
                 header->time[0] = 0x00;
                 header->time[0] = 0x00;
                 header->time[0] = 0x00;
+                header->source_data_spare = 0x00;
                 header->pa_lfr_bp_blk_nr[0] = 0x00;  // BLK_NR MSB
                 header->pa_lfr_bp_blk_nr[1] = blkNr;  // BLK_NR LSB
             }

src/tc_handler.c +1 -1

             #endif
                     status = restart_science_tasks( mode );
                     launch_waveform_picker( mode, transitionCoarseTime );
-            //        launch_spectral_matrix( );
+                    launch_spectral_matrix( );
                     launch_spectral_matrix_simu( );
                 }
                 else if ( mode == LFR_MODE_STANDBY )

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