Skip to content
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

Jump to bottom

refactor(core): convert core.print() to a builtin op #10436

Merged
merged 8 commits into from
May 2, 2021
Merged

refactor(core): convert core.print() to a builtin op #10436

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3fbe176
refactor(core): convert core.print() to a builtin op
AaronO Apr 30, 2021
6d9b2b4
tweak
AaronO Apr 30, 2021
c93960b
tweak
AaronO Apr 30, 2021
e9f4ed1
tweak
AaronO Apr 30, 2021
b43a326
Merge branch 'main' into core/print-op
AaronO May 1, 2021
c852cd9
declare op_print in builtin extension
AaronO May 1, 2021
b834a7e
cli/tsc: fix core.print() usage
AaronO May 1, 2021
018141e
Merge branch 'main' into core/print-op
AaronO May 1, 2021
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
Prev Previous commit
Next Next commit
tweak
  • Loading branch information
@AaronO
AaronO committed Apr 30, 2021
commit 6d9b2b4a4f39eb6b3318ca4602dfb819eae86e8e
5 changes: 2 additions & 3 deletions core/ops_builtin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,10 @@ pub fn op_close(
/// This op must be wrapped in `op_sync`.
pub fn op_print(
_state: &mut OpState,
args: (String, Option<u8>),
args: (String, bool),
_zero_copy: Option<ZeroCopyBuf>,
) -> Result<(), AnyError> {
let (msg, channel) = args;
let is_err = channel.unwrap_or_default() != 0;
let (msg, is_err) = args;
if is_err {
eprint!("{}", msg);
stdout().flush().unwrap();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be stderr().flush().unwrap() ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're right, but it's not 100% clear if the original intention was to flush stdout when writing to stderr. IIRC stderr is unbuffered on Linux and macOS, but I don't think that's true on Windows.

The original intention might have been to flush both stderr/stdout (all output streams) assuming stderr was unbuffered and thus didn't need flushing.

I've submitted a PR (#10480), so we can continue the conversation over there.

It seems like this should only matter on Windows, could make sense to always flush both regardless of where we're writing to, something like this:

/// Builtin utility to print to stdout/stderr
pub fn op_print(
  _state: &mut OpState,
  args: (String, bool),
  _zero_copy: Option<ZeroCopyBuf>,
) -> Result<(), AnyError> {
  let (msg, is_err) = args;
  if is_err {
    eprint!("{}", msg);
  } else {
    print!("{}", msg);
  }
  // Flush all output streams (stderr & stdout)
  stdout().flush().unwrap();
  stderr().flush().unwrap();
  Ok(())
}

Expand Down