X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop_server.c;h=747aa25e58b1efcca815b4fc5cfeeeea26b26b8f;hp=085e289a37f4007643197e3468142b29c0799c03;hb=e59c8d8fa97a1b2a0143b5aac9c0d437af07ea7a;hpb=f9a7f27f952d23ebd856c4c60fbdf7c024f95f7b

diff --git a/nlsop_server.c b/nlsop_server.c
index 085e289..747aa25 100644
--- a/nlsop_server.c
+++ b/nlsop_server.c
@@ -124,15 +124,33 @@ 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,(unsigned char *)&d3l,
+                           sizeof(d3_lattice));
+  network_send_chan(net,channel,&data,sizeof(unsigned char));
+  printf("debug: got d3_lattice\n");
+
+  ret=network_receive_chan(net,channel,(unsigned char *)&info,sizeof(info));
+  network_send_chan(net,channel,&data,sizeof(unsigned char));
+  printf("debug: got info\n");
 
   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",
@@ -144,16 +162,12 @@ int save_job(t_net *net,int channel,t_job *job,unsigned char dc) {
       return -1;
     }
 
-    memset(&d3l,0,sizeof(d3_lattice));
-    d3l.max_x=job->x;
-    d3l.max_y=job->y;
-    d3l.max_z=job->z;
     if(write(fd,&d3l,sizeof(d3_lattice))<sizeof(d3_lattice)) {
       printf("FATAL: write of d3_lattice failed\n");
       return -1;
     }
 
-    if(write(fd,&(job->info),sizeof(info))<sizeof(info)) {
+    if(write(fd,&info,sizeof(info))<sizeof(info)) {
       printf("FATAL: write of info failed\n");
       return -1;
     }
@@ -207,6 +221,9 @@ int add_job(t_net *net,int chan,t_list *jl) {
   job.step=0;
 
   list_add_element(jl,&job,sizeof(t_job));
+  
+  printf("job added: b=%f | c=%f | s=%f ...\n",
+         job.info.b,job.info.c,job.info.s);
 
   return 1;
 }
@@ -218,8 +235,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));
 
@@ -262,6 +282,9 @@ int handle_node(t_net *net,t_event *event,
           save_job(net,i,j,DC_END);
           /* reset client */
           c->status=IDLE;
+          /* free job memory */
+          free(j->ac);
+          free(j->cc);
           /* delete job entry */
           list_del_current(job);
           printf("job ended, saved and removed from list.\n");
@@ -323,7 +346,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;
@@ -337,12 +360,39 @@ int distribute_jobs(t_event *event,void *allineed) {
   g_list=(t_list *)addr[2];
   job=(t_list *)addr[3];
 
-  count_j=list_count(job);
-  count_c=list_count(c_list);
+  list_reset(job);
+  list_reset(c_list);
+
+  count_j=0;
+  count_c=0;
+
+  if((c_list->current==NULL)||(job->current==NULL)) return 2;
+
+  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) {
+    c=(t_client *)c_list->current->data;
+    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) {
@@ -372,12 +422,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);
   }