From: hackbard Date: Mon, 8 Nov 2004 12:26:56 +0000 (+0000) Subject: fixes X-Git-Url: https://hackdaworld.org/gitweb/?a=commitdiff_plain;h=6ecbd52c9c8baf2b3bec34cec00dc71ea9c966ad;p=physik%2Fnlsop.git fixes --- diff --git a/nlsop_server.c b/nlsop_server.c index ea45791..71eabf6 100644 --- a/nlsop_server.c +++ b/nlsop_server.c @@ -221,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)); @@ -326,7 +329,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 +343,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=list_count(job); - count_c=list_count(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) { + if(j->status==IN_QUEUE) count_j++; + if(c->status==IDLE) count_c++; + } + + min=(count_ccurrent->data; c=(t_client *)c_list->current->data; while(c->status!=IDLE) { @@ -381,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); }