linuxcnc.in: terminate motion-logger also

fix for occaisonal buildbot failures for tests/motion-logger/mountaindew
that occur coincident with reports of excessive (> 1second) task latency
excursions like:

"task: 307 cycles, min=0.000155, max=1.804823, avg=0.014539, 7 latency excursions ..."

Scenario:
1) At termination of [DISPLAY]DISPLAY=test-ui.py, the linuxcnc script
   initiates shutdown by sending a SIGTERM to linuxcncsvr and milltask.
2) On a heavily loaded buildbot system (showing task latencies like above),
   the delivery of the SIGTERM to milltask may be delayed such that
   the linuxcncsvr process exits well before milltask and the final
   EMCMOT_DISABLE message is undeliverable to the motion-logger
   process resulting in absence of the final expected motion-logger
   "DISABLE" report.
3) This commit sends the SIGTERM to the motion-logger process also
   so the race-dependent final "DISABLE" report is no longer
   expected.
This commit is contained in:
Dewey Garrett 2021-01-07 14:36:42 -07:00
parent fd62a866c6
commit 5cd845a7eb
2 changed files with 1 additions and 2 deletions

View file

@ -622,7 +622,7 @@ function Cleanup() {
fi
# now kill all the other user space components
for KILL_TASK in linuxcncsvr milltask; do
for KILL_TASK in linuxcncsvr motion-logger milltask; do
if $PIDOF $KILL_TASK >>$DEBUG_FILE ; then
KillTaskWithTimeout
fi

View file

@ -125,4 +125,3 @@ SET_LINE x=0.000000, y=1.000000, z=0.500000, a=0.000000, b=0.000000, c=0.000000,
SET_LINE x=0.000000, y=0.000000, z=0.500000, a=0.000000, b=0.000000, c=0.000000, u=0.000000, v=0.000000, w=0.000000, id=6, motion_type=1, vel=400.000000, ini_maxvel=400.000000, acc=1000.000000, turn=-1
SET_SPINDLESYNC sync=0.000000, flags=0x00000000
SPINDLE_OFF
DISABLE