X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop_server.c;h=1fa3135dfabd3319b2cbdfc43606ee179ed0a5c5;hp=ea4579164d0de297e6b3f790aca0746399fb819c;hb=d7dbaf20818533d5c2ed93907da01859e3a786bf;hpb=1ec38f9c8dc24e71cd00a7e8fb1bfb04c617fb9b

diff --git a/nlsop_server.c b/nlsop_server.c
index ea45791..1fa3135 100644
--- a/nlsop_server.c
+++ b/nlsop_server.c
@@ -124,15 +124,25 @@ int save_job(t_net *net,int channel,t_job *job,unsigned char dc) {
   int ret;
   d3_lattice d3l;
   info info;
+  unsigned char data;
+
+  printf("receiving data from client (%d)\n",job->size);
+  data=DATA_OK;
 
   ret=network_receive_chan(net,channel,job->ac,job->size*sizeof(unsigned char));
   if(ret==N_ERROR) printf("FATAL: getting ac status failed\n");
+  network_send_chan(net,channel,&data,sizeof(unsigned char));
+  printf("debug: got ac\n");
   ret=network_receive_chan(net,channel,(unsigned char *)job->cc,
                            job->size*sizeof(int));
   if(ret==N_ERROR) printf("FATAL: getting cc failed\n");
+  network_send_chan(net,channel,&data,sizeof(unsigned char));
+  printf("debug: got cc\n");
   ret=network_receive_chan(net,channel,(unsigned char *)&(job->step),
                            sizeof(int));
   if(ret==N_ERROR) printf("FATAL: getting step number failed\n");
+  network_send_chan(net,channel,&data,sizeof(unsigned char));
+  printf("debug: got steps\n");
 
   if(dc!=DC_QUIT) {
     snprintf(filename,128,"./data/nlsop_b%f_c%f_s%f_ds%d_dr%f_-_%d_of_%d.save",
@@ -221,8 +231,11 @@ int send_status(t_net *net,int chan,t_list *jl) {
   int i;
 
   data=GUI_INFO;
+
   count=list_count(jl);
 
+  printf("sending job info\n");
+
   network_send_chan(net,chan,&data,sizeof(unsigned char));
   network_send_chan(net,chan,(unsigned char *)&count,sizeof(int));
 
@@ -326,7 +339,7 @@ int distribute_jobs(t_event *event,void *allineed) {
 
   t_net *net;
   t_list *c_list,*g_list,*job;
-  int count_j,count_c;
+  int count_j,count_c,min;
   t_job *j;
   t_client *c;
   unsigned char data;
@@ -340,14 +353,39 @@ int distribute_jobs(t_event *event,void *allineed) {
   g_list=(t_list *)addr[2];
   job=(t_list *)addr[3];
 
-  printf("d: distributing jobs ...\n");
+  list_reset(job);
+  list_reset(c_list);
+
+  count_j=0;
+  count_c=0;
+
+  if((c_list->current==NULL)||(job->current==NULL)) return 2;
 
-  count_j=list_count(job);
-  count_c=list_count(c_list);
+  j=(t_job *)job->current->data;
+  c=(t_client *)c_list->current->data;
+  if(j->status==IN_QUEUE) count_j++;
+  if(c->status==IDLE) count_c++;
+
+  while(list_next(job)!=L_NO_NEXT_ELEMENT) {
+    j=(t_job *)job->current->data;
+    if(j->status==IN_QUEUE) count_j++;
+  }
+  while(list_next(c_list)!=L_NO_NEXT_ELEMENT) {
+    if(j->status==IN_QUEUE) count_j++;
+    if(c->status==IDLE) count_c++;
+  }
+ 
+  min=(count_c<count_j)?count_c:count_j;
+
+  if(min!=0) {
+    printf("d: distributing jobs ...\n");
+    printf("%d queued jobs, %d idle clients\n\n",count_j,count_c);
+  }
 
   list_reset(job);
   list_reset(c_list);
-  while((count_c!=0)&&(count_j!=0)) {
+
+  while(min) {
     j=(t_job *)job->current->data;
     c=(t_client *)c_list->current->data;
     while(c->status!=IDLE) {
@@ -377,12 +415,15 @@ int distribute_jobs(t_event *event,void *allineed) {
 
     if(data==NLSOP_CJOB) {
       network_send_chan(net,c->channel,j->ac,j->size*sizeof(unsigned char));
+      network_receive_chan(net,c->channel,&data,sizeof(unsigned char));
       network_send_chan(net,c->channel,(unsigned char *)&(j->cc),
                         j->size*sizeof(int));
+      network_receive_chan(net,c->channel,&data,sizeof(unsigned char));
+      network_send_chan(net,c->channel,(unsigned char *)&(j->step),sizeof(int));
+      network_receive_chan(net,c->channel,&data,sizeof(unsigned char));
     }
 
-    --count_c;
-    --count_j;
+    --min;
     list_next(c_list);
     list_next(job);
   }