added data ok define
[physik/nlsop.git] / nlsop_server.c
index 528c634..71eabf6 100644 (file)
@@ -39,6 +39,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <signal.h>
 
 #include "nlsop.h"
 #include "dfbapi.h"
 
 #include "nlsop_general.h"
 
+/* globals */
+int *gi;
+t_net *gnet;
+t_event *gevent;
+t_list *gc_list;
+t_list *gg_list;
+int alert;
+
+/*
+ * server specific stuff
+ */
+
 int usage(char *prog)
 {
  puts("usage:");
@@ -57,10 +70,6 @@ int usage(char *prog)
  return 1;
 }
 
-/*
- * server specific stuff
- */
-
 int add_node(t_net *net,t_event *event,t_list *c_list,t_list *g_list) {
 
   int channel;
@@ -86,11 +95,13 @@ int add_node(t_net *net,t_event *event,t_list *c_list,t_list *g_list) {
   if(data==NLSOP_GUI) {
     gui_chan=channel;
     list_add_element(g_list,&gui_chan,sizeof(int));
+    printf("node is a gui\n");
   }
   else if(data==NLSOP_CLIENT) {
     client.status=IDLE;
     client.channel=channel;
     list_add_element(c_list,&client,sizeof(t_client));
+    printf("node is a client\n");
   }
   else {
     printf("not a client or gui - lets kick that ass out of here!\n");
@@ -101,6 +112,8 @@ int add_node(t_net *net,t_event *event,t_list *c_list,t_list *g_list) {
   /* if we have a new node - care for it! */
   event_math(net->connection[channel].fd,event,READ,ADD);
 
+  printf("\n");
+
   return 1;
 }
 
@@ -122,10 +135,9 @@ int save_job(t_net *net,int channel,t_job *job,unsigned char dc) {
   if(ret==N_ERROR) printf("FATAL: getting step number failed\n");
 
   if(dc!=DC_QUIT) {
-    snprintf(filename,128,"nlsop_b%f_c%f_s%f_ds%d_dr%f_Z%c__%d_of_%d.save",
+    snprintf(filename,128,"./data/nlsop_b%f_c%f_s%f_ds%d_dr%f_-_%d_of_%d.save",
              job->info.b,job->info.c,job->info.s,
              job->info.diff_rate,job->info.dr_ac,
-             job->info.z_diff?'y':'n',
              job->step,job->info.steps);
     if((fd=open(filename,O_WRONLY|O_CREAT))<0) {
       printf("FATAL: unable to open file %s\n",filename);
@@ -195,6 +207,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;
 }
@@ -206,8 +221,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));
 
@@ -228,16 +246,17 @@ int handle_node(t_net *net,t_event *event,
   t_client *c;
   t_job *j;
 
+  gi=&i;
+
   for(i=0;i<MAX_CONNECTIONS;i++) {
     if(FD_ISSET(net->connection[i].fd,&(event->rfds))) {
 
-      if(network_receive_chan(net,i,&data,1)==N_ERROR) {
-        printf("connection to client (ch %d) fucked up!\n",i);
-        event_math(net->connection[i].fd,event,READ,REMOVE);
-        network_close(net,i);
-        list_del_current(c_list);
-        return -1;
-      }
+      alert=0;
+      alarm(1);
+      network_receive_chan(net,i,&data,1);
+      alarm(0);
+
+      if(alert==1) return -1;
 
       if(list_search_data(c_list,&i,sizeof(int))==L_SUCCESS) {
         /* it's a client */
@@ -251,12 +270,14 @@ int handle_node(t_net *net,t_event *event,
           c->status=IDLE;
           /* delete job entry */
           list_del_current(job);
+          printf("job ended, saved and removed from list.\n");
         }
 
         if(data==DC_OK) {
           save_job(net,i,j,DC_OK);
           /* inc progress state */
           j->progress+=1;
+          printf("job at next level, saved.\n");
         }
 
         if(data==DC_QUIT) {
@@ -268,6 +289,7 @@ int handle_node(t_net *net,t_event *event,
           list_del_current(c_list);
           /* change job state */
           j->status=IN_QUEUE;
+          printf("client terminating, job queued, client removed.\n");
         }
       }
 
@@ -297,6 +319,8 @@ int handle_node(t_net *net,t_event *event,
       }
     }
   }
+
+  printf("\n");
    
   return 1;
 }
@@ -305,23 +329,53 @@ 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;
   d3_lattice d3l;
+  unsigned int addr[4];
 
-  net=(t_net *)allineed;
-  c_list=(t_list *)(allineed+sizeof(t_net));
-  g_list=(t_list *)(allineed+sizeof(t_net)+sizeof(t_list));
-  job=(t_list *)(allineed+sizeof(t_net)+2*sizeof(t_list));
+  memcpy(addr,allineed,4*sizeof(unsigned int));
 
-  count_j=list_count(job);
-  count_c=list_count(c_list);
+  net=(t_net *)addr[0];
+  c_list=(t_list *)addr[1];
+  g_list=(t_list *)addr[2];
+  job=(t_list *)addr[3];
 
   list_reset(job);
   list_reset(c_list);
-  while((count_c!=0)&&(count_j!=0)) {
+
+  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) {
+    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",count_j,count_c);
+  }
+
+  list_reset(job);
+  list_reset(c_list);
+
+  while(min) {
     j=(t_job *)job->current->data;
     c=(t_client *)c_list->current->data;
     while(c->status!=IDLE) {
@@ -355,8 +409,7 @@ int distribute_jobs(t_event *event,void *allineed) {
                         j->size*sizeof(int));
     }
 
-    --count_c;
-    --count_j;
+    --min;
     list_next(c_list);
     list_next(job);
   }
@@ -368,11 +421,14 @@ int parse_incoming(t_event *event,void *allineed) {
 
   t_net *net;
   t_list *c_list,*g_list,*job;
+  unsigned int addr[4];
+
+  memcpy(addr,allineed,4*sizeof(unsigned int));
 
-  net=(t_net *)allineed;
-  c_list=(t_list *)(allineed+sizeof(t_net));
-  g_list=(t_list *)(allineed+sizeof(t_net)+sizeof(t_list));
-  job=(t_list *)(allineed+sizeof(t_net)+2*sizeof(t_list));
+  net=(t_net *)addr[0];
+  c_list=(t_list *)addr[1];
+  g_list=(t_list *)addr[2];
+  job=(t_list *)addr[3];
 
   /* decide what to do */
   if(FD_ISSET(net->l_fd,&(event->rfds))) {
@@ -389,6 +445,25 @@ int parse_incoming(t_event *event,void *allineed) {
   return 1;
 }
 
+void destroy_it(int signum) {
+
+  printf("connection to client (ch %d) fucked up!\n",*gi);
+  event_math(gnet->connection[*gi].fd,gevent,READ,REMOVE);
+  network_close(gnet,*gi);
+  if(list_search_data(gc_list,gi,sizeof(int))==L_SUCCESS) {
+    list_del_current(gc_list);
+    printf("removed client from list\n");
+  }
+  if(list_search_data(gg_list,gi,sizeof(int))==L_SUCCESS) {
+    list_del_current(gg_list);
+    printf("removed gui from list\n");
+  }
+
+  alert=1;
+  alarm(0);
+
+}
+
 /*
  * main program
  */
@@ -403,13 +478,19 @@ int main(int argc,char **argv)
   t_list g_list;
   t_list job;
   void *allyouneed;
+  unsigned int addr[4];
+
+  gnet=&net;
+  gevent=&event;
+  gc_list=&c_list;
+  gg_list=&g_list;
 
   /* tzzz ... */
-  allyouneed=malloc(sizeof(t_net)+3*sizeof(t_list));
-  memcpy(allyouneed,&net,sizeof(t_net));
-  memcpy(allyouneed+sizeof(t_net),&c_list,sizeof(t_list));
-  memcpy(allyouneed+sizeof(t_net)+sizeof(t_list),&g_list,sizeof(t_list));
-  memcpy(allyouneed+sizeof(t_net)+2*sizeof(t_list),&job,sizeof(t_list));
+  allyouneed=(void *)addr;
+  addr[0]=(unsigned int)&net;
+  addr[1]=(unsigned int)&c_list;
+  addr[2]=(unsigned int)&g_list;
+  addr[3]=(unsigned int)&job;
   
   /* default values */
   port=1025;
@@ -422,6 +503,11 @@ int main(int argc,char **argv)
   /* 10 sec event timeout - distributing jobs */
   event_set_timeout(&event,10,0);
 
+  /* list init */
+  list_init(&c_list,1);
+  list_init(&g_list,1);
+  list_init(&job,1);
+
   /* connect to server */
   network_init(&net,1);
   network_set_listen_port(&net,port);
@@ -430,8 +516,12 @@ int main(int argc,char **argv)
     return -1;
   }
 
+  /* install sighandler */
+  signal(SIGALRM,destroy_it);
+
   /* wait for events :) */
   event_math(net.l_fd,&event,READ,ADD);
+  printf("\nNLSOP_SERVER started!\n\n");
   event_start(&event,allyouneed,parse_incoming,distribute_jobs);
 
   return 1;