Changeset 3110
- Timestamp:
- 09/20/10 21:50:26 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/threaded/oscam.c
r3109 r3110 87 87 Statics 88 88 *****************************************************************************/ 89 static char mloc[128]={0};90 89 static int cs_last_idx=0; // client index of last fork (master only) 91 90 static char *logo = " ___ ____ ___ \n / _ \\/ ___| / __|__ _ _ __ ___ \n| | | \\___ \\| | / _` | '_ ` _ \\ \n| |_| |___) | |_| (_| | | | | | |\n \\___/|____/ \\___\\__,_|_| |_| |_|\n"; 92 93 static void cs_set_mloc(int ato, char *txt)94 {95 if (ato>=0)96 //alarm(ato);97 if (txt)98 strcpy(mloc, txt);99 }100 91 101 92 static void usage() … … 286 277 static void cs_master_alarm() 287 278 { 288 cs_log("PANIC: master deadlock! last location: %s", mloc);289 fprintf(stderr, "PANIC: master deadlock! last location: %s", mloc);279 cs_log("PANIC: master deadlock!"); 280 fprintf(stderr, "PANIC: master deadlock!"); 290 281 fflush(stderr); 291 282 } … … 2765 2756 2766 2757 if (ph[i].type==MOD_CONN_UDP) { 2767 //cs_set_mloc(-1, "event: udp-socket");2768 2758 2769 2759 if ((n=recvfrom(ph[i].ptab->ports[j].fd, buf+3, sizeof(buf)-3, 0, (struct sockaddr *)&cad, (socklen_t *)&scad))>0) { … … 2807 2797 } 2808 2798 } else { //TCP 2809 //cs_set_mloc(-1, "event: tcp-socket");2810 2799 2811 2800 int pfd3; … … 2924 2913 init_userdb(&cfg->account); 2925 2914 init_signal(); 2926 //cs_set_mloc(30, "init");2927 2915 init_srvid(); 2928 2916 init_tierid(); … … 3078 3066 FD_SET(ph[i].ptab->ports[j].fd, &fds); 3079 3067 errno=0; 3080 //cs_set_mloc(0, "before select");3081 3068 select(gfd, &fds, 0, 0, 0); 3082 //cs_set_mloc(60, "after select");3083 3069 } while (errno==EINTR); 3084 //cs_set_mloc(-1, "event (global)");3085 3070 3086 3071 client[0].last=time((time_t *)0); 3087 3072 3088 3073 if (FD_ISSET(mfdr, &fds)) { 3089 //cs_set_mloc(-1, "event: master-pipe");3090 3074 process_master_pipe(); 3091 3075 }
Note:
See TracChangeset
for help on using the changeset viewer.