Changeset 13971 for branches

Timestamp:

07/01/16 19:23:56 (8 years ago)

Author:

thasling

Message:

#2615:
increased message size to 20MB
made changes in some interfaces

Location:

branches/thasling/DistributedGA

Files:

• DistributedGA.Core/Domain/MessageRecieveEventArgs.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/MessageContractImpl.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/WcfMessageSender.cs (modified) (2 diffs)
• DistributedGA.Core/Implementation/WcfMessageService.cs (modified) (1 diff)
• DistributedGA.Core/Interface/IMessageContract.cs (modified) (1 diff)
• DistributedGA.Hive/P2PMigrationAnalyzer.cs (modified) (2 diffs)

branches/thasling/DistributedGA/DistributedGA.Core/Domain/MessageRecieveEventArgs.cs

@@ -4 +4 @@
   public class MessageRecieveEventArgs : EventArgs {
     public int val;
-    public byte[][] data { get; set; }
+    public byte[] data { get; set; }
     public PeerInfo Sender { get; set; }
   }

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/MessageContractImpl.cs

@@ -7 +7 @@
   [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single)]
   public class MessageContractImpl : IMessageContract {
-    public void SendData(PeerInfo sender, byte[][] data) {
+    public void SendData(PeerInfo sender, byte[] data) {
       MessageRecieveEventArgs args = new MessageRecieveEventArgs() { Sender = sender, data = data };
 

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs

@@ -146 +146 @@
       if (e != null && e.Sender.ProblemInstance.Equals(ownInstance.ProblemInstance)) {
         lock (activeQueueLocker) {
-          foreach (byte[] item in e.data) {
-            writeQueue.Enqueue(item);
-          }
+            writeQueue.Enqueue(e.data);
         }
 

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfMessageSender.cs

@@ -102 +102 @@
     private void SendDataFromQueue(PeerInfo destination, byte[][] data) {
       try {
-        int arrayLength = 3;
-        if (data.GetUpperBound(0) > arrayLength) {
-          //HACK: SEND MAX 10 items
-          byte[][] fake = new byte[arrayLength][];
-          for (int i = 0; i < arrayLength; i++) {
-            fake[i] = data[i];
-          }
-          data = fake;
-        }
+        //int arrayLength = 3;
+        //if (data.GetUpperBound(0) > arrayLength) {
+        //  //HACK: SEND MAX 10 items
+        //  byte[][] fake = new byte[arrayLength][];
+        //  for (int i = 0; i < arrayLength; i++) {
+        //    fake[i] = data[i];
+        //  }
+        //  data = fake;
+        //}
 
 
@@ -119 +119 @@
 
         var binding = new NetTcpBinding();
+        binding.MaxReceivedMessageSize = 20000000;
+        binding.MaxBufferSize = 20000000;
+        binding.MaxBufferPoolSize = 20000000;
+        binding.ReaderQuotas.MaxArrayLength = 20000000;
+        binding.ReaderQuotas.MaxDepth = 32;
+        binding.ReaderQuotas.MaxStringContentLength = 20000000;
+
         var endpoint = new EndpointAddress(serviceUri);
         using (var myChannelFactory = new ChannelFactory<IMessageContract>(binding, endpoint)) {
           using (IClientChannel client = (IClientChannel)myChannelFactory.CreateChannel()) {
-            ((IMessageContract)client).SendData(myself, data); //maybe timout exception...
+            for (int i = 0; i < data.GetUpperBound(0) + 1; i++) {
+              ((IMessageContract)client).SendData(myself, data[i]); //maybe timout exception...
+            }
           }
         }

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfMessageService.cs

@@ -27 +27 @@
         var serviceUri = new Uri(baseUri, serviceUrl);
         NetTcpBinding binding = new NetTcpBinding();
+        binding.MaxReceivedMessageSize = 20000000;
+        binding.MaxBufferSize = 20000000;
+        binding.MaxBufferPoolSize = 20000000;
+        binding.ReaderQuotas.MaxArrayLength = 20000000;
+        binding.ReaderQuotas.MaxDepth = 32;
+        binding.ReaderQuotas.MaxStringContentLength = 20000000;
 
         using (var host = new ServiceHost(messageContract, serviceUri)) {

branches/thasling/DistributedGA/DistributedGA.Core/Interface/IMessageContract.cs

@@ -9 +9 @@
 
     [OperationContract]
-    void SendData(PeerInfo sender, byte[][] data);
+    void SendData(PeerInfo sender, byte[] data);
 
     event EventHandler<MessageRecieveEventArgs> MessageRecieved;

branches/thasling/DistributedGA/DistributedGA.Hive/P2PMigrationAnalyzer.cs

@@ -205 +205 @@
           }
         }
-        //each subscope is one emigrand
-        //IScope emigrants = scope.SubScopes[1];
-        //emigrantsList.Add(emigrants);
 
         {
@@ -221 +218 @@
                 msgScope.Variables.Add((IVariable)variable.Clone(cloner));
               }
-              msgScope.ClearParentScopes();
               HeuristicLab.Persistence.Default.Xml.XmlGenerator.Serialize(msgScope, stream);
               message[ei] = stream.GetBuffer();