X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.c;h=8fe35a726828411933158b1cdc3cc15f1291aa14;hp=2f119380b0a6d48d13559196ca65a7ab247c8f07;hb=1bfbfbf903777d13df3107fbc89bdaeb2af9f2d6;hpb=54d34cda7a6f0d9bd3ff22d529ce69ff2c004bd3 diff --git a/main.c b/main.c index 2f11938..8fe35a7 100644 --- a/main.c +++ b/main.c @@ -9,26 +9,11 @@ ** ** \*****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "main.h" MESSAGES -double now_d; +double now_d, last_d; time_t now; struct tm *now_tm; struct timeval now_tv; @@ -40,14 +25,22 @@ struct timezone now_tz; now = now_tv.tv_sec; \ now_tm = localtime(&now); \ } -//#define DEBUG_DURATION +#ifdef SOCKET_MISDN +FILE *debug_fp = NULL; +#else int global_debug = 0; +#endif int quit=0; +#if 0 +struct lcr_fdset lcr_fdset[FD_SETSIZE]; +#endif + pthread_mutex_t mutexd; // debug output mutex //pthread_mutex_t mutext; // trace output mutex pthread_mutex_t mutexe; // error output mutex +pthread_mutex_t mutex_lcr; // lcr process mutex int memuse = 0; int mmemuse = 0; @@ -66,6 +59,11 @@ int last_debug = 0; int debug_newline = 1; int nooutput = 0; +void debug_usleep(int msec, char *file, int line, int hour, int min, int sec) +{ + usleep(msec); +} + void debug(const char *function, int line, char *prefix, char *buffer) { /* if we have a new debug count, we add a mark */ @@ -74,8 +72,13 @@ void debug(const char *function, int line, char *prefix, char *buffer) last_debug = debug_count; if (!nooutput) printf("\033[34m--------------------- %04d.%02d.%02d %02d:%02d:%02d %06d\033[36m\n", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec, debug_count%1000000); +#ifdef SOCKET_MISDN + if (debug_fp) + fprintf(debug_fp, "--------------------- %04d.%02d.%02d %02d:%02d:%02d %06d\n", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec, debug_count%1000000); +#else if (options.deb&DEBUG_LOG && global_debug) dprint(DBGM_MAN, 0, "--------------------- %04d.%02d.%02d %02d:%02d:%02d %06d\n", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec, debug_count%1000000); +#endif } if (!nooutput) @@ -88,14 +91,26 @@ void debug(const char *function, int line, char *prefix, char *buffer) printf("%s", buffer); } +#ifdef SOCKET_MISDN + if (debug_fp) +#else if (options.deb&DEBUG_LOG && global_debug) +#endif { if (debug_newline) { if (function) +#ifdef SOCKET_MISDN + fprintf(debug_fp, "%s%s(in %s() line %d): %s", prefix?prefix:"", prefix?" ":"", function, line, buffer); +#else dprint(DBGM_MAN, 0, "%s%s(in %s() line %d): %s", prefix?prefix:"", prefix?" ":"", function, line, buffer); +#endif else +#ifdef SOCKET_MISDN + fprintf(debug_fp, "%s%s: %s", prefix?prefix:"", prefix?" ":"", buffer); +#else dprint(DBGM_MAN, 0, "%s%s: %s", prefix?prefix:"", prefix?" ":"", buffer); +#endif } } @@ -193,14 +208,17 @@ int main(int argc, char *argv[]) char *debug_prefix = "alloc"; int created_mutexd = 0,/* created_mutext = 0,*/ created_mutexe = 0, created_lock = 0, created_signal = 0, created_debug = 0; -#ifdef DEBUG_DURATION - time_t durationupdate; - double idle_duration, isdn_duration, port_duration, epoint_duration, join_duration, message_duration, admin_duration; - double start_d; -#endif int idletime = 0, idlecheck = 0; char tracetext[256]; +#if 0 + /* init fdset */ + memset(lcr_fdset, 0, sizeof(lcr_fdset)); +#endif + + /* lock LCR process */ + pthread_mutex_lock(&mutex_lcr); + /* current time */ GET_NOW(); @@ -452,26 +470,29 @@ int main(int argc, char *argv[]) printf("%s\n", tracetext); end_trace(); GET_NOW(); -#ifdef DEBUG_DURATION - start_d = now_d; - durationupdate = now; - idle_duration = isdn_duration = port_duration = epoint_duration = call_duration = message_duration = admin_duration = 0; -#endif quit = 0; while(!quit) { + + last_d = now_d; + GET_NOW(); + if (now_d-last_d > 1.0) + { + PERROR("LCR was stalling %d.%d seconds\n", ((int)((now_d-last_d)*10.0))/10, (int)((now_d-last_d)*10.0)); + } /* all loops must be counted from the beginning since nodes might get freed during handler */ all_idle = 1; +//#warning debugging usleep crash +// debug_usleep(1, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec); + /* handle mISDN messages from kernel */ debug_prefix = "ISDN"; if (mISDN_handler()) all_idle = 0; -#ifdef DEBUG_DURATION - GET_NOW(); - isdn_duration += (now_d - start_d); - start_d = now_d; -#endif +//#warning debugging usleep crash +// debug_usleep(1, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec); + BUDETECT /* loop through all port ports and call their handler */ @@ -488,11 +509,6 @@ BUDETECT goto port_again; port = port->next; } -#ifdef DEBUG_DURATION - GET_NOW(); - port_duration += (now_d - start_d); - start_d = now_d; -#endif /* loop through all epoint and call their handler */ epoint_again: @@ -509,11 +525,6 @@ BUDETECT goto epoint_again; epoint = epoint->next; } -#ifdef DEBUG_DURATION - GET_NOW(); - epoint_duration += (now_d - start_d); - start_d = now_d; -#endif /* loop through all joins and call their handler */ join_again: @@ -529,11 +540,6 @@ BUDETECT goto join_again; join = join->next; } -#ifdef DEBUG_DURATION - GET_NOW(); - join_duration += (now_d - start_d); - start_d = now_d; -#endif debug_prefix = 0; @@ -613,21 +619,11 @@ BUDETECT debug_count++; debug_prefix = "message"; } -#ifdef DEBUG_DURATION - GET_NOW(); - message_duration += (now_d - start_d); - start_d = now_d; -#endif BUDETECT /* handle socket */ if (admin_handle()) all_idle = 0; -#ifdef DEBUG_DURATION - GET_NOW(); - admin_duration += (now_d - start_d); - start_d = now_d; -#endif BUDETECT #if 0 @@ -638,6 +634,8 @@ BUDETECT all_idle = 0; } #endif +//#warning debugging usleep crash +// debug_usleep(1, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec); /* do idle checking */ if (idlecheck != now) @@ -646,31 +644,13 @@ BUDETECT idletime = 0; idlecheck = now; } -#ifdef DEBUG_DURATION - GET_NOW(); - idle_duration += (now_d - start_d); - start_d = now_d; - if (durationupdate != now) - { - durationupdate = now; - printf("Idle:%3d ISDN:%3d Port:%3d Epoint:%3d Join:%3d Message:%3d Admin:%3d\n", - (int)(idle_duration*100), - (int)(isdn_duration*100), - (int)(port_duration*100), - (int)(epoint_duration*100), - (int)(join_duration*100), - (int)(message_duration*100), - (int)(admin_duration*100)); - idle_duration = isdn_duration = port_duration = epoint_duration = join_duration = message_duration = admin_duration = 0; - } -#else - GET_NOW(); -#endif /* did we do nothing? so we wait to give time to other processes */ if (all_idle) { - usleep(4000); /* wait 32 samples */ + pthread_mutex_unlock(&mutex_lcr); // unlock LCR + debug_usleep(4000, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec); + pthread_mutex_lock(&mutex_lcr); // lock LCR idletime += 4000; } } @@ -691,7 +671,7 @@ free: if (options.schedule > 1) { memset(&schedp, 0, sizeof(schedp)); - schedp.sched_priority = 0; + schedp.sched_priority = options.schedule; sched_setscheduler(0, SCHED_OTHER, &schedp); } /* reset signals */ @@ -772,7 +752,6 @@ free: /* deinitialize mISDN */ mISDN_deinitialize(); - global_debug = 0; /* display memory leak */ #define MEMCHECK(a, b) \ @@ -798,6 +777,9 @@ free: MEMCHECK("file descriptor(s) left",fduse) MEMCHECK("file handler(s) left",fhuse) + /* unlock LCR process */ + pthread_mutex_unlock(&mutex_lcr); + /* take me out */ return(ret); }