WebSVN – mdb – Diff – /trunk/main.c

 #include <stdlib.h>
 #include <libgen.h>
 #include <math.h>
 #include <time.h>
 #include <signal.h>
+#include <wait.h>
 #include <syslog.h>
 #include <errno.h>
 #include <pthread.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #ifndef SIGCLD
 #   define SIGCLD SIGCHLD
 #endif
-static pthread_mutex_t fastmutex_proc = PTHREAD_MUTEX_INITIALIZER;
-static pthread_t pthr_pars, pthr_wait;
+static pthread_t pthr_pars;
 struct SOCKETS soc;
 /* Prototypes */
 void daemon_start(int ignsigcld);
 void sig_child (int x);
 	length = sizeof(client1);
 	syslog (LOG_DEBUG, "Server ready: %d",s);
 	while (1)
+	{
-		int childpid;
+		int childpid, status;
 		if ((s1 = accept (s, (struct sockaddr *)&client1, &length)) < 0)
+		{
 			syslog (LOG_DAEMON, "Error in accept: %d: %s", s1, strerror(errno));
 			continue;
+		{
 			/* Child process */
 			processCommands((void *)&soc);
 			exit(EXIT_SUCCESS);
+		}
-		close(s1);
-		if (pthread_create(&pthr_wait, NULL, thread_wait, NULL) != 0)
-			syslog (LOG_DAEMON,"Create of thread \"pthr_wait\" failed: %s", strerror(errno));
-	}
-	close (s);
-	return NULL;
-}
-void *thread_wait(void *pV_data)
-{
-	int status;
-	pthread_mutex_lock (&fastmutex_proc);
 #if defined(BSD) && !defined(Linux)
-	while (wait3 (&status, WNOHANG, (struct rusage *)0) <= 0)
+		while (wait3 (&status, WNOHANG, (struct rusage *)0) > 0)
-		sleep(1);
+			sleep(1);
 #else
-	while (waitpid(-1, &status, WNOHANG) <= 0)
+		while (waitpid(-1, &status, WNOHANG) > 0)
-		sleep(1);
+			sleep(1);
 #endif
-	pthread_mutex_unlock(&fastmutex_proc);
+		close(s1);
+	}
+	close (s);
 	return NULL;
+}

Subversion Repositories mdb

(root)/trunk/main.c – Rev 21 → 22