From: hadaq <hadaq>
Date: Tue, 11 Apr 2006 17:39:31 +0000 (+0000)
Subject: added include pthread.h and LVme_registerLogMsg, mt
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=5bc233070bf478b2fa6d3be08c2af69ef769e4a6;p=daqdata.git

added include pthread.h and LVme_registerLogMsg, mt
---

diff --git a/hadaq/readout.c b/hadaq/readout.c
index e0273d6..3ce792a 100644
--- a/hadaq/readout.c
+++ b/hadaq/readout.c
@@ -1,5 +1,5 @@
 
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.29 2004-08-13 10:30:00 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.30 2006-04-11 17:39:31 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
@@ -166,7 +166,7 @@ int readoutMain(int argc, char *argv[])
 	openlog(argv[0], LOG_PID | LOG_PERROR, LOG_LOCAL0);
 	setlogmask(LOG_UPTO(LOG_INFO));
 
-
+	LVme_registerLogMsg(syslog);
 
 	argsDefault(theArgs);
 	argsFromParam(theArgs, argc, argv);
diff --git a/hadaq/shmtrans.c b/hadaq/shmtrans.c
index 01c0a04..d0bd280 100644
--- a/hadaq/shmtrans.c
+++ b/hadaq/shmtrans.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.9 2003-05-14 13:54:45 muench Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.10 2006-04-11 17:39:31 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -13,6 +13,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <pthread.h>
 #include <semaphore.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -26,9 +27,9 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include "shmtrans.h"
 
 #define SPACE_IN_FRONT 16		/* Reserve a little space in front of the
-                                   hadtuqueues that is not used, but
-                                   accessible. Allows for in situ asembly of
-                                   fragments with headers. */
+								   hadtuqueues that is not used, but
+								   accessible. Allows for in situ asembly of
+								   fragments with headers. */
 
 static void switchStorage(ShmTrans *my)
 {
@@ -61,8 +62,7 @@ ShmTrans *ShmTrans_create(const char *name, size_t size)
 		case ENOENT:
 			break;
 		default:
-			syslog(LOG_DEBUG,
-				   "%s, line %d: %s", __FILE__, __LINE__, strerror(errno));
+			syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno));
 			goto bailOut1;
 			break;
 		}
@@ -96,8 +96,7 @@ ShmTrans *ShmTrans_create(const char *name, size_t size)
 		case ENOENT:
 			break;
 		default:
-			syslog(LOG_DEBUG,
-				   "%s, line %d: %s", __FILE__, __LINE__, strerror(errno));
+			syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno));
 			goto bailOut2;
 			break;
 		}
@@ -113,8 +112,7 @@ ShmTrans *ShmTrans_create(const char *name, size_t size)
 		case ENOENT:
 			break;
 		default:
-			syslog(LOG_DEBUG,
-				   "%s, line %d: %s", __FILE__, __LINE__, strerror(errno));
+			syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno));
 			goto bailOut3;
 			break;
 		}
diff --git a/hadaq/shmtrans.h b/hadaq/shmtrans.h
index 0e581dc..f8548f2 100644
--- a/hadaq/shmtrans.h
+++ b/hadaq/shmtrans.h
@@ -7,12 +7,16 @@
 #endif
 
 #include <limits.h>
+#include <pthread.h>
 #include <semaphore.h>
 
+
 #include "psxshm.h"
 
 #include "hadtuqueue.h"
 
+
+
 typedef struct ShmTransS {
 	char name[_POSIX_PATH_MAX];
 	PsxShm *shm;