github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-02-27 01:00:07 +00:00
Code Releases Activity

FRONTPANEL: Avoid potential deadlock when shutting down a panel application

Browse Source
This commit is contained in:
Mark Pizzolato
2023-01-09 15:43:25 -10:00
parent 2e2270ccc7
commit 7a4ded8380
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sim_console.c
View File

@@ -633,7 +633,7 @@ for (i=connections=0; i<sim_rem_con_tmxr.lines; i++) {
continue;
++connections;
if (connections == 1)
fprintf (st, "Remote Console Connections:\n");
fprintf (st, "\nRemote Console Connections:\n");
tmxr_fconns (st, rem->lp, i);
if (rem->read_timeout != sim_rem_read_timeout) {
if (rem->read_timeout)
@@ -668,6 +668,7 @@ for (i=connections=0; i<sim_rem_con_tmxr.lines; i++) {
fprintf (st, "\n");
if (sim_switches & SWMASK ('D'))
sim_rem_sample_output (st, rem->line);
fprintf (st, "\n");
}
}
return SCPE_OK;

17
sim_frontpanel.c
View File

@@ -822,8 +822,8 @@ else {
fclose (fIn);
fIn = NULL;
fprintf (fOut, "set remote notelnet\n");
if (device_panel_count)
fprintf (fOut, "set remote connections=%d\n", (int)device_panel_count+1);
if ((device_panel_count != 0) || (debug_file != NULL))
fprintf (fOut, "set remote connections=%d\n", (int)(device_panel_count + 1 + ((debug_file != NULL) ? 1 : 0)));
fprintf (fOut, "set remote -u telnet=%s\n", hostport);
fprintf (fOut, "set remote master\n");
fprintf (fOut, "exit\n");
@@ -1430,10 +1430,23 @@ if (usecs_between_callbacks && (0 == panel->usecs_between_callbacks)) { /* Need
pthread_cond_destroy (&panel->startup_done);
}
if ((usecs_between_callbacks == 0) && panel->usecs_between_callbacks) { /* Need to stop callbacks */
OperationalState PriorState = panel->State; /* record initial state */
_panel_debug (panel, DBG_THR, "Shutting down callback thread", NULL, 0);
if (PriorState == Run) { /* If running? */
pthread_mutex_unlock (&panel->io_lock); /* allow access */
sim_panel_exec_halt (panel); /* Stop for Now */
pthread_mutex_lock (&panel->io_lock); /* acquire access */
}
panel->usecs_between_callbacks = 0; /* flag disabled */
pthread_mutex_unlock (&panel->io_lock); /* allow access */
pthread_join (panel->callback_thread, NULL); /* synchronize with thread rundown */
if (PriorState == Run) { /* If was running? */
pthread_mutex_lock (&panel->io_lock); /* allow access */
sim_panel_exec_halt (panel); /* resume running */
pthread_mutex_unlock (&panel->io_lock); /* acquire access */
}
pthread_mutex_lock (&panel->io_lock); /* reacquire access */
}
pthread_mutex_unlock (&panel->io_lock);

2
sim_frontpanel.h
View File

@@ -56,7 +56,7 @@ extern "C" {
#if !defined(__VAX) /* Unsupported platform */
#define SIM_FRONTPANEL_VERSION 13
#define SIM_FRONTPANEL_VERSION 14
/**