Skip to content

Remove Win32 console output overhead #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bscottm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove Win32 console output overhead #455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions sim_console.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3483,9 +3483,12 @@ return SCPE_OK;
#include <fcntl.h>
#include <io.h>
#define RAW_MODE 0
typedef BOOL (WINAPI *std_output_writer_fn)(HANDLE, const void *, DWORD, LPDWORD, LPVOID);

static HANDLE std_input;
static HANDLE std_output;
static HANDLE std_error;
static std_output_writer_fn std_output_writer = NULL;
static DWORD saved_input_mode;
static DWORD saved_output_mode;
static DWORD saved_error_mode;
Expand Down Expand Up @@ -3537,12 +3540,19 @@ SetConsoleCtrlHandler( ControlHandler, TRUE );
std_input = GetStdHandle (STD_INPUT_HANDLE);
std_output = GetStdHandle (STD_OUTPUT_HANDLE);
std_error = GetStdHandle (STD_ERROR_HANDLE);

if ((std_input) && /* Not Background process? */
(std_input != INVALID_HANDLE_VALUE))
GetConsoleMode (std_input, &saved_input_mode); /* Save Input Mode */
if ((std_output) && /* Not Background process? */
(std_output != INVALID_HANDLE_VALUE))
GetConsoleMode (std_output, &saved_output_mode); /* Save Output Mode */
(std_output != INVALID_HANDLE_VALUE)) { /* Save Output Mode */
std_output_writer = GetConsoleMode(std_output, &saved_output_mode)
? WriteConsoleA
: (std_output_writer_fn) WriteFile;
} else {
/* Default to something resonable... */
std_output_writer = (std_output_writer_fn) WriteFile;
}
if ((std_error) && /* Not Background process? */
(std_error != INVALID_HANDLE_VALUE))
GetConsoleMode (std_error, &saved_error_mode); /* Save Output Mode */
Expand Down Expand Up @@ -3690,16 +3700,15 @@ return (WAIT_OBJECT_0 == WaitForSingleObject (std_input, ms_timeout));
static uint8 out_buf[ESC_HOLD_MAX]; /* Buffered characters pending output */
static int32 out_ptr = 0;

static void sim_console_write(uint8 *outbuf, int32 outsz)
static inline void sim_console_write(uint8 *outbuf, int32 outsz)
{
DWORD unused;
DWORD mode;
BOOL result;

if (GetConsoleMode(std_output, &mode)) {
WriteConsoleA(std_output, outbuf, outsz, &unused, NULL);
} else {
BOOL result = WriteFile(std_output, outbuf, outsz, &unused, NULL);
}
/* Useful to see the return value from std_output_writer. */
result = std_output_writer(std_output, outbuf, outsz, &unused, NULL);
/* But squelch the set-but-not-used warnings. */
(void) result;
}

static t_stat sim_out_hold_svc (UNIT *uptr)
Expand Down
Loading