Merge pull request #14 from Lercher/omnisharp-input-thread

ProcessInputThread should be sync

Author: david-driscoll

src/JsonRpc/InputHandler.cs

@@ -53,8 +53,12 @@ public void Start()
             _scheduler.Start();
         }
 
-        private async void ProcessInputStream()
+        // don't be async: We already allocated a seperate thread for this.
+        private void ProcessInputStream()
         {
+            // some time to attach a debugger
+            // System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5)); 
+
             // header is encoded in ASCII
             // "Content-Length: 0" counts bytes for the following content
             // content is encoded in UTF-8
@@ -63,13 +67,13 @@ private async void ProcessInputStream()
                 if (_inputThread == null) return;
 
                 var buffer = new byte[300];
-                var current = await _input.ReadAsync(buffer, 0, MinBuffer);
+                var current = _input.Read(buffer, 0, MinBuffer);
                 if (current == 0) return; // no more _input
                 while (current < MinBuffer || 
                        buffer[current - 4] != CR || buffer[current - 3] != LF ||
                        buffer[current - 2] != CR || buffer[current - 1] != LF)
                 {
-                    var n = await _input.ReadAsync(buffer, current, 1);
+                    var n = _input.Read(buffer, current, 1);
                     if (n == 0) return; // no more _input, mitigates endless loop here.
                     current += n;
                 }
@@ -99,7 +103,7 @@ private async void ProcessInputStream()
                     var received = 0;
                     while (received < length)
                     {
-                        var n = await _input.ReadAsync(requestBuffer, received, requestBuffer.Length - received);
+                        var n = _input.Read(requestBuffer, received, requestBuffer.Length - received);
                         if (n == 0) return; // no more _input
                         received += n;
                     }

test/JsonRpc.Tests/InputHandlerTests.cs

@@ -70,6 +70,34 @@ public void ShouldPassInRequests()
             }
         }
 
+        [Fact]
+        public void ShouldHaveAThreadName()
+        {
+            var threadName = "(untouched)";
+            var inputStream = new MemoryStream(Encoding.ASCII.GetBytes("Content-Length: 2\r\n\r\n{}"));
+            var reciever = Substitute.For<IReciever>();
+
+            using (NewHandler(
+                inputStream,
+                Substitute.For<IOutputHandler>(),
+                reciever,
+                Substitute.For<IRequestProcessIdentifier>(),
+                Substitute.For<IRequestRouter>(),
+                Substitute.For<IResponseRouter>(),
+                cts => {
+                    reciever.When(x => x.IsValid(Arg.Any<JToken>()))
+                        .Do(x => {
+                            threadName = System.Threading.Thread.CurrentThread.Name;
+                            cts.Cancel();
+                        });
+                }))
+            {
+                reciever.Received();
+                threadName.Should().Be("ProcessInputStream", because: "it is easier to find it in the Threads pane by it's name");
+            }
+
+        }
+
         [Fact]
         public void ShouldPassInUtf8EncodedRequests()
         {