Mercurial > hg > Database > Christie-sharp

changeset 52:ef3fd58af531

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author riono <e165729@ie.u-ryukyu.ac.jp>
date Fri, 14 Jan 2022 15:26:17 +0900
parents 486683ead53f
children bdc364119f30
files Christie_net.csproj daemon/ChristieDaemon.cs daemon/IncomingTcpConnection.cs daemon/ThreadPoolExecutors.cs datagear/RemoteDataGearManager.cs
diffstat 5 files changed, 15 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/Christie_net.csproj	Tue Jan 11 20:02:18 2022 +0900
+++ b/Christie_net.csproj	Fri Jan 14 15:26:17 2022 +0900
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>netcoreapp6.0</TargetFramework>
         <StartupObject>Christie_net.Test.Example.FizzBuzz.StartFizzBuzz</StartupObject>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="MessagePack" Version="2.1.143" />
+      <PackageReference Include="MessagePack" Version="2.3.85" />
     </ItemGroup>
 </Project>
--- a/daemon/ChristieDaemon.cs	Tue Jan 11 20:02:18 2022 +0900
+++ b/daemon/ChristieDaemon.cs	Fri Jan 14 15:26:17 2022 +0900
@@ -35,6 +35,7 @@
             Thread thread = new Thread(acceptThread.Run);
             thread.Name = ("ACCEPT" + localPort);
             thread.Start();
+
         } catch (Exception e) {
             Console.WriteLine(e.StackTrace);
         }
--- a/daemon/IncomingTcpConnection.cs	Tue Jan 11 20:02:18 2022 +0900
+++ b/daemon/IncomingTcpConnection.cs	Fri Jan 14 15:26:17 2022 +0900
@@ -31,7 +31,7 @@
             
             int length = 0;
             try {
-               length = connection.stream.Read(streamData);
+               length = connection.stream.Read(streamData,0, 100);
                //Console.WriteLine("call:" + connection.stream.Position);
 
             } catch (Exception e) {
--- a/daemon/ThreadPoolExecutors.cs	Tue Jan 11 20:02:18 2022 +0900
+++ b/daemon/ThreadPoolExecutors.cs	Fri Jan 14 15:26:17 2022 +0900
@@ -19,11 +19,6 @@
     
     public void Execute(CodeGearExecutor command) {
         Task.Factory.StartNew(() => command.Run());
-        // Thread thread = new Thread(() => {
-        //     command.Run();
-        // });
-        //
-        // thread.Start();
     }
 }
 }
\ No newline at end of file
--- a/datagear/RemoteDataGearManager.cs	Tue Jan 11 20:02:18 2022 +0900
+++ b/datagear/RemoteDataGearManager.cs	Fri Jan 14 15:26:17 2022 +0900
@@ -16,11 +16,11 @@
     private CodeGearManager cgm;
     private bool connect = false;
     private object syncObj = new object();
-    
-    public RemoteDataGearManager (string dgmname ,string address, int port, CodeGearManager cgm) {
+
+    public RemoteDataGearManager(string dgmname, string address, int port, CodeGearManager cgm) {
         this.cgm = cgm;
         RemoteDataGearManager manager = this;
-        Thread thread = new Thread(() => {
+        Task.Factory.StartNew(() => {
             do {
                 try {
                     IPHostEntry host = Dns.GetHostEntry(address);
@@ -29,15 +29,15 @@
                     Socket socket = new Socket(ipAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
                     socket.Connect(remoteEndPoint);
                     socket.NoDelay = true;
-                    
+
                     connection = new Connection(socket, cgm);
                     connection.name = dgmname;
-                    
+
                     lock (syncObj) {
                         connect = true;
                         Monitor.Pulse(syncObj);
                     }
-                } catch(Exception e) {
+                } catch (Exception e) {
                     Console.WriteLine(e.ToString());
                 }
             } while (!connect);
@@ -48,6 +48,7 @@
             incomingThread.Name = dgmname + "-IncomingTcp";
             //incomingThread.Priority = ThreadPriority.Highest;
             incomingThread.Start();
+
             
             OutboundTcpConnection outbound = new OutboundTcpConnection(connection);
             Thread outboundThread = new Thread(outbound.Run);
@@ -55,10 +56,11 @@
             //outboundThread.Priority = ThreadPriority.Highest;
             outboundThread.Start();
         });
-        thread.Name = "Connect-" + dgmname;
-        thread.Start();
+
+        // thread.Name = "Connect-" + dgmname;
+        // thread.Start();
     }
-    
+
     public override void Put(string key, object data) {
         Command cm = new CommandBuilder().Init(CommandType.PUT).Key(key)
             .Dg(new DataGear<object>(data)).Build();