Changeset 13557

Timestamp:

01/19/16 12:45:18 (9 years ago)

Author:

thasling

Message:

Implemented P2PTask-class
Changed communication protocoll http --> net.tcp
Logger is now Parameter of P2PTask

Location:

branches/thasling/DistributedGA

Files:

• DistributedGA.ContactServer.Host/Program.cs (modified) (1 diff)
• DistributedGA.ContactServer/App.config (modified) (1 diff)
• DistributedGA.ContactServer/ContactServiceImpl.cs (modified) (1 diff)
• DistributedGA.Core.Host/App.config (modified) (1 diff)
• DistributedGA.Core.Host/DistributedGA.Core.Host.csproj (modified) (1 diff)
• DistributedGA.Core.Host/Program.cs (modified) (2 diffs)
• DistributedGA.Core/Implementation/WcfMessageSender.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/WcfMessageService.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/WcfPeerListManager.cs (modified) (1 diff)
• DistributedGA.Hive/P2PTask.cs (modified) (4 diffs)
• DistributedGA.v12.suo (modified) (previous)

branches/thasling/DistributedGA/DistributedGA.ContactServer.Host/Program.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.ServiceModel;
-using System.ServiceModel.Description;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace DistributedGA.ContactServer.Host
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            string baseAddress = string.Empty;
-            if(args.GetUpperBound(0) > -1)
-            {
-               baseAddress = args[0];
-            }
-            if (string.IsNullOrWhiteSpace(baseAddress))
-            {
-                baseAddress = "http://localhost:9090/DistributedGA.ContactServer/ContactService";
-            }
-            using (ServiceHost host = new ServiceHost(typeof(ContactServiceImpl), new Uri[] { new Uri(baseAddress) }))
-            {
-                // Enable metadata publishing.
-                ServiceMetadataBehavior smb = new ServiceMetadataBehavior();
-                smb.HttpGetEnabled = true;
-                smb.MetadataExporter.PolicyVersion = PolicyVersion.Policy15;
-                host.Description.Behaviors.Add(smb);
+namespace DistributedGA.ContactServer.Host {
+  class Program {
+    static void Main(string[] args) {
+      string baseAddress = string.Empty;
+      if (args.GetUpperBound(0) > -1) {
+        baseAddress = args[0];
+      }
+      if (string.IsNullOrWhiteSpace(baseAddress)) {
+        baseAddress = "net.tcp://localhost:9090/DistributedGA.ContactServer/ContactService";
+      }
+      using (ServiceHost host = new ServiceHost(typeof(ContactServiceImpl), new Uri[] { new Uri(baseAddress) })) {
+        // Enable metadata publishing.
 
-                // Open the ServiceHost to start listening for messages. Since
-                // no endpoints are explicitly configured, the runtime will create
-                // one endpoint per base address for each service contract implemented
-                // by the service.
-                
-                host.Open();
 
-                Console.WriteLine("The service is ready at {0}", baseAddress);
-                Console.WriteLine("Press <Enter> to stop the service.");
-                Console.ReadLine();
+        // Open the ServiceHost to start listening for messages. Since
+        // no endpoints are explicitly configured, the runtime will create
+        // one endpoint per base address for each service contract implemented
+        // by the service.
 
-                // Close the ServiceHost.
-                host.Close();
-            }
-        }
+        host.Open();
+
+        Console.WriteLine("The service is ready at {0}", baseAddress);
+        Console.WriteLine("Press <Enter> to stop the service.");
+        Console.ReadLine();
+
+        // Close the ServiceHost.
+        host.Close();
+      }
     }
+  }
 }

branches/thasling/DistributedGA/DistributedGA.ContactServer/App.config

@@ -15 +15 @@
         <binding name="LargeObjects" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" />
       </basicHttpBinding>
+      <netTcpBinding>
+        <binding name="LargeObjects" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" />
+      </netTcpBinding>
     </bindings>
     <services>
       <service name="DistributedGA.ContactServer.ContactServiceImpl">
-        <endpoint bindingConfiguration="LargeObjects" address="ContactService" binding="basicHttpBinding" contract="DistributedGA.ContactServer.IContactService"/>
+        <endpoint bindingConfiguration="LargeObjects" address="ContactService" binding="netTcpBinding" contract="DistributedGA.ContactServer.IContactService"/>
         <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:9090/DistributedGA.ContactServer" />
+            <add baseAddress="net.tcp://localhost:9090/DistributedGA.ContactServer" />
           </baseAddresses>
         </host>

branches/thasling/DistributedGA/DistributedGA.ContactServer/ContactServiceImpl.cs

