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

Fix/memory #135

Merged
merged 8 commits into from
Sep 17, 2019
Merged

Fix/memory #135

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78f8994
Merge pull request #1 from neo-project/master
Sep 10, 2019
e5dfb9e
optimize memory cause
Sep 11, 2019
4781a13
refactor
Sep 11, 2019
f08be7f
1. keep the OnExport function declaration before WriteBlocks;
Sep 16, 2019
eb8fc11
use Store.GetBlocks() and Store.GetTransactions()
Sep 16, 2019
4524e02
Fix compilation issues
shargon Sep 16, 2019
42b9ac0
Remove using
shargon Sep 16, 2019
4a6e978
use Singleton.Store.GetBlock
Sep 17, 2019
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
17 changes: 10 additions & 7 deletions ImportBlocks/ImportBlocks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ private bool OnExport(string[] args)
count = Math.Min(count, Blockchain.Singleton.Height - start + 1);
uint end = start + count - 1;
string path = $"chain.{start}.acc";
using (FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None))
using (FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None, 4096, FileOptions.WriteThrough))
{
if (fs.Length > 0)
{
Expand All @@ -48,8 +48,9 @@ private bool OnExport(string[] args)
if (start <= end)
fs.Write(BitConverter.GetBytes(count), 0, sizeof(uint));
fs.Seek(0, SeekOrigin.End);
using (Snapshot snapshot = Blockchain.Singleton.GetSnapshot())
for (uint i = start; i <= end; i++)
for (uint i = start; i <= end; i++)
{
using (Snapshot snapshot = Blockchain.Singleton.GetSnapshot())
shargon marked this conversation as resolved.
Show resolved Hide resolved
{
Block block = snapshot.GetBlock(i);
byte[] array = block.ToArray();
Expand All @@ -58,6 +59,7 @@ private bool OnExport(string[] args)
Console.SetCursorPosition(0, Console.CursorTop);
Console.Write($"[{i}/{end}]");
}
}
}
}
else
Expand All @@ -66,7 +68,7 @@ private bool OnExport(string[] args)
uint end = Blockchain.Singleton.Height;
uint count = end - start + 1;
string path = args.Length >= 3 ? args[2] : "chain.acc";
using (FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None))
using (FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None, 4096, FileOptions.WriteThrough))
{
if (fs.Length > 0)
{
Expand All @@ -78,16 +80,17 @@ private bool OnExport(string[] args)
if (start <= end)
fs.Write(BitConverter.GetBytes(count), 0, sizeof(uint));
fs.Seek(0, SeekOrigin.End);
using (Snapshot snapshot = Blockchain.Singleton.GetSnapshot())
for (uint i = start; i <= end; i++)
{
for (uint i = start; i <= end; i++)
{
using (Snapshot snapshot = Blockchain.Singleton.GetSnapshot()) {
Block block = snapshot.GetBlock(i);
byte[] array = block.ToArray();
fs.Write(BitConverter.GetBytes(array.Length), 0, sizeof(int));
fs.Write(array, 0, array.Length);
Console.SetCursorPosition(0, Console.CursorTop);
Console.Write($"[{i}/{end}]");
}
}
}
}
Console.WriteLine();
Expand Down