From 79f36198e918d8ce337f716f9ad1754697aefc39 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Mon, 13 Oct 2014 05:08:34 +0000
Subject: [PATCH] play around with 7z a bit

---
 BizHawk.Client.Common/SevenZipWriter.cs | 90 +++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/BizHawk.Client.Common/SevenZipWriter.cs b/BizHawk.Client.Common/SevenZipWriter.cs
index f2ba54dcb4..58f7ef4d8d 100644
--- a/BizHawk.Client.Common/SevenZipWriter.cs
+++ b/BizHawk.Client.Common/SevenZipWriter.cs
@@ -35,6 +35,33 @@ namespace BizHawk.Client.Common
 				R = new RStream(this);
 			}
 
+			public int ReadByte()
+			{
+				// slow, but faster than using the other overload with byte[1]
+				while (true)
+				{
+					empty.WaitOne();
+					lock (sharedlock)
+					{
+						if (rpos != wpos)
+						{
+							byte ret = buff[rpos++];
+							rpos &= MASK;
+							full.Set();
+							return ret;
+						}
+						else if (writeclosed)
+						{
+							return -1;
+						}
+						else
+						{
+							empty.Reset();
+						}
+					}
+				}
+			}
+
 			public int Read(byte[] buffer, int offset, int count)
 			{
 				int ret = 0;
@@ -82,6 +109,33 @@ namespace BizHawk.Client.Common
 				}
 			}
 
+			public bool WriteByte(byte value)
+			{
+				while (true)
+				{
+					full.WaitOne();
+					lock (sharedlock)
+					{
+						int next = (wpos + 1) & MASK;
+						if (next != rpos)
+						{
+							buff[wpos] = value;
+							wpos = next;
+							empty.Set();
+							return true;
+						}
+						else if (readclosed)
+						{
+							return false;
+						}
+						else
+						{
+							full.Reset();
+						}
+					}
+				}
+			}
+
 			public int Write(byte[] buffer, int offset, int count)
 			{
 				int ret = 0;
@@ -158,10 +212,25 @@ namespace BizHawk.Client.Common
 
 				public override void Write(byte[] buffer, int offset, int count)
 				{
+#if true
 					int cnt = _r.Write(buffer, offset, count);
 					_total += cnt;
 					if (cnt < count)
 						throw new IOException("broken pipe");
+#else
+					int end = offset + count;
+					while (offset < end)
+					{
+						WriteByte(buffer[offset++]);
+						_total++;
+					}
+#endif
+				}
+
+				public override void WriteByte(byte value)
+				{
+					if (!_r.WriteByte(value))
+						throw new IOException("broken pipe");
 				}
 
 				protected override void Dispose(bool disposing)
@@ -198,9 +267,30 @@ namespace BizHawk.Client.Common
 
 				public override int Read(byte[] buffer, int offset, int count)
 				{
+#if true
 					int cnt = _r.Read(buffer, offset, count);
 					_total += cnt; 
 					return cnt;
+#else
+					int ret = 0;
+					int end = offset + count;
+					while (offset < end)
+					{
+						int val = ReadByte();
+						if (val == -1)
+							break;
+						buffer[offset] = (byte)val;
+						offset++;
+						ret++;
+						_total++;
+					}
+					return ret;
+#endif
+				}
+
+				public override int ReadByte()
+				{
+					return _r.ReadByte();
 				}
 
 				public override void Write(byte[] buffer, int offset, int count)