now_tm = localtime(&now); \
}
-#ifdef SOCKET_MISDN
FILE *debug_fp = NULL;
-#else
-int global_debug = 0;
-#endif
int quit=0;
#if 0
#endif
pthread_mutex_t mutexd; // debug output mutex
-//pthread_mutex_t mutext; // trace 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;
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)
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
}
}
}
-void _printdebug(const char *function, int line, unsigned long mask, const char *fmt, ...)
+void _printdebug(const char *function, int line, unsigned int mask, const char *fmt, ...)
{
char buffer[4096];
va_list args;
return;
if (!quit)
{
- quit=1;
+ quit = sigset;
/* set scheduler & priority */
if (options.schedule > 1)
{
sched_setscheduler(0, SCHED_OTHER, &schedp);
}
fprintf(stderr, "LCR: Signal received: %d\n", sigset);
- PERROR("Signal received: %d\n", sigset);
+ PDEBUG(DEBUG_LOG, "Signal received: %d\n", sigset);
}
}
{
int ret = -1;
int lockfd = -1; /* file lock */
- struct message *message;
+ struct lcr_msg *message;
class Port *port;
class Endpoint *epoint;
class Join *join;
struct sched_param schedp;
char *debug_prefix = "alloc";
int created_mutexd = 0,/* created_mutext = 0,*/ created_mutexe = 0,
- created_lock = 0, created_signal = 0, created_debug = 0;
+ created_lock = 0, created_signal = 0, created_debug = 0,
+ created_misdn = 0;
int idletime = 0, idlecheck = 0;
char tracetext[256];
memset(lcr_fdset, 0, sizeof(lcr_fdset));
#endif
+ /* lock LCR process */
+// pthread_mutex_lock(&mutex_lcr);
+
/* current time */
GET_NOW();
/* read options */
if (read_options() == 0)
+ {
+ PERROR("%s", options_error);
goto free;
+ }
/* init mISDN */
if (mISDN_initialize() < 0)
goto free;
+ created_misdn = 1;
created_debug = 1;
/* read ruleset(s) */
quit = 0;
while(!quit)
{
+
last_d = now_d;
GET_NOW();
if (now_d-last_d > 1.0)
/* did we do nothing? so we wait to give time to other processes */
if (all_idle)
{
+// 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;
}
}
SPRINT(tracetext, "%s terminated", NAME);
printf("%s\n", tracetext);
start_trace(0, NULL, NULL, NULL, 0, 0, 0, tracetext);
- if (ret)
- add_trace("error", NULL, "%d", ret);
+ if (quit)
+ add_trace("signal", NULL, "%d", quit);
end_trace();
ret=0;
fprintf(stderr, "cannot destroy 'PDEBUG' mutex\n");
/* deinitialize mISDN */
- mISDN_deinitialize();
+ if (created_misdn)
+ mISDN_deinitialize();
/* display memory leak */
#define MEMCHECK(a, b) \
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);
}