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

Align buffer blocks in saved state. #1240

Closed
wants to merge 1 commit into from
Closed

Align buffer blocks in saved state. #1240

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
11 changes: 7 additions & 4 deletions src/state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ var STATE_INDEX_INFO_LEN = 3;
/** @const */
var STATE_INFO_BLOCK_START = 16;

/** @const */
var STATE_BUFFER_ALIGN_BYTES = 256;

const ZSTD_MAGIC = 0xFD2FB528;

/** @constructor */
Expand Down Expand Up @@ -143,7 +146,7 @@ CPU.prototype.save_state = function()
total_buffer_size += len;

// align
total_buffer_size = total_buffer_size + 3 & ~3;
total_buffer_size = total_buffer_size + STATE_BUFFER_ALIGN_BYTES - 1 & ~(STATE_BUFFER_ALIGN_BYTES - 1);
}

var info_object = JSON.stringify({
Expand All @@ -153,7 +156,7 @@ CPU.prototype.save_state = function()
var info_block = new TextEncoder().encode(info_object);

var buffer_block_start = STATE_INFO_BLOCK_START + info_block.length;
buffer_block_start = buffer_block_start + 3 & ~3;
buffer_block_start = buffer_block_start + STATE_BUFFER_ALIGN_BYTES - 1 & ~(STATE_BUFFER_ALIGN_BYTES - 1);
var total_size = buffer_block_start + total_buffer_size;

//console.log("State: json_size=" + Math.ceil(buffer_block_start / 1024 / 1024) + "MB " +
Expand Down Expand Up @@ -257,7 +260,7 @@ CPU.prototype.restore_state = function(state)

for(const buffer_info of buffer_infos)
{
const front_padding = (position + 3 & ~3) - position;
const front_padding = (position + STATE_BUFFER_ALIGN_BYTES - 1 & ~(STATE_BUFFER_ALIGN_BYTES - 1)) - position;
const CHUNK_SIZE = 1 * 1024 * 1024;

if(buffer_info.length > CHUNK_SIZE)
Expand Down Expand Up @@ -312,7 +315,7 @@ CPU.prototype.restore_state = function(state)
let state_object = info_block_obj["state"];
const buffer_infos = info_block_obj["buffer_infos"];
let buffer_block_start = STATE_INFO_BLOCK_START + info_block_len;
buffer_block_start = buffer_block_start + 3 & ~3;
buffer_block_start = buffer_block_start + STATE_BUFFER_ALIGN_BYTES - 1 & ~(STATE_BUFFER_ALIGN_BYTES - 1);

const buffers = buffer_infos.map(buffer_info => {
const offset = buffer_block_start + buffer_info.offset;
Expand Down