From 4dffa9dc9b7f0199b48eacf419e8bdd39f77e5a2 Mon Sep 17 00:00:00 2001 From: lidgren Date: Wed, 8 May 2013 13:26:17 +0000 Subject: [PATCH] Added recycling to a few samples that lacked it --- Samples/Chat/ChatClient/Program.cs | 1 + Samples/Chat/ChatServer/Program.cs | 1 + Samples/File stream sample/FileStreamClient/Program.cs | 1 + Samples/File stream sample/FileStreamServer/Program.cs | 1 + .../File stream sample/FileStreamServer/StreamingClient.cs | 4 ++-- Samples/LibraryTestSamples/SpeedSample/SpeedClient/Program.cs | 1 + .../UnconnectedSample/UnconnectedSample/Program.cs | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Samples/Chat/ChatClient/Program.cs b/Samples/Chat/ChatClient/Program.cs index c45d67c..c0b6a7c 100644 --- a/Samples/Chat/ChatClient/Program.cs +++ b/Samples/Chat/ChatClient/Program.cs @@ -75,6 +75,7 @@ namespace ChatClient Output("Unhandled type: " + im.MessageType + " " + im.LengthBytes + " bytes"); break; } + s_client.Recycle(im); } } diff --git a/Samples/Chat/ChatServer/Program.cs b/Samples/Chat/ChatServer/Program.cs index ec4526b..375fff9 100644 --- a/Samples/Chat/ChatServer/Program.cs +++ b/Samples/Chat/ChatServer/Program.cs @@ -87,6 +87,7 @@ namespace ChatServer Output("Unhandled type: " + im.MessageType + " " + im.LengthBytes + " bytes " + im.DeliveryMethod + "|" + im.SequenceChannel); break; } + s_server.Recycle(im); } Thread.Sleep(1); } diff --git a/Samples/File stream sample/FileStreamClient/Program.cs b/Samples/File stream sample/FileStreamClient/Program.cs index a943511..b0ce788 100644 --- a/Samples/File stream sample/FileStreamClient/Program.cs +++ b/Samples/File stream sample/FileStreamClient/Program.cs @@ -86,6 +86,7 @@ namespace FileStreamClient } break; } + s_client.Recycle(inc); } } } diff --git a/Samples/File stream sample/FileStreamServer/Program.cs b/Samples/File stream sample/FileStreamServer/Program.cs index e55d09a..d6e8ade 100644 --- a/Samples/File stream sample/FileStreamServer/Program.cs +++ b/Samples/File stream sample/FileStreamServer/Program.cs @@ -65,6 +65,7 @@ namespace FileStreamServer } break; } + s_server.Recycle(inc); } // stream to all connections diff --git a/Samples/File stream sample/FileStreamServer/StreamingClient.cs b/Samples/File stream sample/FileStreamServer/StreamingClient.cs index 59bed65..9269019 100644 --- a/Samples/File stream sample/FileStreamServer/StreamingClient.cs +++ b/Samples/File stream sample/FileStreamServer/StreamingClient.cs @@ -31,8 +31,8 @@ namespace FileStreamServer if (freeWindowSlots > 0) { // send another part of the file! - int remaining = (int)(m_inputStream.Length - m_sentOffset); - int sendBytes = (remaining > m_chunkLen ? m_chunkLen : remaining); + long remaining = m_inputStream.Length - m_sentOffset; + int sendBytes = (remaining > m_chunkLen ? m_chunkLen : (int)remaining); // just assume we can read the whole thing in one Read() m_inputStream.Read(m_tmpBuffer, 0, sendBytes); diff --git a/Samples/LibraryTestSamples/SpeedSample/SpeedClient/Program.cs b/Samples/LibraryTestSamples/SpeedSample/SpeedClient/Program.cs index bbb0785..621dfef 100644 --- a/Samples/LibraryTestSamples/SpeedSample/SpeedClient/Program.cs +++ b/Samples/LibraryTestSamples/SpeedSample/SpeedClient/Program.cs @@ -74,6 +74,7 @@ namespace SpeedTestClient Output("Unhandled type: " + im.MessageType); break; } + s_client.Recycle(im); } float now = (float)NetTime.Now; diff --git a/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample/Program.cs b/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample/Program.cs index ffba7a1..de487c7 100644 --- a/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample/Program.cs +++ b/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample/Program.cs @@ -52,6 +52,7 @@ namespace UnconnectedSample Peer.Recycle(im); break; } + Peer.Recycle(im); } System.Threading.Thread.Sleep(1);