X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.c;h=09d6a6ff632fca6d7da870ea9db3cc1aa934004d;hp=69d6ab7dfdafd0b5f49e658bcd852d4952dc520d;hb=d57a2db4c6a9143b8fbee59ff4d151846e8f4303;hpb=0a0643e3a561de5f34927ea80c2bd0ce6405fd3c

diff --git a/main.c b/main.c
index 69d6ab7..09d6a6f 100644
--- a/main.c
+++ b/main.c
@@ -28,7 +28,7 @@
 
 MESSAGES
 
-double now_d;
+double now_d, last_d;
 time_t now;
 struct tm *now_tm;
 struct timeval now_tv;
@@ -40,11 +40,14 @@ struct timezone now_tz;
 		now = now_tv.tv_sec; \
 		now_tm = localtime(&now); \
 	}
-//#define DEBUG_DURATION
 
 int global_debug = 0;
 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
@@ -198,14 +201,14 @@ 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
+
 	/* current time */
 	GET_NOW();
 
@@ -457,32 +460,28 @@ 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);
+//#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;
-#warning debugging usleep crash
-		debug_usleep(1, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec);
+//#warning debugging usleep crash
+//		debug_usleep(1, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec);
 
-#ifdef DEBUG_DURATION
-		GET_NOW();
-		isdn_duration += (now_d - start_d);
-		start_d = now_d;
-#endif
 BUDETECT
 
 		/* loop through all port ports and call their handler */
@@ -499,11 +498,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:
@@ -520,11 +514,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:
@@ -540,11 +529,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;
 
@@ -624,21 +608,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
@@ -649,8 +623,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);
+//#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)
@@ -659,26 +633,6 @@ 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)
@@ -704,7 +658,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 */