Index: trunk/sources/HeuristicLab.Hive.Client.Communication/HeuristicLab.Hive.Client.Communication.csproj
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/HeuristicLab.Hive.Client.Communication.csproj (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/HeuristicLab.Hive.Client.Communication.csproj (revision 1366)
@@ -119,5 +119,5 @@
-
+
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Arrays.xsd
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Arrays.xsd (revision 1365)
+++ (revision )
@@ -1,21 +1,0 @@
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Arrays1.xsd
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Arrays1.xsd (revision 1366)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Arrays1.xsd (revision 1366)
@@ -0,0 +1,21 @@
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts.BusinessObjects1.xsd
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts.BusinessObjects1.xsd (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts.BusinessObjects1.xsd (revision 1366)
@@ -21,16 +21,28 @@
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -55,13 +67,40 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd (revision 1366)
@@ -60,4 +60,5 @@
+
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.cs
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.cs (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.cs (revision 1366)
@@ -27,27 +27,27 @@
HeuristicLab.Hive.Contracts.Response EndLogin(System.IAsyncResult result);
- [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendHeartBeat", ReplyAction="http://tempuri.org/IClientCommunicator/SendHeartBeatResponse")]
- HeuristicLab.Hive.Contracts.ResponseHB SendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
-
- [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendHeartBeat", ReplyAction="http://tempuri.org/IClientCommunicator/SendHeartBeatResponse")]
- System.IAsyncResult BeginSendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState);
-
- HeuristicLab.Hive.Contracts.ResponseHB EndSendHeartBeat(System.IAsyncResult result);
-
- [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/PullJob", ReplyAction="http://tempuri.org/IClientCommunicator/PullJobResponse")]
- HeuristicLab.Hive.Contracts.ResponseJob PullJob(System.Guid clientId);
-
- [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/PullJob", ReplyAction="http://tempuri.org/IClientCommunicator/PullJobResponse")]
- System.IAsyncResult BeginPullJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
-
- HeuristicLab.Hive.Contracts.ResponseJob EndPullJob(System.IAsyncResult result);
-
- [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
- HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished);
-
- [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
- System.IAsyncResult BeginSendJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState);
-
- HeuristicLab.Hive.Contracts.ResponseResultReceived EndSendJobResult(System.IAsyncResult result);
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/ProcessHeartBeat", ReplyAction="http://tempuri.org/IClientCommunicator/ProcessHeartBeatResponse")]
+ HeuristicLab.Hive.Contracts.ResponseHB ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
+
+ [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/ProcessHeartBeat", ReplyAction="http://tempuri.org/IClientCommunicator/ProcessHeartBeatResponse")]
+ System.IAsyncResult BeginProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState);
+
+ HeuristicLab.Hive.Contracts.ResponseHB EndProcessHeartBeat(System.IAsyncResult result);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendJob", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResponse")]
+ HeuristicLab.Hive.Contracts.ResponseJob SendJob(System.Guid clientId);
+
+ [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendJob", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResponse")]
+ System.IAsyncResult BeginSendJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
+
+ HeuristicLab.Hive.Contracts.ResponseJob EndSendJob(System.IAsyncResult result);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/ProcessJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/ProcessJobResultResponse")]
+ HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished);
+
+ [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/ProcessJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/ProcessJobResultResponse")]
+ System.IAsyncResult BeginProcessJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState);
+
+ HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessJobResult(System.IAsyncResult result);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/Logout", ReplyAction="http://tempuri.org/IClientCommunicator/LogoutResponse")]
@@ -88,9 +88,9 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
- public partial class SendHeartBeatCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class ProcessHeartBeatCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- public SendHeartBeatCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ public ProcessHeartBeatCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
@@ -107,9 +107,9 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
- public partial class PullJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class SendJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- public PullJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ public SendJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
@@ -126,9 +126,9 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
- public partial class SendJobResultCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+ public partial class ProcessJobResultCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
- public SendJobResultCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ public ProcessJobResultCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
@@ -172,21 +172,21 @@
private System.Threading.SendOrPostCallback onLoginCompletedDelegate;
- private BeginOperationDelegate onBeginSendHeartBeatDelegate;
-
- private EndOperationDelegate onEndSendHeartBeatDelegate;
-
- private System.Threading.SendOrPostCallback onSendHeartBeatCompletedDelegate;
-
- private BeginOperationDelegate onBeginPullJobDelegate;
-
- private EndOperationDelegate onEndPullJobDelegate;
-
- private System.Threading.SendOrPostCallback onPullJobCompletedDelegate;
-
- private BeginOperationDelegate onBeginSendJobResultDelegate;
-
- private EndOperationDelegate onEndSendJobResultDelegate;
-
- private System.Threading.SendOrPostCallback onSendJobResultCompletedDelegate;
+ private BeginOperationDelegate onBeginProcessHeartBeatDelegate;
+
+ private EndOperationDelegate onEndProcessHeartBeatDelegate;
+
+ private System.Threading.SendOrPostCallback onProcessHeartBeatCompletedDelegate;
+
+ private BeginOperationDelegate onBeginSendJobDelegate;
+
+ private EndOperationDelegate onEndSendJobDelegate;
+
+ private System.Threading.SendOrPostCallback onSendJobCompletedDelegate;
+
+ private BeginOperationDelegate onBeginProcessJobResultDelegate;
+
+ private EndOperationDelegate onEndProcessJobResultDelegate;
+
+ private System.Threading.SendOrPostCallback onProcessJobResultCompletedDelegate;
private BeginOperationDelegate onBeginLogoutDelegate;
@@ -217,9 +217,9 @@
public event System.EventHandler LoginCompleted;
- public event System.EventHandler SendHeartBeatCompleted;
-
- public event System.EventHandler PullJobCompleted;
-
- public event System.EventHandler SendJobResultCompleted;
+ public event System.EventHandler ProcessHeartBeatCompleted;
+
+ public event System.EventHandler SendJobCompleted;
+
+ public event System.EventHandler ProcessJobResultCompleted;
public event System.EventHandler LogoutCompleted;
@@ -275,119 +275,119 @@
}
- public HeuristicLab.Hive.Contracts.ResponseHB SendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
- return base.Channel.SendHeartBeat(hbData);
- }
-
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public System.IAsyncResult BeginSendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState) {
- return base.Channel.BeginSendHeartBeat(hbData, callback, asyncState);
- }
-
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public HeuristicLab.Hive.Contracts.ResponseHB EndSendHeartBeat(System.IAsyncResult result) {
- return base.Channel.EndSendHeartBeat(result);
- }
-
- private System.IAsyncResult OnBeginSendHeartBeat(object[] inValues, System.AsyncCallback callback, object asyncState) {
+ public HeuristicLab.Hive.Contracts.ResponseHB ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
+ return base.Channel.ProcessHeartBeat(hbData);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ public System.IAsyncResult BeginProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState) {
+ return base.Channel.BeginProcessHeartBeat(hbData, callback, asyncState);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ public HeuristicLab.Hive.Contracts.ResponseHB EndProcessHeartBeat(System.IAsyncResult result) {
+ return base.Channel.EndProcessHeartBeat(result);
+ }
+
+ private System.IAsyncResult OnBeginProcessHeartBeat(object[] inValues, System.AsyncCallback callback, object asyncState) {
HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData = ((HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData)(inValues[0]));
- return this.BeginSendHeartBeat(hbData, callback, asyncState);
- }
-
- private object[] OnEndSendHeartBeat(System.IAsyncResult result) {
- HeuristicLab.Hive.Contracts.ResponseHB retVal = this.EndSendHeartBeat(result);
+ return this.BeginProcessHeartBeat(hbData, callback, asyncState);
+ }
+
+ private object[] OnEndProcessHeartBeat(System.IAsyncResult result) {
+ HeuristicLab.Hive.Contracts.ResponseHB retVal = this.EndProcessHeartBeat(result);
return new object[] {
retVal};
}
- private void OnSendHeartBeatCompleted(object state) {
- if ((this.SendHeartBeatCompleted != null)) {
+ private void OnProcessHeartBeatCompleted(object state) {
+ if ((this.ProcessHeartBeatCompleted != null)) {
InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
- this.SendHeartBeatCompleted(this, new SendHeartBeatCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
- }
- }
-
- public void SendHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
- this.SendHeartBeatAsync(hbData, null);
- }
-
- public void SendHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, object userState) {
- if ((this.onBeginSendHeartBeatDelegate == null)) {
- this.onBeginSendHeartBeatDelegate = new BeginOperationDelegate(this.OnBeginSendHeartBeat);
- }
- if ((this.onEndSendHeartBeatDelegate == null)) {
- this.onEndSendHeartBeatDelegate = new EndOperationDelegate(this.OnEndSendHeartBeat);
- }
- if ((this.onSendHeartBeatCompletedDelegate == null)) {
- this.onSendHeartBeatCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendHeartBeatCompleted);
- }
- base.InvokeAsync(this.onBeginSendHeartBeatDelegate, new object[] {
- hbData}, this.onEndSendHeartBeatDelegate, this.onSendHeartBeatCompletedDelegate, userState);
- }
-
- public HeuristicLab.Hive.Contracts.ResponseJob PullJob(System.Guid clientId) {
- return base.Channel.PullJob(clientId);
- }
-
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public System.IAsyncResult BeginPullJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
- return base.Channel.BeginPullJob(clientId, callback, asyncState);
- }
-
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public HeuristicLab.Hive.Contracts.ResponseJob EndPullJob(System.IAsyncResult result) {
- return base.Channel.EndPullJob(result);
- }
-
- private System.IAsyncResult OnBeginPullJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
+ this.ProcessHeartBeatCompleted(this, new ProcessHeartBeatCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+ }
+ }
+
+ public void ProcessHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
+ this.ProcessHeartBeatAsync(hbData, null);
+ }
+
+ public void ProcessHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, object userState) {
+ if ((this.onBeginProcessHeartBeatDelegate == null)) {
+ this.onBeginProcessHeartBeatDelegate = new BeginOperationDelegate(this.OnBeginProcessHeartBeat);
+ }
+ if ((this.onEndProcessHeartBeatDelegate == null)) {
+ this.onEndProcessHeartBeatDelegate = new EndOperationDelegate(this.OnEndProcessHeartBeat);
+ }
+ if ((this.onProcessHeartBeatCompletedDelegate == null)) {
+ this.onProcessHeartBeatCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnProcessHeartBeatCompleted);
+ }
+ base.InvokeAsync(this.onBeginProcessHeartBeatDelegate, new object[] {
+ hbData}, this.onEndProcessHeartBeatDelegate, this.onProcessHeartBeatCompletedDelegate, userState);
+ }
+
+ public HeuristicLab.Hive.Contracts.ResponseJob SendJob(System.Guid clientId) {
+ return base.Channel.SendJob(clientId);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ public System.IAsyncResult BeginSendJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
+ return base.Channel.BeginSendJob(clientId, callback, asyncState);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ public HeuristicLab.Hive.Contracts.ResponseJob EndSendJob(System.IAsyncResult result) {
+ return base.Channel.EndSendJob(result);
+ }
+
+ private System.IAsyncResult OnBeginSendJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
System.Guid clientId = ((System.Guid)(inValues[0]));
- return this.BeginPullJob(clientId, callback, asyncState);
- }
-
- private object[] OnEndPullJob(System.IAsyncResult result) {
- HeuristicLab.Hive.Contracts.ResponseJob retVal = this.EndPullJob(result);
+ return this.BeginSendJob(clientId, callback, asyncState);
+ }
+
+ private object[] OnEndSendJob(System.IAsyncResult result) {
+ HeuristicLab.Hive.Contracts.ResponseJob retVal = this.EndSendJob(result);
return new object[] {
retVal};
}
- private void OnPullJobCompleted(object state) {
- if ((this.PullJobCompleted != null)) {
+ private void OnSendJobCompleted(object state) {
+ if ((this.SendJobCompleted != null)) {
InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
- this.PullJobCompleted(this, new PullJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
- }
- }
-
- public void PullJobAsync(System.Guid clientId) {
- this.PullJobAsync(clientId, null);
- }
-
- public void PullJobAsync(System.Guid clientId, object userState) {
- if ((this.onBeginPullJobDelegate == null)) {
- this.onBeginPullJobDelegate = new BeginOperationDelegate(this.OnBeginPullJob);
- }
- if ((this.onEndPullJobDelegate == null)) {
- this.onEndPullJobDelegate = new EndOperationDelegate(this.OnEndPullJob);
- }
- if ((this.onPullJobCompletedDelegate == null)) {
- this.onPullJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnPullJobCompleted);
- }
- base.InvokeAsync(this.onBeginPullJobDelegate, new object[] {
- clientId}, this.onEndPullJobDelegate, this.onPullJobCompletedDelegate, userState);
- }
-
- public HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished) {
- return base.Channel.SendJobResult(clientId, jobId, result, percentage, exception, finished);
- }
-
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public System.IAsyncResult BeginSendJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState) {
- return base.Channel.BeginSendJobResult(clientId, jobId, result, percentage, exception, finished, callback, asyncState);
- }
-
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public HeuristicLab.Hive.Contracts.ResponseResultReceived EndSendJobResult(System.IAsyncResult result) {
- return base.Channel.EndSendJobResult(result);
- }
-
- private System.IAsyncResult OnBeginSendJobResult(object[] inValues, System.AsyncCallback callback, object asyncState) {
+ this.SendJobCompleted(this, new SendJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+ }
+ }
+
+ public void SendJobAsync(System.Guid clientId) {
+ this.SendJobAsync(clientId, null);
+ }
+
+ public void SendJobAsync(System.Guid clientId, object userState) {
+ if ((this.onBeginSendJobDelegate == null)) {
+ this.onBeginSendJobDelegate = new BeginOperationDelegate(this.OnBeginSendJob);
+ }
+ if ((this.onEndSendJobDelegate == null)) {
+ this.onEndSendJobDelegate = new EndOperationDelegate(this.OnEndSendJob);
+ }
+ if ((this.onSendJobCompletedDelegate == null)) {
+ this.onSendJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendJobCompleted);
+ }
+ base.InvokeAsync(this.onBeginSendJobDelegate, new object[] {
+ clientId}, this.onEndSendJobDelegate, this.onSendJobCompletedDelegate, userState);
+ }
+
+ public HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished) {
+ return base.Channel.ProcessJobResult(clientId, jobId, result, percentage, exception, finished);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ public System.IAsyncResult BeginProcessJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState) {
+ return base.Channel.BeginProcessJobResult(clientId, jobId, result, percentage, exception, finished, callback, asyncState);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ public HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessJobResult(System.IAsyncResult result) {
+ return base.Channel.EndProcessJobResult(result);
+ }
+
+ private System.IAsyncResult OnBeginProcessJobResult(object[] inValues, System.AsyncCallback callback, object asyncState) {
System.Guid clientId = ((System.Guid)(inValues[0]));
long jobId = ((long)(inValues[1]));
@@ -396,35 +396,35 @@
System.Exception exception = ((System.Exception)(inValues[4]));
bool finished = ((bool)(inValues[5]));
- return this.BeginSendJobResult(clientId, jobId, result, percentage, exception, finished, callback, asyncState);
- }
-
- private object[] OnEndSendJobResult(System.IAsyncResult result) {
- HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndSendJobResult(result);
+ return this.BeginProcessJobResult(clientId, jobId, result, percentage, exception, finished, callback, asyncState);
+ }
+
+ private object[] OnEndProcessJobResult(System.IAsyncResult result) {
+ HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndProcessJobResult(result);
return new object[] {
retVal};
}
- private void OnSendJobResultCompleted(object state) {
- if ((this.SendJobResultCompleted != null)) {
+ private void OnProcessJobResultCompleted(object state) {
+ if ((this.ProcessJobResultCompleted != null)) {
InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
- this.SendJobResultCompleted(this, new SendJobResultCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
- }
- }
-
- public void SendJobResultAsync(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished) {
- this.SendJobResultAsync(clientId, jobId, result, percentage, exception, finished, null);
- }
-
- public void SendJobResultAsync(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, object userState) {
- if ((this.onBeginSendJobResultDelegate == null)) {
- this.onBeginSendJobResultDelegate = new BeginOperationDelegate(this.OnBeginSendJobResult);
- }
- if ((this.onEndSendJobResultDelegate == null)) {
- this.onEndSendJobResultDelegate = new EndOperationDelegate(this.OnEndSendJobResult);
- }
- if ((this.onSendJobResultCompletedDelegate == null)) {
- this.onSendJobResultCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendJobResultCompleted);
- }
- base.InvokeAsync(this.onBeginSendJobResultDelegate, new object[] {
+ this.ProcessJobResultCompleted(this, new ProcessJobResultCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
+ }
+ }
+
+ public void ProcessJobResultAsync(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished) {
+ this.ProcessJobResultAsync(clientId, jobId, result, percentage, exception, finished, null);
+ }
+
+ public void ProcessJobResultAsync(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, object userState) {
+ if ((this.onBeginProcessJobResultDelegate == null)) {
+ this.onBeginProcessJobResultDelegate = new BeginOperationDelegate(this.OnBeginProcessJobResult);
+ }
+ if ((this.onEndProcessJobResultDelegate == null)) {
+ this.onEndProcessJobResultDelegate = new EndOperationDelegate(this.OnEndProcessJobResult);
+ }
+ if ((this.onProcessJobResultCompletedDelegate == null)) {
+ this.onProcessJobResultCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnProcessJobResultCompleted);
+ }
+ base.InvokeAsync(this.onBeginProcessJobResultDelegate, new object[] {
clientId,
jobId,
@@ -432,5 +432,5 @@
percentage,
exception,
- finished}, this.onEndSendJobResultDelegate, this.onSendJobResultCompletedDelegate, userState);
+ finished}, this.onEndProcessJobResultDelegate, this.onProcessJobResultCompletedDelegate, userState);
}
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.svcmap
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.svcmap (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.svcmap (revision 1366)
@@ -18,14 +18,14 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration.svcinfo
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration.svcinfo (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration.svcinfo (revision 1366)
@@ -6,5 +6,5 @@
-
+
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration91.svcinfo
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration91.svcinfo (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration91.svcinfo (revision 1366)
@@ -1,4 +1,4 @@
-
+
@@ -107,8 +107,8 @@
-
+
- net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator
+ net.tcp://10.20.53.2:9000/HiveServer/ClientCommunicator
@@ -137,5 +137,5 @@
- mse08003@fhs-hagenberg.ac.at
+ mse08023@fhs-hagenberg.ac.at
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service1.wsdl
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service1.wsdl (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service1.wsdl (revision 1366)
@@ -50,21 +50,21 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -79,15 +79,15 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -109,6 +109,6 @@
-
-
+
+
@@ -118,6 +118,6 @@
-
-
+
+
@@ -127,6 +127,6 @@
-
-
+
+
@@ -148,9 +148,9 @@
-
+
- net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator
+ net.tcp://10.20.53.2:9000/HiveServer/ClientCommunicator
- mse08003@fhs-hagenberg.ac.at
+ mse08023@fhs-hagenberg.ac.at
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service2.xsd
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service2.xsd (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service2.xsd (revision 1366)
@@ -19,5 +19,5 @@
-
+
@@ -26,12 +26,12 @@
-
+
-
+
-
+
@@ -40,12 +40,12 @@
-
+
-
+
-
+
@@ -59,8 +59,8 @@
-
+
-
+
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs (revision 1366)
@@ -79,7 +79,7 @@
proxy.LoginCompleted += new EventHandler(proxy_LoginCompleted);
- proxy.PullJobCompleted += new EventHandler(proxy_PullJobCompleted);
- proxy.SendJobResultCompleted += new EventHandler(proxy_SendJobResultCompleted);
- proxy.SendHeartBeatCompleted += new EventHandler(proxy_SendHeartBeatCompleted);
+ proxy.SendJobCompleted += new EventHandler(proxy_SendJobCompleted);
+ proxy.ProcessJobResultCompleted += new EventHandler(proxy_ProcessJobResultCompleted);
+ proxy.ProcessHeartBeatCompleted += new EventHandler(proxy_ProcessHeartBeatCompleted);
proxy.Open();
@@ -168,10 +168,10 @@
///
#region PullJob
- public event System.EventHandler PullJobCompleted;
+ public event System.EventHandler PullJobCompleted;
public void PullJobAsync(Guid guid) {
if (ConnState == NetworkEnum.WcfConnState.Loggedin)
- proxy.PullJobAsync(guid);
- }
- void proxy_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
+ proxy.SendJobAsync(guid);
+ }
+ void proxy_SendJobCompleted(object sender, SendJobCompletedEventArgs e) {
if (e.Error == null)
PullJobCompleted(sender, e);
@@ -185,10 +185,10 @@
///
#region SendJobResults
- public event System.EventHandler SendJobResultCompleted;
+ public event System.EventHandler SendJobResultCompleted;
public void SendJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
if (ConnState == NetworkEnum.WcfConnState.Loggedin)
- proxy.SendJobResultAsync(clientId, jobId, result, percentage, exception, finished);
- }
- private void proxy_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
+ proxy.ProcessJobResultAsync(clientId, jobId, result, percentage, exception, finished);
+ }
+ private void proxy_ProcessJobResultCompleted(object sender, ProcessJobResultCompletedEventArgs e) {
if (e.Error == null)
SendJobResultCompleted(sender, e);
@@ -204,11 +204,11 @@
#region Heartbeat
- public event System.EventHandler SendHeartBeatCompleted;
+ public event System.EventHandler SendHeartBeatCompleted;
public void SendHeartBeatAsync(HeartBeatData hbd) {
if (ConnState == NetworkEnum.WcfConnState.Loggedin)
- proxy.SendHeartBeatAsync(hbd);
- }
-
- private void proxy_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
+ proxy.ProcessHeartBeatAsync(hbd);
+ }
+
+ private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
if (e.Error == null)
SendHeartBeatCompleted(sender, e);
@@ -223,14 +223,14 @@
///
#region SendJobResults
- public event System.EventHandler SendStoredJobResultCompleted;
+ public event System.EventHandler SendStoredJobResultCompleted;
public void SendStoredJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
if (ConnState == NetworkEnum.WcfConnState.Loggedin)
//TODO: some sort of algo for the stored jobs
- proxy.SendJobResultAsync(clientId, jobId, result, percentage, exception, finished);
+ proxy.ProcessJobResultAsync(clientId, jobId, result, percentage, exception, finished);
}
#endregion
public ResponseResultReceived SendStoredJobResultsSync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
- return proxy.SendJobResult(clientId, jobId, result, percentage, exception, finished);
+ return proxy.ProcessJobResult(clientId, jobId, result, percentage, exception, finished);
}
}
Index: trunk/sources/HeuristicLab.Hive.Client.Communication/app.config
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Communication/app.config (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Communication/app.config (revision 1366)
@@ -22,9 +22,9 @@
-
-
+
Index: trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs (revision 1366)
@@ -82,6 +82,6 @@
wcfService = WcfService.Instance;
wcfService.LoginCompleted += new EventHandler(wcfService_LoginCompleted);
- wcfService.PullJobCompleted += new EventHandler(wcfService_PullJobCompleted);
- wcfService.SendJobResultCompleted += new EventHandler(wcfService_SendJobResultCompleted);
+ wcfService.PullJobCompleted += new EventHandler(wcfService_PullJobCompleted);
+ wcfService.SendJobResultCompleted += new EventHandler(wcfService_SendJobResultCompleted);
wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
@@ -199,5 +199,5 @@
}
- void wcfService_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
+ void wcfService_PullJobCompleted(object sender, SendJobCompletedEventArgs e) {
if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
bool sandboxed = true;
@@ -227,5 +227,5 @@
//Todo: Remove intellgent stuff from the async event and move it to the main thread (message queue)
//Todo: Seperate this method into 2: Finished jobs and Snapshots
- void wcfService_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
+ void wcfService_SendJobResultCompleted(object sender, ProcessJobResultCompletedEventArgs e) {
if (e.Result.Success) {
lock (Locker) {
Index: trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs
===================================================================
--- trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs (revision 1365)
+++ trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs (revision 1366)
@@ -61,5 +61,5 @@
heartbeatTimer.Elapsed += new ElapsedEventHandler(heartbeatTimer_Elapsed);
wcfService = WcfService.Instance;
- wcfService.SendHeartBeatCompleted += new EventHandler(wcfService_SendHeartBeatCompleted);
+ wcfService.SendHeartBeatCompleted += new EventHandler(wcfService_SendHeartBeatCompleted);
heartbeatTimer.Start();
}
@@ -88,5 +88,5 @@
}
- void wcfService_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
+ void wcfService_SendHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
System.Diagnostics.Debug.WriteLine("Heartbeat received! ");
e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));