From 1501e32ae5b31ee1324fa3dd7b442d153f20372a Mon Sep 17 00:00:00 2001 From: hadaq Date: Wed, 14 Nov 2001 09:29:26 +0000 Subject: [PATCH] *** empty log message *** --- hadaq/evtbuild.c | 4 ++-- hadaq/makeenv | 12 ++++++------ hadaq/memnet.c | 4 ++-- hadaq/netmem.c | 4 ++-- hadaq/readout.c | 4 ++-- hadaq/shmtrans.c | 6 +++--- hadaq/shmtrans.h | 2 +- hadaq/worker.c | 22 +++++++++++++++------- 8 files changed, 33 insertions(+), 25 deletions(-) diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index 02264cc..c881672 100644 --- a/hadaq/evtbuild.c +++ b/hadaq/evtbuild.c @@ -1,7 +1,7 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.30 2001-08-28 12:06:18 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.31 2001-11-14 09:29:26 hadaq Exp $"; -#define _POSIX_C_SOURCE 199309L +#define _POSIX_C_SOURCE 199506L #include diff --git a/hadaq/makeenv b/hadaq/makeenv index 8d9ca66..432003a 100644 --- a/hadaq/makeenv +++ b/hadaq/makeenv @@ -24,7 +24,7 @@ then export AR="ar" export CC="c89" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -lrt -ltk -lX11 -ltcl -lm" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -lrt_p -ltk -lX11 -ltcl -lm" export INCLUDES="-I/usr/local/include -I$HOME/include" export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM" export ARFLAGS="rv" @@ -33,18 +33,18 @@ then export AR="ar" export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl -latm" - export INCLUDES="-I/usr/local/include -I$HOME/include" - export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT" + export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -lpthread -lrt_p -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl" + export INCLUDES="-I$HOME/include" + export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DPOSIX_SEMAPHORES_DONT_WORK" export ARFLAGS="rv" elif test $HADAQ_CONF = "LINUX_NOATM" then export AR="ar" export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -L/usr/X11R6/lib -lX11 -ltcl -lpthread -lrt -lm -ldl" export INCLUDES="-I/usr/local/include -I$HOME/include" - export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM" + export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DPOSIX_SEMAPHORES_DONT_WORK -DNOATM" export ARFLAGS="rv" elif test $HADAQ_CONF = "LINUX_E128" then diff --git a/hadaq/memnet.c b/hadaq/memnet.c index 43a2fc0..e0bb515 100644 --- a/hadaq/memnet.c +++ b/hadaq/memnet.c @@ -1,7 +1,7 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/memnet.c,v 6.10 2001-04-12 12:36:30 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/memnet.c,v 6.11 2001-11-14 09:29:27 hadaq Exp $"; -#define _XOPEN_SOURCE +#define _GNU_C_SOURCE #include #include diff --git a/hadaq/netmem.c b/hadaq/netmem.c index d441c0f..67a2125 100644 --- a/hadaq/netmem.c +++ b/hadaq/netmem.c @@ -1,7 +1,7 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.14 2001-04-12 12:36:31 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.15 2001-11-14 09:29:27 hadaq Exp $"; -#define _XOPEN_SOURCE +#define _GNU_C_SOURCE #include #include diff --git a/hadaq/readout.c b/hadaq/readout.c index b3d6cc3..d576fb8 100644 --- a/hadaq/readout.c +++ b/hadaq/readout.c @@ -1,7 +1,7 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.17 2001-04-12 12:36:31 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.18 2001-11-14 09:29:27 hadaq Exp $"; -#define _POSIX_C_SOURCE 199309L +#define _POSIX_C_SOURCE 199506L #include #include "grmblfx.h" diff --git a/hadaq/shmtrans.c b/hadaq/shmtrans.c index 9dce940..0d67559 100644 --- a/hadaq/shmtrans.c +++ b/hadaq/shmtrans.c @@ -1,14 +1,14 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.3 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.4 2001-11-14 09:29:27 hadaq Exp $"; -#define _POSIX_C_SOURCE 199309L +#define _POSIX_C_SOURCE 199506L #include #include "grmblfx.h" #include #include #include -#ifdef _POSIX_SEMAPHORES +#if defined(_POSIX_SEMAPHORES) && !defined(POSIX_SEMAPHORES_DONT_WORK) #include #else #include "semaphore.h" diff --git a/hadaq/shmtrans.h b/hadaq/shmtrans.h index f8ef890..51f2961 100644 --- a/hadaq/shmtrans.h +++ b/hadaq/shmtrans.h @@ -4,7 +4,7 @@ #include -#ifdef _POSIX_SEMAPHORES +#if defined(_POSIX_SEMAPHORES) && !defined(POSIX_SEMAPHORES_DONT_WORK) #include #else #include "semaphore.h" diff --git a/hadaq/worker.c b/hadaq/worker.c index bc5d0a0..94e2bc7 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.8 2001-07-02 12:09:45 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/worker.c,v 6.9 2001-11-14 09:29:27 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -6,6 +6,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include +#include #ifdef _POSIX_PRIORITY_SCHEDULING #include #else @@ -52,9 +53,11 @@ static int changePriority(int p) static int createStatShm(Worker *my) { int retVal; - char ipcName[_POSIX_PATH_MAX]; + char ipcNameS[_POSIX_PATH_MAX]; + char *ipcName; - strcpy(ipcName, my->name); + strcpy(ipcNameS, my->name); + ipcName = basename(ipcNameS); strcat(ipcName, ".shm"); if (-1 == PsxShm_unlink(ipcName) && errno != ENOENT) { @@ -77,12 +80,15 @@ static int createStatShm(Worker *my) static int removeStatShm(Worker *my) { - char ipcName[_POSIX_PATH_MAX]; + char ipcNameS[_POSIX_PATH_MAX]; + char *ipcName; PsxShm_close(my->shm); - strcpy(ipcName, my->name); + strcpy(ipcNameS, my->name); + ipcName = basename(ipcNameS); strcat(ipcName, ".shm"); + PsxShm_unlink(ipcName); return 0; @@ -91,9 +97,11 @@ static int removeStatShm(Worker *my) static int openStatShm(Worker *my) { int retVal; - char ipcName[_POSIX_PATH_MAX]; + char ipcNameS[_POSIX_PATH_MAX]; + char *ipcName; - strcpy(ipcName, my->name); + strcpy(ipcNameS, my->name); + ipcName = basename(ipcNameS); strcat(ipcName, ".shm"); my->shm = PsxShm_open(ipcName, O_RDWR, 0, 32 * sizeof(Statistic)); -- 2.43.0