added include pthread.h and LVme_registerLogMsg, mt

diff --git a/hadaq/readout.c b/hadaq/readout.c
index e0273d6bf7eea2963e8a2ab62c58522efee13cbb..3ce792a67a23fa62735b20fcdcc46102f2b4f991 100644 (file)
--- 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 01c0a043cc4695a1f45c041f4146611ec84a3b2f..d0bd28055ed734dee2e7f6f44fedff50b93b93df 100644 (file)
--- 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 0e581dce65eb37e80045f1beae69e8fc131758b0..f8548f274983ffb34702de2889780a6cb0f98e8a 100644 (file)
--- 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;