diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile --- a/FSW-qt/Makefile +++ b/FSW-qt/Makefile @@ -1,6 +1,6 @@ ############################################################################# # 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 @@ -10,7 +10,7 @@ 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 @@ -56,7 +56,8 @@ SOURCES = ../src/wf_handler.c \ ../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 \ @@ -70,7 +71,8 @@ OBJECTS = obj/wf_handler.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 \ @@ -258,6 +260,9 @@ obj/avf1_prc1.o: ../src/processing/avf1_ 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 diff --git a/FSW-qt/fsw-qt.pro b/FSW-qt/fsw-qt.pro --- a/FSW-qt/fsw-qt.pro +++ b/FSW-qt/fsw-qt.pro @@ -1,7 +1,7 @@ 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) @@ -67,7 +67,8 @@ SOURCES += \ ../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 \ @@ -88,5 +89,6 @@ HEADERS += \ ../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 diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user --- a/FSW-qt/fsw-qt.pro.user +++ b/FSW-qt/fsw-qt.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/header/ccsds_types.h b/header/ccsds_types.h --- a/header/ccsds_types.h +++ b/header/ccsds_types.h @@ -476,7 +476,7 @@ typedef struct { 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; @@ -539,8 +539,8 @@ typedef struct { unsigned char lfr_fpga_version[3]; // ressource statistics unsigned char hk_lfr_cpu_load; - unsigned char hk_lfr_load_max; - unsigned char hk_lfr_load_aver; + unsigned char hk_lfr_cpu_load_max; + 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]; diff --git a/header/fsw_misc.h b/header/fsw_misc.h --- a/header/fsw_misc.h +++ b/header/fsw_misc.h @@ -7,6 +7,7 @@ #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 @@ -36,9 +37,11 @@ void increment_seq_counter( unsigned cha 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; diff --git a/header/lfr_cpu_usage_report.h b/header/lfr_cpu_usage_report.h new file mode 100644 --- /dev/null +++ b/header/lfr_cpu_usage_report.h @@ -0,0 +1,6 @@ +#ifndef LFR_CPU_USAGE_REPORT_H +#define LFR_CPU_USAGE_REPORT_H + +unsigned char lfr_rtems_cpu_usage_report( void ); + +#endif // LFR_CPU_USAGE_REPORT_H diff --git a/header/tc_handler.h b/header/tc_handler.h --- a/header/tc_handler.h +++ b/header/tc_handler.h @@ -10,6 +10,8 @@ #include "wf_handler.h" #include "fsw_processing.h" +#include "lfr_cpu_usage_report.h" + // MODE PARAMETERS extern unsigned int maxCount; diff --git a/src/fsw_init.c b/src/fsw_init.c --- a/src/fsw_init.c +++ b/src/fsw_init.c @@ -72,6 +72,8 @@ rtems_task Init( rtems_task_argument ign reset_local_time(); + rtems_cpu_usage_reset(); + rtems_status_code status; rtems_status_code status_spw; rtems_isr_entry old_isr_handler; diff --git a/src/fsw_misc.c b/src/fsw_misc.c --- a/src/fsw_misc.c +++ b/src/fsw_misc.c @@ -221,8 +221,8 @@ rtems_task hous_task(rtems_task_argument spacewire_update_statistics(); - get_v_e1_e2_f3( - housekeeping_packet.hk_lfr_sc_v_f3, housekeeping_packet.hk_lfr_sc_e1_f3, housekeeping_packet.hk_lfr_sc_e2_f3 ); + get_v_e1_e2_f3( housekeeping_packet.hk_lfr_sc_v_f3 ); + get_cpu_load( (unsigned char *) &housekeeping_packet.hk_lfr_cpu_load ); // SEND PACKET status = rtems_message_queue_urgent( queue_id, &housekeeping_packet, @@ -436,7 +436,7 @@ void send_dumb_hk( void ) PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES); } -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 ) { unsigned int coarseTime; unsigned int acquisitionTime; @@ -449,12 +449,12 @@ void get_v_e1_e2_f3( unsigned char *v, u if (lfrCurrentMode == LFR_MODE_STANDBY) { - v[0] = 0x00; - v[1] = 0x00; - e1[0] = 0x00; - e1[1] = 0x00; - e2[0] = 0x00; - e2[1] = 0x00; + spacecraft_potential[0] = 0x00; + spacecraft_potential[1] = 0x00; + spacecraft_potential[2] = 0x00; + spacecraft_potential[3] = 0x00; + spacecraft_potential[4] = 0x00; + spacecraft_potential[5] = 0x00; } else { @@ -486,16 +486,38 @@ void get_v_e1_e2_f3( unsigned char *v, u offset_in_samples = NB_SAMPLES_PER_SNAPSHOT -1; } offset_in_bytes = TIME_OFFSET_IN_BYTES + offset_in_samples * NB_WORDS_SWF_BLK * 4; - v[0] = bufferPtr[ offset_in_bytes + 0]; - v[1] = bufferPtr[ offset_in_bytes + 1]; - e1[0] = bufferPtr[ offset_in_bytes + 2]; - e1[1] = bufferPtr[ offset_in_bytes + 3]; - e2[0] = bufferPtr[ offset_in_bytes + 4]; - e2[1] = bufferPtr[ offset_in_bytes + 5]; + spacecraft_potential[0] = bufferPtr[ offset_in_bytes + 0]; + spacecraft_potential[1] = bufferPtr[ offset_in_bytes + 1]; + spacecraft_potential[2] = bufferPtr[ offset_in_bytes + 2]; + spacecraft_potential[3] = bufferPtr[ offset_in_bytes + 3]; + spacecraft_potential[4] = bufferPtr[ offset_in_bytes + 4]; + spacecraft_potential[5] = bufferPtr[ offset_in_bytes + 5]; } } +void get_cpu_load( unsigned char *resource_statistics ) +{ + unsigned char cpu_load; + + cpu_load = lfr_rtems_cpu_usage_report(); + + // HK_LFR_CPU_LOAD + resource_statistics[0] = cpu_load; + + // HK_LFR_CPU_LOAD_MAX + if (cpu_load > resource_statistics[1]) + { + resource_statistics[1] = cpu_load; + } + + // CPU_LOAD_AVE + resource_statistics[2] = 0; + +#ifndef PRINT_TASK_STATISTICS + rtems_cpu_usage_reset(); +#endif + +} + - - diff --git a/src/processing/avf0_prc0.c b/src/processing/avf0_prc0.c --- a/src/processing/avf0_prc0.c +++ b/src/processing/avf0_prc0.c @@ -264,7 +264,7 @@ rtems_task prc0_task( rtems_task_argumen // 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); @@ -275,7 +275,7 @@ rtems_task prc0_task( rtems_task_argumen // 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); @@ -298,7 +298,7 @@ rtems_task prc0_task( rtems_task_argumen // 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 ); @@ -308,7 +308,7 @@ rtems_task prc0_task( rtems_task_argumen // 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); diff --git a/src/processing/avf1_prc1.c b/src/processing/avf1_prc1.c --- a/src/processing/avf1_prc1.c +++ b/src/processing/avf1_prc1.c @@ -249,7 +249,7 @@ rtems_task prc1_task( rtems_task_argumen // 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 ); @@ -260,7 +260,7 @@ rtems_task prc1_task( rtems_task_argumen // 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 ); @@ -293,7 +293,7 @@ rtems_task prc1_task( rtems_task_argumen // 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 ); diff --git a/src/processing/avf2_prc2.c b/src/processing/avf2_prc2.c --- a/src/processing/avf2_prc2.c +++ b/src/processing/avf2_prc2.c @@ -187,7 +187,7 @@ rtems_task prc2_task( rtems_task_argumen // 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 ); @@ -197,7 +197,7 @@ rtems_task prc2_task( rtems_task_argumen // 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 ); diff --git a/src/processing/fsw_processing.c b/src/processing/fsw_processing.c --- a/src/processing/fsw_processing.c +++ b/src/processing/fsw_processing.c @@ -317,12 +317,12 @@ void ASM_send(Header_TM_LFR_SCIENCE_ASM_ 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[1] = (unsigned char) (time_management_regs->coarse_time>>16); - header->acquisitionTime[2] = (unsigned char) (time_management_regs->coarse_time>>8); - header->acquisitionTime[3] = (unsigned char) (time_management_regs->coarse_time); - header->acquisitionTime[4] = (unsigned char) (time_management_regs->fine_time>>8); - header->acquisitionTime[5] = (unsigned char) (time_management_regs->fine_time); + header->acquisitionTime[0] = header->time[0]; + header->acquisitionTime[1] = header->time[1]; + header->acquisitionTime[2] = header->time[2]; + header->acquisitionTime[3] = header->time[3]; + header->acquisitionTime[4] = header->time[4]; + 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); @@ -395,6 +395,7 @@ void BP_init_header_with_spare(Header_TM 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 } diff --git a/src/tc_handler.c b/src/tc_handler.c --- a/src/tc_handler.c +++ b/src/tc_handler.c @@ -532,7 +532,7 @@ int enter_mode( unsigned char mode, unsi #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 )