From 7653a3bb34a6d29bae6b40da8f06978126818ffb Mon Sep 17 00:00:00 2001
From: sailer <sailer>
Date: Wed, 4 Jun 2003 06:59:25 +0000
Subject: [PATCH] Bugfix. 	-- Benjamin Sailer

---
 hadaq/worker.c | 50 ++++++++++++++++----------------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/hadaq/worker.c b/hadaq/worker.c
index eb67e38..b7f523a 100644
--- a/hadaq/worker.c
+++ b/hadaq/worker.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.20 2003-05-14 13:54:46 muench Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.21 2003-06-04 06:59:25 sailer Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -63,9 +63,7 @@ static int createStatShm(Worker *my)
 		syslog(LOG_DEBUG, "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
 		retVal = -1;
 	} else {
-		my->shm =
-			PsxShm_open(ipcName, O_CREAT | O_RDWR, S_IRWXU,
-						WORKER_MAX_NUM_STATS * sizeof(Statistic));
+		my->shm = PsxShm_open(ipcName, O_CREAT | O_RDWR, S_IRWXU, WORKER_MAX_NUM_STATS * sizeof(Statistic));
 		if (NULL == my->shm) {
 			syslog(LOG_DEBUG, "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
 			retVal = -1;
@@ -105,9 +103,7 @@ static int openStatShm(Worker *my)
 	ipcName = basename(ipcNameS);
 	strcat(ipcName, ".shm");
 
-	my->shm =
-		PsxShm_open(ipcName, O_RDWR, 0,
-					WORKER_MAX_NUM_STATS * sizeof(Statistic));
+	my->shm = PsxShm_open(ipcName, O_RDWR, 0, WORKER_MAX_NUM_STATS * sizeof(Statistic));
 	if (NULL == my->shm) {
 		retVal = -1;
 	} else {
@@ -126,7 +122,7 @@ static int closeStatShm(Worker *my)
 static int removeSigHandlers(Worker *my)
 {
 	return sigaction(my->signal0, my->oldSigAction0, NULL)
-	| sigaction(my->signal1, my->oldSigAction1, NULL);
+		| sigaction(my->signal1, my->oldSigAction1, NULL);
 }
 
 static int installSigHandlers(Worker *my, int s0, int s1, void (*sigHandler) (int))
@@ -160,8 +156,7 @@ static int installSigHandlers(Worker *my, int s0, int s1, void (*sigHandler) (in
 	return retVal;
 }
 
-Worker *Worker_initBegin(const char *name, void (*sigHandler) (int),
-						 int priority, int isStandalone)
+Worker *Worker_initBegin(const char *name, void (*sigHandler) (int), int priority, int isStandalone)
 {
 	Worker *retVal;
 	Worker *my;
@@ -228,8 +223,7 @@ int Worker_start(const char *path, char *const argv[])
 {
 	int retVal;
 	Worker myS, *my = &myS;
-	struct timespec t =
-	{1, 0};
+	struct timespec t = { 1, 0 };
 
 	strcpy(my->name, argv[0]);
 #ifndef WORKER_NEW_PROTOCOL
@@ -245,8 +239,7 @@ int Worker_start(const char *path, char *const argv[])
 		if (my->pid == 0) {		/* This is the child, we can not get out of */
 			/* this block */
 			if (0 > execvp(path, argv)) {
-				syslog(LOG_DEBUG,
-					   "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
+				syslog(LOG_DEBUG, "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
 				syslog(LOG_EMERG, "Starting %s: %s", path, strerror(errno));
 				abort();
 			}
@@ -256,13 +249,12 @@ int Worker_start(const char *path, char *const argv[])
 
 			/* BUGBUG there should be a timeout here */
 			sigemptyset(sigMask);	/* This is the parent, so wait for the */
-			sigsuspend(sigMask);/* child to initialize */
+			sigsuspend(sigMask);	/* child to initialize */
 
 			if (sigReceived == SIGCHLD) {
 				nanosleep(&t, NULL);
 				wait(NULL);
-				syslog(LOG_DEBUG,
-					   "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
+				syslog(LOG_DEBUG, "%s:%d: %s", __FILE__, __LINE__, strerror(errno));
 				retVal = -1;
 			} else {
 				retVal = 0;
@@ -313,12 +305,8 @@ char *Worker_status(const char *name)
 		retVal = NULL;
 	} else {
 		strcpy(buf, "{}");
-		for (
-				i = 0, p = buf;
-				i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0;
-				i++) {
-			p += sprintf(p,
-						 "{ %s %lu } ", my->statistics[i].name, my->statistics[i].value);
+		for (i = 0, p = buf; i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0; i++) {
+			p += sprintf(p, "{ %s %lu } ", my->statistics[i].name, my->statistics[i].value);
 		}
 		closeStatShm(my);
 		retVal = buf;
@@ -330,8 +318,7 @@ char *Worker_status(const char *name)
 void Worker_stop(const char *name, int timeout)
 {
 	Worker myS, *my = &myS;
-	struct timespec t =
-	{1, 0};
+	struct timespec t = { 1, 0 };
 
 	strcpy(my->name, name);
 
@@ -352,13 +339,10 @@ unsigned long *Worker_addStatistic(Worker *my, const char *name)
 	unsigned long *retVal;
 	int i;
 
-	for (i = 0;
-		 i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0;
-		 i++) {
+	for (i = 0; i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0; i++) {
 	}
 	if (i == WORKER_MAX_NUM_STATS) {
-		syslog(LOG_ERR, "%s:%d: %s", __FILE__, __LINE__,
-			   "Too many statistic counters");
+		syslog(LOG_ERR, "%s:%d: %s", __FILE__, __LINE__, "Too many statistic counters");
 		retVal = NULL;
 	} else {
 		strcpy(my->statistics[i].name, name);
@@ -394,10 +378,8 @@ int Worker_getStatistic(const char *name, const char *stat, unsigned long int *v
 	if (-1 == openStatShm(my)) {
 		*value = 0;
 	} else {
-		for (i = 0;
-			 i < WORKER_MAX_NUM_STATS
-			 && strcmp(my->statistics[i].name, "") != 0; i++) {
-			if (strcmp(stat, my->statistics[i].name) == 0) {
+		for (i = 0; i < WORKER_MAX_NUM_STATS && strcmp(my->statistics[i].name, "") != 0; i++) {
+			if (strcasecmp(stat, my->statistics[i].name) == 0) {
 				*value = my->statistics[i].value;
 				retVal = 0;
 				i = WORKER_MAX_NUM_STATS;
-- 
2.43.0