@@ -64 +64 @@
 
     private void UpdateHeartbeat(PeerInfo source) {
+      Console.WriteLine("hb from {0}:{1}", source.IpAddress, source.Port);
       DateTime now = DateTime.Now;
       allPeers.AddOrUpdate(source, now, (k, v) => v = now);

branches/thasling/DistributedGA/DistributedGA.Core.Host/App.config

@@ -5 +5 @@
     </startup>
   <appSettings>
-    <add key="ContactServerURL" value="http://localhost:9090/DistributedGA.ContactServer/ContactService"/>
+    <add key="ContactServerURL" value="net.tcp://localhost:9090/DistributedGA.ContactServer/ContactService"/>
     <add key="LanIpPrefix" value="10."/>
   </appSettings>

branches/thasling/DistributedGA/DistributedGA.Core.Host/DistributedGA.Core.Host.csproj

@@ -34 +34 @@
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

branches/thasling/DistributedGA/DistributedGA.Core.Host/Program.cs

@@ -1 +1 @@
 using System;
+using System.Configuration;
 using System.Threading;
 using DistributedGA.Core.Domain;
@@ -10 +11 @@
       try {
         Console.WriteLine("Starting peer...");
+        string ipPrefix = ConfigurationManager.AppSettings["LanIpPrefix"];
+        string serverUrl = ConfigurationManager.AppSettings["ContactServerURL"];
+
+
         IMessageHandler h = new PeerNetworkMessageHandler();
-        h.Init("","");
+        h.Init(ipPrefix, serverUrl);
         PeerInfo pi = h.GetPeerInfo();
         Console.WriteLine(string.Format("Peer is hostet at IP: {0} and port: {1}", pi.IpAddress, pi.Port));

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

@@ -19 +19 @@
     private IMessageContract CreateServerClient(string ip, int port) {
       var serviceUrl = "DistributedGA.svc";
-      var baseUri = new Uri(string.Concat("http://", ip, ":", port, "/DistributedGA"));
+      var baseUri = new Uri(string.Concat("net.tcp://", ip, ":", port, "/DistributedGA"));
       var serviceUri = new Uri(baseUri, serviceUrl);
 
-      var binding = new BasicHttpBinding();
+      var binding = new NetTcpBinding();
       var endpoint = new EndpointAddress(serviceUri);
       var myChannelFactory = new ChannelFactory<IMessageContract>(binding, endpoint);

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

@@ -24 +24 @@
       var serviceUrl = "DistributedGA.svc";
       new Thread(() => {
-        var baseUri = new Uri(string.Concat("http://", ip, ":", port, "/DistributedGA"));
+        var baseUri = new Uri(string.Concat("net.tcp://", ip, ":", port, "/DistributedGA"));
         var serviceUri = new Uri(baseUri, serviceUrl);
-        BasicHttpBinding binding = new BasicHttpBinding();
+        NetTcpBinding binding = new NetTcpBinding();
         //using (var host = new ServiceHost(typeof(MessageContractImpl), serviceUri))
 

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

@@ -33 +33 @@
 
     private IContactService CreateClient() {
-      var binding = new BasicHttpBinding();
+      var binding = new NetTcpBinding();
       var endpoint = new EndpointAddress(serverString);
       var myChannelFactory = new ChannelFactory<IContactService>(binding, endpoint);

branches/thasling/DistributedGA/DistributedGA.Hive/P2PTask.cs

@@ -19 +19 @@
   public class P2PTask : ParameterizedNamedItem, IOptimizer {
 
-    [Storable]
-    private Log log;
+
     [Storable]
     private DateTime startTime;
@@ -31 +30 @@
     protected P2PTask(P2PTask original, Cloner cloner)
       : base(original, cloner) {
-      log = cloner.Clone(original.log);
       startTime = original.startTime;
       runCollection = cloner.Clone(original.runCollection);
@@ -41 +39 @@
 
       Parameters.Add(new ValueParameter<StringValue>("LanIpPrefix", "", new StringValue("10.")));
-      Parameters.Add(new ValueParameter<StringValue>("ContactServerURL", "", new StringValue("http://10.42.1.150:9090/DistributedGA.ContactServer/ContactService")));
-
-      log = new Log();
+      Parameters.Add(new ValueParameter<StringValue>("ContactServerURL", "", new StringValue("net.tcp://10.42.1.150:9090/DistributedGA.ContactServer/ContactService")));
+      Parameters.Add(new ValueParameter<Log>("Log", "", new Log()));
+
     }
 
@@ -83 +81 @@
         OnStarted();
 
+        var log = ((Log)(Parameters["Log"].ActualValue));
+
+
         try {
+
           log.LogMessage("Starting peer...");
           IMessageHandler h = new PeerNetworkMessageHandler();