Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/19/10 09:17:24 (15 years ago)
Author:
kgrading
Message:

added minor speedups and better transaction handling to the server (#828)

Location:
branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/HeuristicLab.Hive.Client.Console-3.2.csproj

    r3022 r3931  
    202202    <None Include="Properties\DataSources\Calendar.Appointment.datasource" />
    203203    <None Include="Resources\shutdown-icon.png" />
    204     <None Include="Service References\ClientService\Calendar.xsd" />
    205     <None Include="Service References\ClientService\System.Drawing.xsd" />
    206204  </ItemGroup>
    207205  <ItemGroup>
    … …  
    213211  <ItemGroup>
    214212    <None Include="Resources\exit-48.png" />
     213    <None Include="Service References\ClientService\Calendar1.xsd" />
     214    <None Include="Service References\ClientService\System.Drawing1.xsd" />
    215215  </ItemGroup>
    216216  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/HiveClientConsole.cs

    r3220 r3931  
    187187    }
    188188
    189     private void UpdateGraph(JobStatus[] jobs)
     189    private void UpdateGraph(StatusCommons sc)
    190190    {
    191191      ZedGraphControl zgc = new ZedGraphControl();
    … …  
    208208      double done = 0;
    209209
    210       if (jobs.Length == 0)
     210     
     211      /*if (jobs.Length == 0)
    211212      {
    212213        myPane.AddPieSlice(100, Color.Green, 0.1, "");
    … …  
    217218        {
    218219          allProgress += jobs[i].Progress;
    219         }
    220 
    221         done = allProgress / jobs.Length;
    222 
    223         myPane.AddPieSlice(done, Color.Green, 0, "");
    224         myPane.AddPieSlice(1 - done, Color.Red, 0, "");
    225       }
     220        } */
     221
     222        //done = allProgress / jobs.Length;
     223
     224      myPane.AddPieSlice((sc.FreeCores / (double) sc.TotalCores), Color.Red, 0, "");
     225      myPane.AddPieSlice(((sc.TotalCores - sc.FreeCores) / (double)sc.TotalCores), Color.Green, 0, "");
     226     // }
    226227      //Hides the slice labels
    227228      PieItem.Default.LabelType = PieLabelType.None;
    … …  
    586587        }
    587588
    588         UpdateGraph(sc.Jobs);
     589        UpdateGraph(sc);
    589590
    590591        if (sc.Status == NetworkEnumWcfConnState.Connected || sc.Status == NetworkEnumWcfConnState.Loggedin)

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/HeuristicLab.Hive.Client.Core.ClientConsoleService.xsd

    r1449 r3931  
    77      <xs:element minOccurs="0" name="ClientGuid" type="ser:guid" />
    88      <xs:element minOccurs="0" name="ConnectedSince" type="xs:dateTime" />
     9      <xs:element minOccurs="0" name="FreeCores" type="xs:int" />
    910      <xs:element minOccurs="0" name="Jobs" nillable="true" type="tns:ArrayOfJobStatus" />
    1011      <xs:element minOccurs="0" name="JobsAborted" type="xs:int" />
    … …  
    1213      <xs:element minOccurs="0" name="JobsFetched" type="xs:int" />
    1314      <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Client.Common" minOccurs="0" name="Status" type="q1:NetworkEnum.WcfConnState" />
     15      <xs:element minOccurs="0" name="TotalCores" type="xs:int" />
    1416    </xs:sequence>
    1517  </xs:complexType>

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/Reference.cs

    r2023 r3931  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3082
     4//     Runtime Version:2.0.50727.4927
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    3131       
    3232        [System.Runtime.Serialization.OptionalFieldAttribute()]
     33        private int FreeCoresField;
     34       
     35        [System.Runtime.Serialization.OptionalFieldAttribute()]
    3336        private HeuristicLab.Hive.Client.Console.ClientService.JobStatus[] JobsField;
    3437       
    … …  
    4447        [System.Runtime.Serialization.OptionalFieldAttribute()]
    4548        private HeuristicLab.Hive.Client.Console.ClientService.NetworkEnumWcfConnState StatusField;
     49       
     50        [System.Runtime.Serialization.OptionalFieldAttribute()]
     51        private int TotalCoresField;
    4652       
    4753        [global::System.ComponentModel.BrowsableAttribute(false)]
    … …  
    8288       
    8389        [System.Runtime.Serialization.DataMemberAttribute()]
     90        public int FreeCores {
     91            get {
     92                return this.FreeCoresField;
     93            }
     94            set {
     95                if ((this.FreeCoresField.Equals(value) != true)) {
     96                    this.FreeCoresField = value;
     97                    this.RaisePropertyChanged("FreeCores");
     98                }
     99            }
     100        }
     101       
     102        [System.Runtime.Serialization.DataMemberAttribute()]
    84103        public HeuristicLab.Hive.Client.Console.ClientService.JobStatus[] Jobs {
    85104            get {
    … …  
    142161                    this.StatusField = value;
    143162                    this.RaisePropertyChanged("Status");
     163                }
     164            }
     165        }
     166       
     167        [System.Runtime.Serialization.DataMemberAttribute()]
     168        public int TotalCores {
     169            get {
     170                return this.TotalCoresField;
     171            }
     172            set {
     173                if ((this.TotalCoresField.Equals(value) != true)) {
     174                    this.TotalCoresField = value;
     175                    this.RaisePropertyChanged("TotalCores");
    144176                }
    145177            }

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/Reference.svcmap

    r2023 r3931  
    2626    <MetadataFile FileName="HeuristicLab.Hive.Client.Core.ClientConsoleService.xsd" MetadataType="Schema" ID="36748734-59b6-4ba4-950d-66ca1a4fc8bb" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
    2727    <MetadataFile FileName="HeuristicLab.Hive.Client.Common.xsd" MetadataType="Schema" ID="0c1369fa-d4cc-4149-b202-00da9dd35972" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
    28     <MetadataFile FileName="Calendar.xsd" MetadataType="Schema" ID="09fa9f67-e082-4dcb-9c41-a7a3f0fb7aef" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
    29     <MetadataFile FileName="System.Drawing.xsd" MetadataType="Schema" ID="70cfc9bf-b4a8-419b-8c1f-379c0d78f9d2" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
     28    <MetadataFile FileName="Calendar1.xsd" MetadataType="Schema" ID="5ec19e4e-fed1-451d-971e-01b8df8dcb0a" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
     29    <MetadataFile FileName="System.Drawing1.xsd" MetadataType="Schema" ID="2aa97a8b-a12e-47ca-8bb7-93a3404f40e5" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
    3030  </Metadata>
    3131  <Extensions>

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/configuration.svcinfo

    r2023 r3931  
    66  </bindings>
    77  <endpoints>
    8     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientConsoleCommunicator&quot; contract=&quot;ClientService.IClientConsoleCommunicator&quot; name=&quot;NetTcpBinding_IClientConsoleCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;mse08004@fhs-hagenberg.ac.at&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientConsoleCommunicator&quot; contract=&quot;ClientService.IClientConsoleCommunicator&quot; name=&quot;NetTcpBinding_IClientConsoleCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;mse08004@fhs-hagenberg.ac.at&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator" />
     8    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientConsoleCommunicator&quot; contract=&quot;ClientService.IClientConsoleCommunicator&quot; name=&quot;NetTcpBinding_IClientConsoleCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;semteX-PC\semteX&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientConsoleCommunicator&quot; contract=&quot;ClientService.IClientConsoleCommunicator&quot; name=&quot;NetTcpBinding_IClientConsoleCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;semteX-PC\semteX&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator" />
    99  </endpoints>
    1010</configurationSnapshot>

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/configuration91.svcinfo

    r2023 r3931  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="LJHqHAg9UO+arib7mQMPUcNSFqQ=">
     2<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="BEhVTwOR+7957ZuwDJOXr3mn9MQ=">
    33  <bindingConfigurations>
    44    <bindingConfiguration bindingType="netTcpBinding" name="NetTcpBinding_IClientConsoleCommunicator">
    … …  
    9393        <property path="/security/transport/protectionLevel" isComplexType="false" isExplicitlyDefined="true" clrType="System.Net.Security.ProtectionLevel, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    9494          <serializedValue>EncryptAndSign</serializedValue>
     95        </property>
     96        <property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     97          <serializedValue>System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement</serializedValue>
     98        </property>
     99        <property path="/security/transport/extendedProtectionPolicy/policyEnforcement" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.PolicyEnforcement, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     100          <serializedValue>Never</serializedValue>
     101        </property>
     102        <property path="/security/transport/extendedProtectionPolicy/protectionScenario" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.ProtectionScenario, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     103          <serializedValue>TransportSelected</serializedValue>
     104        </property>
     105        <property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     106          <serializedValue>(Collection)</serializedValue>
    95107        </property>
    96108        <property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.MessageSecurityOverTcpElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    … …  
    137149        </property>
    138150        <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    139           <serializedValue>mse08004@fhs-hagenberg.ac.at</serializedValue>
     151          <serializedValue>semteX-PC\semteX</serializedValue>
    140152        </property>
    141153        <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/service.wsdl

    r2023 r3931  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" name="ClientConsoleCommunicator" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
     2<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" name="ClientConsoleCommunicator" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
    33  <wsp:Policy wsu:Id="NetTcpBinding_IClientConsoleCommunicator_policy">
    44    <wsp:ExactlyOne>
    … …  
    190190        <wsa10:Address>net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator</wsa10:Address>
    191191        <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
    192           <Upn>mse08004@fhs-hagenberg.ac.at</Upn>
     192          <Upn>semteX-PC\semteX</Upn>
    193193        </Identity>
    194194      </wsa10:EndpointReference>

  • branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/app.config

    r2023 r3931  
    2727                                          enabled="false" />
    2828                                   <security mode="Transport">
    29                                           <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
     29                                          <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign">
     30                                                 <extendedProtectionPolicy policyEnforcement="Never" />
     31                                          </transport>
    3032                                          <message clientCredentialType="Windows" />
    3133                                   </security>
    … …  
    3840                            contract="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator">
    3941                            <identity>
    40                                    <userPrincipalName value="mse08004@fhs-hagenberg.ac.at" />
     42                                   <userPrincipalName value="semteX-PC\semteX" />
    4143                            </identity>
    4244                     </endpoint>
Note: See TracChangeset for help on using the changeset viewer.