From efa3f80dfc26985e3742b37213b4330ad24132ba Mon Sep 17 00:00:00 2001
From: "ezekiel.dohmen" <ezekiel.dohmen@ligo.org>
Date: Fri, 22 Mar 2024 15:04:27 -0500
Subject: [PATCH] Cleaning IPC logs, and fixing issue with use of cycle time
for headroom calc
---
src/epics/util/lib/IPCx.pm | 2 +-
src/fe/commData3.c | 4 ++--
src/fe/controllerApp.c | 6 ++++--
src/fe/controllerIop.c | 5 +++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/epics/util/lib/IPCx.pm b/src/epics/util/lib/IPCx.pm
index 85efb0a4f..ca1a64c2d 100644
--- a/src/epics/util/lib/IPCx.pm
+++ b/src/epics/util/lib/IPCx.pm
@@ -816,7 +816,7 @@ my ($medmDir,$mdlName,$ifo,$dcuid,$medmTarget,$ipcxCnt1) = @_;
# Calculate screen height based on number of IPC RCV signals
my $ind_ipc_ypos_start = 55; #This is the ypos start of the individual IPC table and column header
- my $dispH = $ind_ipc_ypos_start;
+ my $dispH = $ind_ipc_ypos_start + 20;
for(my $ii=0;$ii<$ipcxCnt1;$ii++)
{
if($::ipcxParts[$ii][9] == 0)
diff --git a/src/fe/commData3.c b/src/fe/commData3.c
index 2752d8b98..4418dcc4b 100644
--- a/src/fe/commData3.c
+++ b/src/fe/commData3.c
@@ -570,7 +570,7 @@ int commData3Receive(
if( temp_sleep_count > 0 && g_in_error_state == false)
{
int time_waited_ns = (int)timer_tock_ns(&g_cycle_start_tsc);
- RTSLOG_INFO("Slept for %d ns waiting for IPC: %d\n", time_waited_ns, slow_ipc_num);
+ //RTSLOG_INFO("Slept for %d ns waiting for IPC: %d\n", time_waited_ns, slow_ipc_num);
++g_ipc_wait_time_stats.numWaitsInSec;
g_ipc_wait_time_stats.slowIpcListIndex = slow_ipc_num;
if( time_waited_ns > g_ipc_wait_time_stats.ipcMaxWait_ns )
@@ -578,7 +578,7 @@ int commData3Receive(
}
else if ( temp_sleep_count > 0 )
{
- RTSLOG_INFO("Timed out waiting %d ns for IPC: %d\n", max_time_to_wait_ns, slow_ipc_num);
+ //RTSLOG_INFO("Timed out waiting %d ns for IPC: %d\n", max_time_to_wait_ns, slow_ipc_num);
}
diff --git a/src/fe/controllerApp.c b/src/fe/controllerApp.c
index 141992a75..369a76c69 100644
--- a/src/fe/controllerApp.c
+++ b/src/fe/controllerApp.c
@@ -482,9 +482,11 @@ fe_start_controller( void )
// **********************************************************************
if ( cycleNum == HKP_TIMING_UPDATES )
{
- sendTimingDiags2Epics( pLocalEpics, &timeinfo, &adcinfo );
-
+
+ //sendTimingDiags2Epics() will clear cycleTimeSec, so we set it here
commData3SetCycleMax( timeinfo.cycleTimeSec );
+
+ sendTimingDiags2Epics( pLocalEpics, &timeinfo, &adcinfo );
if ( ( adcinfo.adcHoldTime > CYCLE_TIME_ALRM_HI ) ||
( adcinfo.adcHoldTime < CYCLE_TIME_ALRM_LO ) )
diff --git a/src/fe/controllerIop.c b/src/fe/controllerIop.c
index d37f5205a..fc9208b61 100644
--- a/src/fe/controllerIop.c
+++ b/src/fe/controllerIop.c
@@ -1180,9 +1180,10 @@ fe_start_controller( void )
// *****************************************************************
if ( hkp_cycle == HKP_TIMING_UPDATES )
{
- sendTimingDiags2Epics( pLocalEpics, &timeinfo, &adcinfo );
-
+ //sendTimingDiags2Epics() will clear cycleTimeSec, so we set it here
commData3SetCycleMax( timeinfo.cycleTimeSec );
+
+ sendTimingDiags2Epics( pLocalEpics, &timeinfo, &adcinfo );
pLocalEpics->epicsOutput.dacEnable = dacEnable;
--
GitLab