Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

WIP: [[ Bugfix 21305 ]] Improve performance of stackfile saving on Windows #7319

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

WIP: [[ Bugfix 21305 ]] Improve performance of stackfile saving on Windows #7319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9571a17
[[ Bugfix 21305 ]] Add simple write buffer to Win32 file handle
runrevmark Apr 11, 2020
bbdd925
[[ Bug 21305 ]] Add release note for bug 21305
runrevmark Apr 27, 2020
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
2 changes: 2 additions & 0 deletions docs/notes/bugfix-21305.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Improve performance of stackfile saving on Windows

11 changes: 9 additions & 2 deletions engine/src/dispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,9 @@ IO_stat MCDispatch::dosavestack(MCStack *sptr, const MCStringRef p_fname, uint32
}
IO_handle stream;

if ((stream = MCS_open(*t_linkname, kMCOpenFileModeWrite, True, False, 0)) == NULL)
/* Ask to open the stackfile stream for buffered write. Whether this will
* make a difference depends on the platform. */
if ((stream = MCS_open(*t_linkname, kMCOpenFileModeBufferedWrite, True, False, 0)) == NULL)
{
MCresult->sets("can't open stack file");
cleanup(stream, *t_linkname, *t_backup);
Expand Down Expand Up @@ -1320,8 +1322,13 @@ IO_stat MCDispatch::dosavestack(MCStack *sptr, const MCStringRef p_fname, uint32
MCgroupedobjectoffset . y = 0;

MCresult -> clear();

/* Make sure we flush the stream when we have written everything. This ensures that
* any write buffering is completely applied before we irrevocably remove the
* original. */
if (sptr->save(stream, 0, false, p_version) != IO_NORMAL
|| IO_write_uint1(OT_END, stream) != IO_NORMAL)
|| IO_write_uint1(OT_END, stream) != IO_NORMAL
|| MCS_flush(stream) != IO_NORMAL)
{
if (MCresult -> isclear())
MCresult->sets(errstring);
Expand Down
5 changes: 3 additions & 2 deletions engine/src/dsklnx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ class MCLinuxDesktop: public MCSystemInterface
const char *t_mode;
if (p_mode == kMCOpenFileModeRead)
t_mode = IO_READ_MODE;
else if (p_mode == kMCOpenFileModeWrite)
else if (p_mode == kMCOpenFileModeWrite || p_mode == kMCOpenFileModeBufferedWrite)
t_mode = IO_WRITE_MODE;
else if (p_mode == kMCOpenFileModeUpdate)
t_mode = IO_UPDATE_MODE;
Expand Down Expand Up @@ -1212,6 +1212,7 @@ class MCLinuxDesktop: public MCSystemInterface
t_fptr = fdopen(p_fd, IO_READ_MODE);
break;
case kMCOpenFileModeWrite:
case kMCOpenFileModeBufferedWrite:
t_fptr = fdopen(p_fd, IO_WRITE_MODE);
break;
case kMCOpenFileModeUpdate:
Expand Down Expand Up @@ -1244,7 +1245,7 @@ class MCLinuxDesktop: public MCSystemInterface

if (p_mode == kMCOpenFileModeRead)
t_fptr = fopen(*t_path_sys, IO_READ_MODE);
else if (p_mode == kMCOpenFileModeWrite)
else if (p_mode == kMCOpenFileModeWrite || p_mode == kMCOpenFileModeBufferedWrite)
t_fptr = fopen(*t_path_sys, IO_WRITE_MODE);
else if (p_mode == kMCOpenFileModeUpdate)
t_fptr = fopen(*t_path_sys, IO_UPDATE_MODE);
Expand Down
5 changes: 4 additions & 1 deletion engine/src/dskmac.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3960,6 +3960,7 @@ struct MCMacDesktop: public MCSystemInterface, public MCMacSystemService
fptr = fopen(*t_path_utf, IO_APPEND_MODE);
break;
case kMCOpenFileModeWrite:
case kMCOpenFileModeBufferedWrite:
fptr = fopen(*t_path_utf, IO_WRITE_MODE);
break;
default:
Expand Down Expand Up @@ -3996,6 +3997,7 @@ struct MCMacDesktop: public MCSystemInterface, public MCMacSystemService
t_stream = fdopen(p_fd, IO_UPDATE_MODE);
break;
case kMCOpenFileModeWrite:
case kMCOpenFileModeBufferedWrite:
t_stream = fdopen(p_fd, IO_WRITE_MODE);
break;
default:
Expand All @@ -4006,7 +4008,7 @@ struct MCMacDesktop: public MCSystemInterface, public MCMacSystemService
return NULL;

// MH-2007-05-17: [[Bug 3196]] Opening the write pipe to a process should not be buffered.
if (p_mode == kMCOpenFileModeWrite)
if (p_mode == kMCOpenFileModeWrite || p_mode == kMCOpenFileModeBufferedWrite)
setvbuf(t_stream, NULL, _IONBF, 0);

IO_handle t_handle;
Expand Down Expand Up @@ -4041,6 +4043,7 @@ struct MCMacDesktop: public MCSystemInterface, public MCMacSystemService
fptr = fopen(*t_path_utf, IO_UPDATE_MODE);
break;
case kMCOpenFileModeWrite:
case kMCOpenFileModeBufferedWrite:
fptr = fopen(*t_path_utf, IO_WRITE_MODE);
break;
default:
Expand Down
Loading