Left: /lynx/Lynx/daq/usr/goofy/mbswork/v51/src Right: /lynx/Mbs/v51/src lxg0523:goofy> cdiff "*.c" /lynx/Mbs/v51/src d compare *.c with /lynx/Mbs/v51/src f_cmd.c ===================================================== 2465c2465 < s_coms *ps_coms=NULL,*ps_coms_temp=NULL,*ps_coms_found=NULL; --- > s_coms *ps_coms,*ps_coms_temp,*ps_coms_found; 2550,2551d2549 < if(ps_coms==NULL) return(CMD__NO_TSK_LST); < 2582,2586d2579 < if(ps_coms->e_entry != NULL){ // print command only if executed here < sprintf(c_gl_print,"%s ",c_command); < if(pc_arg != NULL) strcat(c_gl_print,pc_arg); < f_cmd_print(c_gl_pref,c_gl_print,ERR__MSG_INFO,MASK__PRTSLOG); < } f_dim_server.c ===================================================== 242c242 < sprintf(full,"@%s ",file); --- > sprintf(full,"@%s",file); 310c310,311 < conf=fopen("dimsetup","r"); --- > conf=fopen(".guirc","r"); > if(conf==NULL) conf=fopen("dimsetup","r"); 314d314 < bTriggerRate=0; 322,336c322,336 < else if(strstr(line,"TrigCountHis")) bTrigCountHis=1; < else if(strstr(line,"TrigRateHis")) bTrigRateHis=1; < else if(strstr(line,"TriggerMode")) bTriggerMode=1; < else if(strstr(line,"FileOpen")) bFileOpen=1; < else if(strstr(line,"BuildingMode")) bBuildingMode=1; < else if(strstr(line,"EventBuilding")) bEventBuilding=1; < else if(strstr(line,"StreamsFull")) {bStreamsFull=1;rMaxStreamsFull=0.0;} < else if(strstr(line,"FileFilled")) bFileFilled=1; < else if(strstr(line,"EventRate")) {bEventRate=1;rMaxEventRate=value;} < else if(strstr(line,"EventTrend")) {bEventTrend=1;rMaxEventTrend=value;} < else if(strstr(line,"EvSizeRateB")) {bEvSizeRateB=1;rMaxEvSizeRateB=value;} < else if(strstr(line,"EvSizeTrendB")) {bEvSizeTrendB=1;rMaxEvSizeTrendB=value;} < else if(strstr(line,"DataRateKb")) {bDataRateKb=1;rMaxDataRateKb=value;} < else if(strstr(line,"DataTrendKb")) {bDataTrendKb=1;rMaxDataTrendKb=value;} < else if(strstr(line,"StreamRateKb")) {bStreamRateKb=1;rMaxStreamRateKb=value;} --- > else if(strstr(line,"TrigCountHis"))bTrigCountHis=1; > else if(strstr(line,"TrigRateHis"))bTrigRateHis=1; > else if(strstr(line,"TriggerMode"))bTriggerMode=1; > else if(strstr(line,"FileOpen"))bFileOpen=1; > else if(strstr(line,"BuildingMode"))bBuildingMode=1; > else if(strstr(line,"EventBuilding"))bEventBuilding=1; > else if(strstr(line,"StreamsFull")){bStreamsFull=1;rMaxStreamsFull=0.0;} > else if(strstr(line,"FileFilled"))bFileFilled=1; > else if(strstr(line,"EventRate")){bEventRate=1;rMaxEventRate=value;} > else if(strstr(line,"EventTrend")){bEventTrend=1;rMaxEventTrend=value;} > else if(strstr(line,"EvSizeRateB")){bEvSizeRateB=1;rMaxEvSizeRateB=value;} > else if(strstr(line,"ESizeTrendB")){bEvSizeTrendB=1;rMaxEvSizeTrendB=value;} > else if(strstr(line,"DataRateKb")){bDataRateKb=1;rMaxDataRateKb=value;} > else if(strstr(line,"DataTrendKb")){bDataTrendKb=1;rMaxDataTrendKb=value;} > else if(strstr(line,"StreamRateKb")){bStreamRateKb=1;rMaxStreamRateKb=value;} 355c355 < else if(strstr(line,"TriggerRate")) bTriggerRate=1; --- > else if(strstr(line,"TriggerRate"))bTriggerRate=1; 371c371 < else if(strstr(line,"TriggerCount")) bTriggerCount=1; --- > else if(strstr(line,"TriggerCount"))bTriggerCount=1; 406,407c406 < if(fileOn) < DiFileMbytes =f_dim_add_value("FileMbytes","I",sizeof(int),&iFileMbytes); --- > if(fileOn) DiFileMbytes =f_dim_add_value("FileMbytes","I",sizeof(int),&iFileMbytes); 430c429 < if(bTriggerCount) DiTriggerCount =f_dim_add_value("TriggerCount","I",sizeof(int),&ps_daqst->bl_n_trig[0]); --- > if(bTriggerCount) DiTriggerCount =f_dim_add_value("TriggerCount","I",sizeof(int),&ps_daqst->bl_n_trig[0]); 486c485 < if(bEvSizeRateB) DrEvSizeRateB= --- > if(bEvSizeRateB) DrEvSizeRateB= 488c487 < if(bEvSizeTrendB) DrEvSizeTrendB= --- > if(bEvSizeTrendB) DrEvSizeTrendB= 490c489 < if(bDataRateKb) DrDataRateKb= --- > if(bDataRateKb) DrDataRateKb= 492c491 < if(bDataTrendKb) DrDataTrendKb= --- > if(bDataTrendKb) DrDataTrendKb= 498c497 < if(bStreamsFull) DrStreamsFull= --- > if(bStreamsFull) DrStreamsFull= 504c503 < DsRunning =f_dim_add_state("Acquisition",&sRunning,-2,"Gray","Stopped"); --- > DsRunning =f_dim_add_state("Acquisition",&sRunning,-2,"Gray","Stopped"); 506,515c505,509 < if(bBuildingMode) DsBuildingMode= < f_dim_add_state("BuildingMode",&sBuildingMode,-2,"Gray","Immediate"); < if(bEventBuilding) DsEventBuilding= < f_dim_add_state("EventBuilding",&sEventBuilding,-2,"Gray","Working"); < if(bSpillOn) DsSpillOn= < f_dim_add_state("SpillOn",&sSpillOn,-2,"Gray","Off"); < if(bTriggerMode) DsTriggerMode= < f_dim_add_state("TriggerMode",&sTriggerMode,-2,"Gray","Slave"); < if(bFileOpen) DsFileOpen= < f_dim_add_state("FileOpen",&sFileOpen,-2,"Gray","No file"); --- > if(bBuildingMode) DsBuildingMode =f_dim_add_state("BuildingMode",&sBuildingMode,-2,"Gray","Immediate"); > if(bEventBuilding) DsEventBuilding =f_dim_add_state("EventBuilding",&sEventBuilding,-2,"Gray","Working"); > if(bSpillOn) DsSpillOn =f_dim_add_state("SpillOn",&sSpillOn,-2,"Gray","Off"); > if(bTriggerMode) DsTriggerMode =f_dim_add_state("TriggerMode",&sTriggerMode,-2,"Gray","Slave"); > if(bFileOpen) DsFileOpen =f_dim_add_state("FileOpen",&sFileOpen,-2,"Gray","No file"); 521,526c515,516 < if(bTrigCountHis)DhTrigCountHis= < f_dim_add_histo("TrigCountHis",&hTrigCountHis,chTrigCountHis, < rMinTrigCountHis,rMaxTrigCountHis,"Red","Trigger#","Counts"); < if(bTrigRateHis)DhTrigRateHis= < f_dim_add_histo("TrigRateHis",&hTrigRateHis,chTrigRateHis, < rMinTrigRateHis,rMaxTrigRateHis,"Red","Trigger#","Counts"); --- > if(bTrigCountHis)DhTrigCountHis=f_dim_add_histo("TrigCountHis",&hTrigCountHis,chTrigCountHis,rMinTrigCountHis,rMaxTrigCountHis,"Red","Trigger#","Counts"); > if(bTrigRateHis)DhTrigRateHis=f_dim_add_histo("TrigRateHis",&hTrigRateHis,chTrigRateHis,rMinTrigRateHis,rMaxTrigRateHis,"Red","Trigger#","Counts"); 595c585 < if(ps_daqst->bh_running[SYS__stream_serv]&&DrStreamRateKb)dis_update_service(DrStreamRateKb); --- > if(ps_daqst->bh_running[SYS__stream_serv]&DrStreamRateKb)dis_update_service(DrStreamRateKb); 603c593 < if(ps_daqst->bh_running[SYS__stream_serv]&&DrStreamTrendKb)dis_update_service(DrStreamTrendKb); --- > if(ps_daqst->bh_running[SYS__stream_serv]&DrStreamTrendKb)dis_update_service(DrStreamTrendKb); 606c596 < if((ps_daqst->bh_running[SYS__transport]==0)&&(ps_daqst->bh_running[SYS__ds]==0)){ --- > if((ps_daqst->bh_running[SYS__transport]==0)&(ps_daqst->bh_running[SYS__ds]==0)){ 689c679 < if(DeFile) dis_update_service(DeFile); --- > if(fileOn) dis_update_service(DeFile); 696c686 < if(DsTriggerMode) dis_update_service(DsTriggerMode); --- > dis_update_service(DsTriggerMode); 738c728 < if(bTriggerCount) dis_update_service(DiTriggerCount); --- > if(bTriggerCount) dis_update_service(DiTriggerCount); 765c755 < if(bTriggerRate) {rTriggerRate.value=(REAL4)ps_daqst->bl_r_trig[0]; dis_update_service(DrTriggerRate);} --- > if(bTriggerRate){rTriggerRate.value=(REAL4)ps_daqst->bl_r_trig[0]; dis_update_service(DrTriggerRate);} f_pr_reset.c ===================================================== 62c62 < memset(c_tasks,0,40*64); --- > memset(c_tasks,0,40*64); 73,74c73,74 < strncpy(c_pid,c_com,3); < c_pid[3]=0; --- > strncpy(c_pid,c_com,3); > c_pid[3]=0; 77,78c77 < if((pc=(CHARS *) strstr(c_com,pc_task)) !=NULL) < {f_pr_kill(c_node,c_pid,pc);break;} --- > if((pc=(CHARS *) strstr(c_com,pc_task)) !=NULL) {f_pr_kill(c_node,c_pid,pc);break;} 83c82 < {l_kill++;strcpy(c_tasks[SYS__dispatch],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__dispatch],c_pid);} 85c84 < {l_kill++;strcpy(c_tasks[SYS__collector],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__collector],c_pid);} 87c86 < {l_kill++;strcpy(c_tasks[SYS__esone_serv],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__esone_serv],c_pid);} 89c88 < {l_kill++;strcpy(c_tasks[SYS__event_serv],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__event_serv],c_pid);} 91c90 < {l_kill++;strcpy(c_tasks[SYS__read_meb],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__read_meb],c_pid);} 93c92 < {l_kill++;strcpy(c_tasks[SYS__stream_serv],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__stream_serv],c_pid);} 95c94 < {l_kill++;strcpy(c_tasks[SYS__transport],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__transport],c_pid);} 97c96 < {l_kill++;strcpy(c_tasks[SYS__histogram],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__histogram],c_pid);} 99c98 < {l_kill++;strcpy(c_tasks[SYS__daq_rate],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__daq_rate],c_pid);} 101c100 < {l_kill++;strcpy(c_tasks[SYS__util],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__util],c_pid);} 103c102 < {l_kill++;strcpy(c_tasks[SYS__smi],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__smi],c_pid);} 105c104 < {l_kill++;strcpy(c_tasks[SYS__msg_log],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__msg_log],c_pid);} 107c106 < {l_kill++;strcpy(c_tasks[SYS__ds],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__ds],c_pid);} 109c108 < {l_kill++;strcpy(c_tasks[SYS__dr],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__dr],c_pid);} 111c110 < {l_kill++;strcpy(c_tasks[SYS__ar],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__ar],c_pid);} 113c112 < {l_kill++;strcpy(c_tasks[SYS__rirec],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__rirec],c_pid);} 115c114 < {l_kill++;strcpy(c_tasks[SYS__to],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__to],c_pid);} 117c116 < {l_kill++;strcpy(c_tasks[SYS__vme_serv],c_pid);} --- > {l_kill=1;strcpy(c_tasks[SYS__vme_serv],c_pid);} 122d120 < 124c122,123 < if(l_kill>0) --- > > if(l_kill==1) 152c151 < }// while l_search --- > } 155c154 < if((*pc_task==0)&(l_kill==0)) --- > if(*pc_task==0) f_tr_write_filhe.c ===================================================== 60c60 < f_tr_filhe(ph_hdr); // does nothing --- > f_tr_filhe(ph_hdr); f_ut_cmd_thread.c ===================================================== 127,128c127 < sprintf(c_command,"%s finished (x%x)",f_cmd_get_cmd(),l_status); < f_ut_send_msg(s_msg_rec.c_task,c_command,ERR__MSG_COMM,MASK__PRTSLOG); --- > f_ut_send_msg(s_msg_rec.c_task,f_cmd_get_cmd(),ERR__MSG_COMM,MASK__PRTSLOG); 130c129 < f_ut_cmd_ackn(l_pid,l_status,s_msg_rec.c_message); --- > f_ut_cmd_ackn(l_pid,l_status,c_command); 147c146 < INTS4 l_status; --- > INTS4 l_status; f_ut_op_trig_mod.c ===================================================== 170c170 < F_ERROR(ERR__MSG_INFO, 0, "cleared trigger module", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "cleared trigger module", MASK__PRTT); 176c176 < F_ERROR(ERR__MSG_INFO, 0, "cleared trigger module", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "cleared trigger module", MASK__PRTT); 447c447 < F_ERROR(ERR__MSG_INFO, 0, "start acquisition", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "start acquisition", MASK__PRTT); 469c469 < F_ERROR(ERR__MSG_INFO, 0, "start acquisition", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "start acquisition", MASK__PRTT); 521c521 < F_ERROR(ERR__MSG_INFO, 0, "stop acquisition", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "stop acquisition", MASK__PRTT); 547c547 < F_ERROR(ERR__MSG_INFO, 0, "stop acquisition", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "stop acquisition", MASK__PRTT); 555c555 < F_ERROR(ERR__MSG_INFO, 0, "enabled trigger bus", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "enabled trigger bus", MASK__PRTT); 562c562 < F_ERROR(ERR__MSG_INFO, 0, "disabled trigger bus", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "disabled trigger bus", MASK__PRTT); 569c569 < F_ERROR(ERR__MSG_INFO, 0, "enabled interrupt", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "enabled interrupt", MASK__PRTT); 576c576 < F_ERROR(ERR__MSG_INFO, 0, "disabled interrupt", MASK__PRTTERM); // command already in log file --- > F_ERROR(ERR__MSG_INFO, 0, "disabled interrupt", MASK__PRTT); m_collector.c ===================================================== 164,189d163 < /* flush timer thread HE, Aug. 2009 */ < INTS4 l_flush_streams=0; /* new for thread */ < INTS4 l_flush_streams_last=0; /* new for thread */ < INTS4 l_flush_thread=1; /* new for thread */ < pthread_attr_t s_attr_flush; < pthread_t s_tid_flush; < < //------------------------------------------- < /* flush timer thread HE, Aug. 2009 */ < /* replaces the alarm SIGALRM mechanism */ < void t_pth_flush_timer () < { < sleep (l_flush_time); < // F_ERROR (ERR__MSG_INFO,0, "Flush thread started.",MASK__PRTT); < while(l_flush_thread){ < sleep (l_flush_time); < // check if we are running and no streams have been sent in the mean time < if((l_flush_streams_last==l_flush_streams)&&(ps_daqst->bh_acqui_running == 1)) < bh_flush = 1; < l_flush_streams_last=l_flush_streams+1;// count flushed stream < } < // F_ERROR (ERR__MSG_INFO,0,"Flush thread stops.",MASK__PRTT); < pthread_exit (0); < } < < //---------------------------------------- 246c220 < * install stream flush signalhandler. Aug 2009 replaced by thread --- > * install stream flush signalhandler 248c222 < //signal (SIGALRM, alarm_signal_handler); --- > signal (SIGALRM, alarm_signal_handler); 737,741d710 < /* start flush thread HE Feb.2009 */ < pthread_attr_create (&s_attr_flush); < pthread_create ((tid_t *)&s_tid_flush, s_attr_flush, (void *)t_pth_flush_timer, NULL); < < 749d717 < l_flush_thread=0;// tell flush thread to terminate 801c769 < // alarm (l_flush_time); --- > alarm (l_flush_time); 911c879 < // alarm (l_flush_time); --- > alarm (l_flush_time); 1390c1358 < //alarm (0); --- > alarm (0); 1430c1398 < // bh_flush = 1; --- > bh_flush = 1; 1736d1703 < l_flush_streams++; // stream counter used by flush thread 1751c1718 < //alarm (l_flush_time); --- > alarm (l_flush_time); 1830c1797 < //alarm (l_flush_time); --- > alarm (l_flush_time); m_dispatch.c ===================================================== 368c368 < /* Get commands from terminal and dispatch */ --- > /* Get commands from terminal and dipatch */ m_read_meb.c ===================================================== 1051c1051 < usleep (20000); --- > usleep (20000); m_transport.c ===================================================== 1014,1025c1014,1025 < if(ps_args->l_clear != 0) < { < ps_filhe->filhe_label[0] = 0; < ps_filhe->filhe_file[0] = 0; < ps_filhe->filhe_user[0] = 0; < ps_filhe->filhe_time[0] = 0; < ps_filhe->filhe_label_l = 0; < ps_filhe->filhe_file_l = 0; < ps_filhe->filhe_user_l = 0; < ps_filhe->filhe_lines = 0; < return(0); < } --- > if(ps_args->l_clear != 0) > { > ps_filhe->filhe_label[0] = 0; > ps_filhe->filhe_file[0] = 0; > ps_filhe->filhe_user[0] = 0; > ps_filhe->filhe_time[0] = 0; > ps_filhe->filhe_label_l = 0; > ps_filhe->filhe_file_l = 0; > ps_filhe->filhe_user_l = 0; > ps_filhe->filhe_lines = 0; > return(0); > } 1054,1060c1054,1060 < { < l_i = ps_filhe->filhe_lines; < if(ps_args->h_line != 0) < { < ps_args->l_line--; < if(ps_args->l_line < ps_filhe->filhe_lines) l_i = ps_args->l_line; < } --- > { > l_i = ps_filhe->filhe_lines; > if(ps_args->h_line != 0) > { > ps_args->l_line--; > if(ps_args->l_line < ps_filhe->filhe_lines) l_i = ps_args->l_line; > } 1062,1064c1062,1064 < ps_filhe->s_strings[l_i].string_l = strlen(ps_filhe->s_strings[l_i].string); < if(l_i == ps_filhe->filhe_lines) ps_filhe->filhe_lines++; < } --- > ps_filhe->s_strings[l_i].string_l = strlen(ps_filhe->s_strings[l_i].string); > if(l_i == ps_filhe->filhe_lines) ps_filhe->filhe_lines++; > } 1066c1066 < /* --- > /* 1080c1080 < */ --- > */