From 8ab8d4541f71d229c4d8a79592d5feee33faed03 Mon Sep 17 00:00:00 2001 From: hadaq Date: Sun, 18 Nov 2001 11:56:20 +0000 Subject: [PATCH] Join with mathias-local branch. Most important change is removal of hadesstd-lib, therefore replaced msglog -> syslog, UInt -> uint_t --- hadaq/ctrlctu.c | 30 +++++++++---- hadaq/ctu.h | 25 +++++------ hadaq/daq_lib.c | 7 ++- hadaq/daqctrl.c | 10 +++-- hadaq/default_p.tcl | 4 +- hadaq/evt.c | 47 +++++++++++---------- hadaq/evt.h | 29 +++++++------ hadaq/evtbuild.c | 101 +++++++++++++++++++++++++------------------- hadaq/hadtu.c | 3 +- hadaq/hadtu.h | 53 +++++++++++------------ hadaq/hldread.c | 37 ++++++++++------ hadaq/hwdtu.c | 15 ++++--- hadaq/hwdtu.h | 4 +- hadaq/hwmdc.c | 24 +++++------ hadaq/hwrace.c | 21 +++++---- hadaq/hwrich.c | 32 +++++++------- hadaq/hwsam.c | 35 ++++++++------- hadaq/hwship.c | 27 ++++++------ hadaq/hwship.h | 2 +- hadaq/hwshow.c | 24 +++++------ hadaq/hwsis3801.c | 19 +++++---- hadaq/hwsoft.c | 47 +++++++++++---------- hadaq/hwtbus.c | 26 ++++++------ hadaq/hwtip.c | 27 ++++++------ hadaq/hwtof.c | 22 +++++----- hadaq/hwtrig.c | 59 ++++++++++++++------------ hadaq/hwv488.c | 27 ++++++------ hadaq/hwv488.h | 2 +- hadaq/hwv775.c | 33 ++++++++------- hadaq/hwv878.c | 33 ++++++++------- hadaq/makeenv | 32 +++++++------- hadaq/memnet.c | 52 ++++++++++++++--------- hadaq/netmem.c | 52 ++++++++++++++--------- hadaq/nettrans.c | 31 +++++++------- hadaq/nettrans.h | 1 - hadaq/online.c | 3 +- hadaq/rc.c | 3 +- hadaq/readout.c | 57 +++++++++++++++---------- hadaq/shmtrans.c | 70 +++++++++++++++--------------- hadaq/showevt.c | 23 +++++----- hadaq/sniff.c | 37 ++++++++++------ hadaq/subevt.c | 48 ++++++++++++--------- hadaq/subevt.h | 17 ++++---- hadaq/tcldaq.c | 3 +- 44 files changed, 695 insertions(+), 559 deletions(-) diff --git a/hadaq/ctrlctu.c b/hadaq/ctrlctu.c index 3367139..ae355b7 100644 --- a/hadaq/ctrlctu.c +++ b/hadaq/ctrlctu.c @@ -1,6 +1,11 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/ctrlctu.c,v 6.10 2001-03-07 16:02:43 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/ctrlctu.c,v 6.11 2001-11-18 11:56:20 hadaq Exp $"; #define _XOPEN_SOURCE +#define SYSLOG_NAMES +#include +#ifdef __GNUC__ +#include +#endif #include #include @@ -9,7 +14,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + #include "worker.h" @@ -22,8 +28,7 @@ void sigHandler(int sig) static void usage(const char *progName) { - msglog(LOG_ERR, "Usage: %s start|stop|#trig\n", progName); - msglog_usage(); + syslog(LOG_ERR, "Usage: %s start|stop|#trig", progName); } int main(int argc, char *argv[]) @@ -37,7 +42,10 @@ int main(int argc, char *argv[]) int oper; unsigned long *ctuEnabled; - msglog_setlevel(argv[0], "info"); + openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0); + setlogmask(LOG_UPTO(LOG_INFO)); + + isStandalone = 1; priority = 0; @@ -50,9 +58,15 @@ int main(int argc, char *argv[]) priority = atoi(optarg); break; case 'v': - if (msglog_setlevel(argv[0], optarg) != 1) { + for (i = 0; prioritynames[i].c_name != NULL + && 0 != strcmp(prioritynames[i].c_name, optarg); i++) { + } + if (prioritynames[i].c_name == NULL) { usage(argv[0]); goto bailOut0; + exit(EXIT_FAILURE); + } else { + setlogmask(LOG_UPTO(prioritynames[i].c_val)); } break; default: @@ -63,11 +77,11 @@ int main(int argc, char *argv[]) } if (NULL == (worker = Worker_initBegin(argv[0], sigHandler, priority, isStandalone))) { - msglog(LOG_ERR, "connecting to agent: %s\n", strerror(errno)); + syslog(LOG_ERR, "connecting to agent: %s", strerror(errno)); goto bailOut0; } if (NULL == (ctuEnabled = Worker_addStatistic(worker, "ctuEnabled"))) { - msglog(LOG_ERR, "addingStatistic: %s\n", strerror(errno)); + syslog(LOG_ERR, "addingStatistic: %s", strerror(errno)); goto bailOut0; } Worker_initEnd(worker); diff --git a/hadaq/ctu.h b/hadaq/ctu.h index 400eef2..e95fc37 100644 --- a/hadaq/ctu.h +++ b/hadaq/ctu.h @@ -8,7 +8,8 @@ #include #include -#include +#include + #define STATUS1 0x00 #define DEAD1 0x04 @@ -26,26 +27,26 @@ #define MAGIC 0x3c typedef struct CtuS { - volatile UInt1 *base; - UInt2 internalTrigNr; + volatile uint8_t *base; + uint16_t internalTrigNr; } Ctu; -static UInt1 Ctu_rdStatus(Ctu * my) +static uint8_t Ctu_rdStatus(Ctu * my) { return *(my->base + STATUS1); } -static UInt1 Ctu_rdDeadtime(Ctu * my) +static uint8_t Ctu_rdDeadtime(Ctu * my) { return *(my->base + DEAD1); } -static void Ctu_wrDelay(Ctu * my, UInt1 delay) +static void Ctu_wrDelay(Ctu * my, uint8_t delay) { *(my->base + FIPO2) = delay; } -static UInt1 Ctu_magicIsOk(Ctu * my) +static uint8_t Ctu_magicIsOk(Ctu * my) { return *(my->base + MAGIC) == 0x51; } @@ -115,17 +116,17 @@ static int Ctu_isError(Ctu *my) return (*(my->base + STATUS1) & 0x80) != 0; } -static void Ctu_wrDeadtime(Ctu * my, UInt1 time) +static void Ctu_wrDeadtime(Ctu * my, uint8_t time) { *(my->base + DEAD1) = time; } -static UInt1 Ctu_rdTrigCode(Ctu * my) +static uint8_t Ctu_rdTrigCode(Ctu * my) { return *(my->base + CODE1) & 0x0f; } -static UInt1 Ctu_rdTrigTag(Ctu * my) +static uint8_t Ctu_rdTrigTag(Ctu * my) { return *(my->base + TAG1); } @@ -140,7 +141,7 @@ static void Ctu_popFifo(Ctu * my) *(my->base + FIPO2) = 0; } -static void Ctu_softTrig(Ctu *my, UInt1 trigType) { +static void Ctu_softTrig(Ctu *my, uint8_t trigType) { struct timespec tS, *t = &tS; t->tv_sec = 0; t->tv_nsec = 1; @@ -201,7 +202,7 @@ unsigned char init_code1[] = {0, 1, 4, 4, 5, 5, 5, 5, if ( - (volatile UInt1 *)-1 == (my->base = (volatile UInt1 *)find_controller( + (volatile uint8_t *)-1 == (my->base = (volatile uint8_t *)find_controller( cardBase, 0x10000UL, 0x09UL, 0x0000003cUL, 1UL, param )) ) { diff --git a/hadaq/daq_lib.c b/hadaq/daq_lib.c index e897dda..3dd6fee 100644 --- a/hadaq/daq_lib.c +++ b/hadaq/daq_lib.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daq_lib.c,v 6.9 2001-11-15 12:59:54 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daq_lib.c,v 6.10 2001-11-18 11:56:20 hadaq Exp $"; #include @@ -11,7 +11,10 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada static void exportSetup(const Param *p) { if (p->setup != NULL) { - setenv("DAQ_SETUP", p->setup, 1); + static char s[80] = "DAQ_SETUP="; + + strcat(s, p->setup); + putenv(s); } } diff --git a/hadaq/daqctrl.c b/hadaq/daqctrl.c index e30b9c4..be44897 100644 --- a/hadaq/daqctrl.c +++ b/hadaq/daqctrl.c @@ -1,5 +1,6 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daqctrl.c,v 6.7 2001-11-15 10:20:18 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daqctrl.c,v 6.8 2001-11-18 11:56:21 hadaq Exp $"; +#define SYSLOG_NAMES #include #include @@ -9,7 +10,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include #include "daq_lib.h" @@ -39,7 +40,10 @@ int main(int argc, char *argv[]) { usage(argv[0]); exit(EXIT_FAILURE); } - msglog_setlevel(argv[0], "info"); + openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0); + setlogmask(LOG_UPTO(LOG_INFO)); + + command = argv[1]; name = argv[2]; diff --git a/hadaq/default_p.tcl b/hadaq/default_p.tcl index 73358c0..023e27b 100644 --- a/hadaq/default_p.tcl +++ b/hadaq/default_p.tcl @@ -3,8 +3,8 @@ set evtbuild(stndln) 0 set evtbuild(prio) -2 set evtbuild(outdev) file set evtbuild(outpath) /tmp -set evtbuild(expid) ha -set evtbuild(nrofmsgs) 1 +set evtbuild(expid) te +set evtbuild(nrofmsgs) 0 set netmem(file) ./daq_netmem set netmem(stndln) 0 set netmem(prio) -1 diff --git a/hadaq/evt.c b/hadaq/evt.c index a1ce418..100f34e 100644 --- a/hadaq/evt.c +++ b/hadaq/evt.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evt.c,v 6.10 2001-03-07 16:02:43 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evt.c,v 6.11 2001-11-18 11:56:21 hadaq Exp $"; #define _ANSI_C_SOURCE @@ -9,6 +9,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include #include +#include #include "evt.h" #include "subevt.h" @@ -32,7 +33,7 @@ size_t Evt_hdrLen(void) size_t Evt_hdrSize(void) { - return Evt_hdrLen() * sizeof(UInt4); + return Evt_hdrLen() * sizeof(uint32_t); } size_t Evt_dataSize(const void *my) @@ -45,62 +46,62 @@ void *Evt_data(const void *my) return (void *) ((char *) my + Evt_hdrSize()); } -UInt4 Evt_id(const void *my) +uint32_t Evt_id(const void *my) { return Evt_hdrValue(my, EvtIdx_id); } -void Evt_setId(void *my, UInt4 id) +void Evt_setId(void *my, uint32_t id) { Evt_setHdrValue(my, EvtIdx_id, id); } -UInt4 Evt_seqNr(const void *my) +uint32_t Evt_seqNr(const void *my) { return Evt_hdrValue(my, EvtIdx_seqNr); } -void Evt_setSeqNr(void *my, UInt4 seqNr) +void Evt_setSeqNr(void *my, uint32_t seqNr) { Evt_setHdrValue(my, EvtIdx_seqNr, seqNr); } -UInt4 Evt_date(const void *my) +uint32_t Evt_date(const void *my) { return Evt_hdrValue(my, EvtIdx_date); } -void Evt_setDate(void *my, UInt4 date) +void Evt_setDate(void *my, uint32_t date) { Evt_setHdrValue(my, EvtIdx_date, date); } -UInt4 Evt_time(const void *my) +uint32_t Evt_time(const void *my) { return Evt_hdrValue(my, EvtIdx_time); } -void Evt_setTime(void *my, UInt4 time) +void Evt_setTime(void *my, uint32_t time) { Evt_setHdrValue(my, EvtIdx_time, time); } -UInt4 Evt_runNr(const void *my) +uint32_t Evt_runNr(const void *my) { return Evt_hdrValue(my, EvtIdx_runNr); } -void Evt_setRunNr(void *my, UInt4 runNr) +void Evt_setRunNr(void *my, uint32_t runNr) { Evt_setHdrValue(my, EvtIdx_runNr, runNr); } -UInt4 Evt_expId(const void *my) +uint32_t Evt_expId(const void *my) { return Evt_hdrValue(my, EvtIdx_expId); } -void Evt_setExpId(void *my, UInt4 expId) +void Evt_setExpId(void *my, uint32_t expId) { Evt_setHdrValue(my, EvtIdx_expId, expId); } @@ -108,7 +109,7 @@ void Evt_setExpId(void *my, UInt4 expId) char *Evt_expId2charP(const void *my) { static char buffer[3]; - UInt4 expId; + uint32_t expId; expId = Evt_expId(my); @@ -161,7 +162,7 @@ char *Evt_2charP(const void *my) static char buf[2 * 132]; sprintf(buf, - "size: %08x\tdecoding: %08x\tid: %08x\tseqNr: %08x\n" + "size: %08x\tdecoding: %08x\tid: %08x\tseqNr: %08x" "date: %s\ttime: %s\trunNr: %d\texpId: %x", Evt_size(my), Evt_decoding(my), Evt_id(my), Evt_seqNr(my), Evt_date2charP(my), Evt_time2charP(my), Evt_runNr(my), Evt_expId(my) @@ -170,16 +171,16 @@ char *Evt_2charP(const void *my) return buf; } -void *newEvt(UInt4 decoding, UInt4 id, UInt4 runNr, const char *expId) +void *newEvt(uint32_t decoding, uint32_t id, uint32_t runNr, const char *expId) { void *my; - static UInt4 seqNr = 0; + static uint32_t seqNr = 0; time_t tempo; struct tm *gmTime; - UInt4 dummy; + uint32_t dummy; - my = allocMem(EVT_MAXSIZE); + my = malloc(EVT_MAXSIZE); Evt_setSize(my, Evt_hdrSize()); Evt_setDecoding(my, decoding); @@ -209,7 +210,7 @@ void *newEvt(UInt4 decoding, UInt4 id, UInt4 runNr, const char *expId) void deleteEvt(void *my) { - freeMem(my); + free(my); } void *Evt_appendSubEvt(void *my, void *subEvt) @@ -231,13 +232,13 @@ void *Evt_fget(FILE * file) static void *evt = pool; if (Evt_hdrSize() != fread(evt, 1, Evt_hdrSize(), file)) { - msglog(LOG_DEBUG, "%s:%d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s:%d: %s", __FILE__, __LINE__, strerror(errno)); return NULL; } /* BUGBUG quickhack for a "Evt_paddedDataSize" */ if (Evt_paddedSize(evt) - Evt_hdrSize() != fread(Evt_data(evt), 1, Evt_paddedSize(evt) - Evt_hdrSize(), file)) { - msglog(LOG_ERR, "%s:%d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d: %s", __FILE__, __LINE__, strerror(errno)); return NULL; } return evt; diff --git a/hadaq/evt.h b/hadaq/evt.h index 51ae971..91edbd9 100644 --- a/hadaq/evt.h +++ b/hadaq/evt.h @@ -3,7 +3,8 @@ #include #include -#include +#include + #include "hadtu.h" #include "subevt.h" @@ -47,20 +48,20 @@ char *Evt_2charP(const void *my); char *Evt_expId2charP(const void *my); void Evt_setExpIdCharP(void *my, const char *expId); -UInt4 Evt_id(const void *my); -void Evt_setId(void *my, UInt4 id); -UInt4 Evt_seqNr(const void *my); -void Evt_setSeqNr(void *my, UInt4 seqNr); -UInt4 Evt_date(const void *my); -void Evt_setDate(void *my, UInt4 date); -UInt4 Evt_time(const void *my); -void Evt_setTime(void *my, UInt4 time); -UInt4 Evt_runNr(const void *my); -UInt4 Evt_expId(const void *my); -void Evt_setRunNr(void *my, UInt4 runNr); -void Evt_setExpId(void *my, UInt4 expId); +uint32_t Evt_id(const void *my); +void Evt_setId(void *my, uint32_t id); +uint32_t Evt_seqNr(const void *my); +void Evt_setSeqNr(void *my, uint32_t seqNr); +uint32_t Evt_date(const void *my); +void Evt_setDate(void *my, uint32_t date); +uint32_t Evt_time(const void *my); +void Evt_setTime(void *my, uint32_t time); +uint32_t Evt_runNr(const void *my); +uint32_t Evt_expId(const void *my); +void Evt_setRunNr(void *my, uint32_t runNr); +void Evt_setExpId(void *my, uint32_t expId); -void *newEvt(UInt4 decoding, UInt4 id, UInt4 runNr, const char *expId); +void *newEvt(uint32_t decoding, uint32_t id, uint32_t runNr, const char *expId); void deleteEvt(void *my); void *Evt_fget(FILE * file); void *Evt_appendSubEvt(void *my, void *subEvt); diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index 8f11244..be45eb8 100644 --- a/hadaq/evtbuild.c +++ b/hadaq/evtbuild.c @@ -1,9 +1,13 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.34 2001-11-15 13:53:44 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.35 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199506L +#define SYSLOG_NAMES #include +#ifdef __GNUC__ +#include +#endif #include #include @@ -16,7 +20,10 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + +#include + #include #include "grmblfx.h" @@ -61,13 +68,13 @@ static void *appendFile(void *my, const char *path) size_t fileSize; if (NULL == (file = fopen(path, "r"))) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); return my; } subEvt = newSubEvt(SubEvtDecoding_text, SubEvtId_slowTest, 0); if (NULL == (dataBuf = malloc(strlen(path + 2)))) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); return my; } sprintf(dataBuf, "#%s\n", path); @@ -78,7 +85,7 @@ static void *appendFile(void *my, const char *path) fileSize = ftell(file); fseek(file, 0, SEEK_SET); if (NULL == (dataBuf = malloc(fileSize))) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); return my; } fread(dataBuf, 1, fileSize, file); @@ -95,31 +102,30 @@ static void *appendFile(void *my, const char *path) static void usage(const char *progName) { - msglog(LOG_ERR, "Usage: %s [-x expId]\n", progName); - msglog(LOG_ERR, "Usage: [-m nrOfMsgs] [-t skipMsgs ...] [-r runNr]\n"); - msglog(LOG_ERR, "Usage: [-f slowCtrlFile ...] [-o outPath] [-d null|tape|file]\n"); - msglog(LOG_ERR, "Usage: [-a (agent)] [-p priority]\n"); - msglog_usage(); + syslog(LOG_ERR, "Usage: %s [-x expId]", progName); + syslog(LOG_ERR, "Usage: [-m nrOfMsgs] [-t skipMsgs ...] [-r runNr]"); + syslog(LOG_ERR, "Usage: [-f slowCtrlFile ...] [-o outPath] [-d null|tape|file]"); + syslog(LOG_ERR, "Usage: [-a (agent)] [-p priority]"); } static void argsDump(TheArgs *my) { int i; - msglog(LOG_DEBUG, "nrOfMsgs: %d\n", my->nrOfMsgs); + syslog(LOG_DEBUG, "nrOfMsgs: %d", my->nrOfMsgs); for (i = 0; i < NTRIGTYPES; i++) { - msglog(LOG_DEBUG, "skipMsgs[%d]: 0x%08x\n", i, my->skipMsgs[i]); + syslog(LOG_DEBUG, "skipMsgs[%d]: 0x%08x", i, my->skipMsgs[i]); } for (i = 0; i < my->slowCtrlFileCnt; i++) { - msglog(LOG_DEBUG, "slowCtrlFiles[%d]: %s\n", i, my->slowCtrlFiles[i]); + syslog(LOG_DEBUG, "slowCtrlFiles[%d]: %s", i, my->slowCtrlFiles[i]); } - msglog(LOG_DEBUG, "outPath: %s\n", my->outPath); - msglog(LOG_DEBUG, "outDev: %s\n", my->outDev); - msglog(LOG_DEBUG, "runNr: %d\n", my->runNr); - msglog(LOG_DEBUG, "expId: %s\n", my->expId); - msglog(LOG_DEBUG, "priority: %d\n", my->priority); - msglog(LOG_DEBUG, "isStandalone: %d\n", my->isStandalone); - msglog(LOG_DEBUG, "queueSize: %d\n", my->queueSize); - msglog(LOG_DEBUG, "verbosity: %s\n", my->verbosity); + syslog(LOG_DEBUG, "outPath: %s", my->outPath); + syslog(LOG_DEBUG, "outDev: %s", my->outDev); + syslog(LOG_DEBUG, "runNr: %d", my->runNr); + syslog(LOG_DEBUG, "expId: %s", my->expId); + syslog(LOG_DEBUG, "priority: %d", my->priority); + syslog(LOG_DEBUG, "isStandalone: %d", my->isStandalone); + syslog(LOG_DEBUG, "queueSize: %d", my->queueSize); + syslog(LOG_DEBUG, "verbosity: %s", my->verbosity); } static void argsDefault(TheArgs *my) { @@ -162,8 +168,8 @@ static int argsFromCL(TheArgs *my, int argc, char *argv[]) { my->runNr = strtoul(optarg, NULL, 0); break; case 's': - msglog(LOG_WARNING, - "-s option obsolete, will be removed in a future version\n"); + syslog(LOG_WARNING, + "-s option obsolete, will be removed in a future version"); break; case 'o': strcpy(my->outPath, optarg); @@ -277,8 +283,8 @@ int main(int argc, char *argv[]) void *subEvt; int scanWasSuccessful; - UInt4 currTrigNr; - UInt4 currId; + uint32_t currTrigNr; + uint32_t currId; unsigned long *evtsDiscarded; unsigned long *evtsComplete; @@ -286,7 +292,10 @@ int main(int argc, char *argv[]) ourTime = time(NULL); - msglog_setlevel(argv[0], "info"); + openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0); + setlogmask(LOG_UPTO(LOG_INFO)); + + argsDefault(theArgs); argsFromParam(theArgs, argc, argv); @@ -295,9 +304,13 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (msglog_setlevel(argv[0], theArgs->verbosity) != 1) { - msglog_usage(); + for (i = 0; prioritynames[i].c_name != NULL + && 0 != strcmp(prioritynames[i].c_name, theArgs->verbosity); i++) { + } + if (prioritynames[i].c_name == NULL) { exit(EXIT_FAILURE); + } else { + setlogmask(LOG_UPTO(prioritynames[i].c_val)); } /* normalize experiment id */ @@ -323,7 +336,7 @@ int main(int argc, char *argv[]) } if (NULL == (worker = Worker_initBegin(argv[0], sigHandler, theArgs->priority, theArgs->isStandalone))) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); exit(EXIT_FAILURE); } @@ -333,23 +346,23 @@ int main(int argc, char *argv[]) outFile = stdout; } else if (strcmp(theArgs->outDev, "file") == 0) { if (NULL == (outFile = fopen(theArgs->outPath, "wb"))) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); exit(EXIT_FAILURE); } } else if (strcmp(theArgs->outDev, "tape") == 0) { if (NULL == (outTape = openAnsiTape(theArgs->outPath, "/dev/tape"))) { - msglog(LOG_NOTICE, "Opening of tape failed (no tape available?): Writing to /dev/null.\n"); + syslog(LOG_NOTICE, "Opening of tape failed (no tape available?): Writing to /dev/null."); strcpy(theArgs->outDev, "null"); outFile = NULL; } } else { - msglog(LOG_ERR, "unknown outputDev \"%s\"\n", theArgs->outDev); + syslog(LOG_ERR, "unknown outputDev \"%s\"", theArgs->outDev); usage(argv[0]); exit(EXIT_FAILURE); } if (-1 == initOnline()) { - msglog(LOG_WARNING, "unable to initialize online service\n"); + syslog(LOG_WARNING, "unable to initialize online service"); } if (theArgs->nrOfMsgs == 0) { /* @@ -357,17 +370,17 @@ int main(int argc, char *argv[]) readout task (daq_readout) is running on the same node and communicates directly via shared memory */ - msglog(LOG_NOTICE, "nrOfMsgs not set, assuming readout is local\n"); + syslog(LOG_NOTICE, "nrOfMsgs not set, assuming readout is local"); - shmTrans = allocMem(sizeof(ShmTrans *)); - hadTuQueue = allocMem(sizeof(HadTuQueue *)); + shmTrans = malloc(sizeof(ShmTrans *)); + hadTuQueue = malloc(sizeof(HadTuQueue *)); shmTrans[0] = ShmTrans_create("subevtqueue", 2 * theArgs->queueSize); hadTuQueue[0] = NULL; theArgs->nrOfMsgs = 1; } else { - shmTrans = allocMem(theArgs->nrOfMsgs * sizeof(ShmTrans *)); - hadTuQueue = allocMem(theArgs->nrOfMsgs * sizeof(HadTuQueue *)); + shmTrans = malloc(theArgs->nrOfMsgs * sizeof(ShmTrans *)); + hadTuQueue = malloc(theArgs->nrOfMsgs * sizeof(HadTuQueue *)); for (i = 0; i < theArgs->nrOfMsgs; i++) { char buf[_POSIX_PATH_MAX]; @@ -405,7 +418,7 @@ int main(int argc, char *argv[]) Worker_dump(worker, 1); #ifndef NDEBUG - msglog(LOG_DEBUG, "evtsComplete: %d, evtsDiscarded %d\n", *evtsComplete, *evtsDiscarded); + syslog(LOG_DEBUG, "evtsComplete: %d, evtsDiscarded %d", *evtsComplete, *evtsDiscarded); #endif evt = newEvt(EvtDecoding_64bitAligned, EvtId_data, theArgs->runNr, theArgs->expId); for (i = 0; i < theArgs->nrOfMsgs && !evtIsBroken; i += step) { @@ -416,18 +429,18 @@ int main(int argc, char *argv[]) void *storage; storage = ShmTrans_recv(shmTrans[i]); - hadTuQueue[i] = allocMem(HadTuQueue_sizeOf()); + hadTuQueue[i] = malloc(HadTuQueue_sizeOf()); conHadTuQueue_voidP(hadTuQueue[i], storage); } subEvt = HadTuQueue_front(hadTuQueue[i]); #ifndef NDEBUG - msglog(LOG_DEBUG, "hadTuQueue[%d]: %p = subEvt: %s\n", i, subEvt, SubEvt_2charP(subEvt)); + syslog(LOG_DEBUG, "hadTuQueue[%d]: %p = subEvt: %s", i, subEvt, SubEvt_2charP(subEvt)); #endif if (i == 0) { currTrigNr = SubEvt_trigNr(subEvt); currId = SubEvt_id(subEvt); #ifndef NDEBUG - msglog(LOG_DEBUG, "currTrigNr: 0x%08x, currId 0x%08x\n", currTrigNr, currId); + syslog(LOG_DEBUG, "currTrigNr: 0x%08x, currId 0x%08x", currTrigNr, currId); #endif } if (SubEvt_trigNr(subEvt) == currTrigNr) { @@ -443,7 +456,7 @@ int main(int argc, char *argv[]) } if (HadTuQueue_empty(hadTuQueue[i])) { desHadTuQueue(hadTuQueue[i]); - freeMem(hadTuQueue[i]); + free(hadTuQueue[i]); hadTuQueue[i] = NULL; ShmTrans_free(shmTrans[i]); } @@ -484,7 +497,7 @@ int main(int argc, char *argv[]) fclose(outFile); } else if (outTape != NULL) { if (-1 == closeAnsiTape(outTape)) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); } } for (i = 0; i < theArgs->nrOfMsgs; i++) { diff --git a/hadaq/hadtu.c b/hadaq/hadtu.c index 677d5c8..1c94519 100644 --- a/hadaq/hadtu.c +++ b/hadaq/hadtu.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtu.c,v 6.3 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hadtu.c,v 6.4 2001-11-18 11:56:21 hadaq Exp $"; #define _ANSI_C_SOURCE @@ -7,7 +7,6 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include #include "hadtu.h" diff --git a/hadaq/hadtu.h b/hadaq/hadtu.h index e78f02f..6c57e5a 100644 --- a/hadaq/hadtu.h +++ b/hadaq/hadtu.h @@ -2,23 +2,24 @@ #define HADTU_H #include -#include +#include + enum HadTu_Decoding { HadTu_queueDecoding = 3 << 16 | 99 }; -static UInt4 *HadTu_hdr(const void *my); +static uint32_t *HadTu_hdr(const void *my); static size_t HadTu_hdrLen(void); static size_t HadTu_hdrSize(void); static int HadTu_isSwapped(const void *my); -static UInt4 HadTu_hdrValue(const void *my, unsigned idx); -static void HadTu_setHdrValue(const void *my, unsigned idx, UInt4 value); -static UInt4 HadTu_decoding(const void *my); -static void HadTu_setDecoding(void *my, UInt4 decoding); +static uint32_t HadTu_hdrValue(const void *my, unsigned idx); +static void HadTu_setHdrValue(const void *my, unsigned idx, uint32_t value); +static uint32_t HadTu_decoding(const void *my); +static void HadTu_setDecoding(void *my, uint32_t decoding); static unsigned HadTu_alignment(const void *my); -static UInt4 HadTu_size(const void *my); -static void HadTu_setSize(void *my, UInt4 size); +static uint32_t HadTu_size(const void *my); +static void HadTu_setSize(void *my, uint32_t size); static size_t HadTu_paddedSize(const void *my); static void *HadTu_begin(const void *my); static void *HadTu_end(const void *my); @@ -33,9 +34,9 @@ enum HadTuIdx { HadTuIdx_data }; -static UInt4 *HadTu_hdr(const void *my) +static uint32_t *HadTu_hdr(const void *my) { - return (UInt4 *) my; + return (uint32_t *) my; } static size_t HadTu_hdrLen(void) @@ -45,23 +46,23 @@ static size_t HadTu_hdrLen(void) static size_t HadTu_hdrSize(void) { - return HadTu_hdrLen() * sizeof(UInt4); + return HadTu_hdrLen() * sizeof(uint32_t); } static int HadTu_isSwapped(const void *my) { - UInt4 *hdr = HadTu_hdr(my); + uint32_t *hdr = HadTu_hdr(my); return hdr[HadTuIdx_decoding] > 0xffffff; } -static UInt4 HadTu_hdrValue(const void *my, unsigned idx) +static uint32_t HadTu_hdrValue(const void *my, unsigned idx) { - UInt4 *hdr = HadTu_hdr(my); + uint32_t *hdr = HadTu_hdr(my); if (HadTu_isSwapped(my)) { - UInt4 tmp0; - UInt4 tmp1; + uint32_t tmp0; + uint32_t tmp1; tmp0 = hdr[idx]; ((char *) &tmp1)[0] = ((char *) &tmp0)[3]; @@ -74,19 +75,19 @@ static UInt4 HadTu_hdrValue(const void *my, unsigned idx) } } -static void HadTu_setHdrValue(const void *my, unsigned idx, UInt4 value) +static void HadTu_setHdrValue(const void *my, unsigned idx, uint32_t value) { - UInt4 *hdr = HadTu_hdr(my); + uint32_t *hdr = HadTu_hdr(my); hdr[idx] = value; } -static UInt4 HadTu_decoding(const void *my) +static uint32_t HadTu_decoding(const void *my) { return HadTu_hdrValue(my, HadTuIdx_decoding); } -static void HadTu_setDecoding(void *my, UInt4 decoding) +static void HadTu_setDecoding(void *my, uint32_t decoding) { HadTu_setHdrValue(my, HadTuIdx_decoding, decoding); } @@ -96,20 +97,20 @@ static unsigned HadTu_alignment(const void *my) return 1 << (HadTu_decoding(my) >> 16 & 0xff); } -static UInt4 HadTu_size(const void *my) +static uint32_t HadTu_size(const void *my) { return HadTu_hdrValue(my, HadTuIdx_size); } -static void HadTu_setSize(void *my, UInt4 size) +static void HadTu_setSize(void *my, uint32_t size) { HadTu_setHdrValue(my, HadTuIdx_size, size); } static size_t HadTu_paddedSize(const void *my) { - UInt4 size; - UInt4 alignment; + uint32_t size; + uint32_t alignment; size = HadTu_size(my); alignment = HadTu_alignment(my); @@ -139,8 +140,8 @@ static void *HadTu_data(const void *my) static void *HadTu_next(const void *my, const void *hadTu) { - UInt4 size; - UInt4 alignment; + uint32_t size; + uint32_t alignment; size_t paddedSize; size = HadTu_size(hadTu); diff --git a/hadaq/hldread.c b/hadaq/hldread.c index 2c9ec57..b10ea70 100644 --- a/hadaq/hldread.c +++ b/hadaq/hldread.c @@ -1,8 +1,12 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hldread.c,v 6.3 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/hldread.c,v 6.4 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L +#define SYSLOG_NAMES #include +#ifdef __GNUC__ +#include +#endif #include @@ -13,7 +17,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + #include "evt.h" #include "hldread.h" @@ -36,14 +41,14 @@ static void showProcessedEvts(unsigned long processedEvts) level = LOG_NOTICE; notice = ", \ano new events arrived"; } - msglog(level, "%5u events processed %-30s\r", processedEvts, notice); + syslog(level, "%5u events processed %-30s\r", processedEvts, notice); } static void atexit0(void) { if (!excludeAnal) stopAnalysis(); - msglog(LOG_INFO, "%5u events processed %-30s\n", processedEvts, ""); + syslog(LOG_INFO, "%5u events processed %-30s", processedEvts, ""); } void sigHandler(int sig) @@ -70,7 +75,10 @@ void main(int argc, char *argv[]) char **analArgv = malloc(sizeof(char *)); int analArgc = 1; /* Filename is in analArgv[0] */ - msglog_setlevel(argv[0], "info"); + openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0); + setlogmask(LOG_UPTO(LOG_INFO)); + + while ((i = getopt(argc, argv, "n:f:e:t:xo:v:")) != -1) { switch (i) { case 'f': @@ -94,19 +102,22 @@ void main(int argc, char *argv[]) analArgv[analArgc++] = optarg; break; case 'v': - if (msglog_setlevel(argv[0], optarg) == 1) { + for (i = 0; prioritynames[i].c_name != NULL + && 0 != strcmp(prioritynames[i].c_name, optarg); i++) { + } + if (prioritynames[i].c_name != NULL) { + setlogmask(LOG_UPTO(prioritynames[i].c_val)); break; } /* FALLTHROUGH to default */ default: - msglog( + syslog( LOG_ERR, - "Usage: %s -f firstEvent -n numEvents -e echoRate\n", + "Usage: %s -f firstEvent -n numEvents -e echoRate", argv[0] ); - msglog_usage(); - msglog( + syslog( LOG_ERR, - "-t timeout -o analArgs -x (excludeAnal) [fileName]\n" + "-t timeout -o analArgs -x (excludeAnal) [fileName]" ); exit(EXIT_FAILURE); break; @@ -120,7 +131,7 @@ void main(int argc, char *argv[]) analArgv[0] = argv[optind]; } if (file == NULL) { - msglog(LOG_ERR, "Opening input file: %s\n", strerror(errno)); + syslog(LOG_ERR, "Opening input file: %s", strerror(errno)); exit(EXIT_FAILURE); } if (!excludeAnal) { @@ -141,7 +152,7 @@ void main(int argc, char *argv[]) analyseEvt(evt); processedEvts++; if (processedEvts == 1) { - msglog(LOG_INFO, "First event processed %-30s\r", ""); + syslog(LOG_INFO, "First event processed %-30s\r", ""); } else if (processedEvts % echoRate == 0) { alarm(timeout); showProcessedEvts(processedEvts); diff --git a/hadaq/hwdtu.c b/hadaq/hwdtu.c index 58697ab..ffd20d6 100644 --- a/hadaq/hwdtu.c +++ b/hadaq/hwdtu.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwdtu.c,v 1.7 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwdtu.c,v 1.8 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -9,7 +9,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + #include @@ -30,15 +31,15 @@ int conHwDtu(HwDtu *my, const char *name, const Param *param) Param_getInt(param, my->name, "cardbase", ¶mWasFound, &cardBase); if (!paramWasFound) { - msglog(LOG_WARNING, - "Parameter %s(%s) not found, default = 0\n", my->name, "cardbase"); + syslog(LOG_WARNING, + "Parameter %s(%s) not found, default = 0", my->name, "cardbase"); cardBase = 0; } - my->lvme = allocMem(sizeof(LVme)); + my->lvme = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme, cardBase, 0x10000, 0x09, DTU_MAGIC, 1)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return -1; } return 0; @@ -47,7 +48,7 @@ int conHwDtu(HwDtu *my, const char *name, const Param *param) void desHwDtu(HwDtu *my) { desLVme(my->lvme); - freeMem(my->lvme); + free(my->lvme); } int HwDtu_isEmpty(HwDtu *my) diff --git a/hadaq/hwdtu.h b/hadaq/hwdtu.h index 1c7298a..9aa8024 100644 --- a/hadaq/hwdtu.h +++ b/hadaq/hwdtu.h @@ -10,8 +10,8 @@ typedef struct HwDtuS { char name[16]; LVme *lvme; unsigned long trigNr; - UInt1 trigTag; - UInt1 trigCode; + uint8_t trigTag; + uint8_t trigCode; } HwDtu; #define DTU_TRIG_CODE 0x18 diff --git a/hadaq/hwmdc.c b/hadaq/hwmdc.c index 5144ead..fd3e9c7 100644 --- a/hadaq/hwmdc.c +++ b/hadaq/hwmdc.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.14 2001-11-17 14:53:38 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.15 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -42,20 +42,20 @@ Hardware *newHardware(void) int i; if (0 > conParam(param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } - my = allocMem(sizeof(Hardware)); + my = malloc(sizeof(Hardware)); - my->maxSubEvtSize = SubEvt_hdrSize() + (NSAMS * 2564 * sizeof(UInt4)); + my->maxSubEvtSize = SubEvt_hdrSize() + (NSAMS * 2564 * sizeof(uint32_t)); for (i = 0; i < NSAMS; i++) { char buf[16]; - my->sam[i] = allocMem(sizeof(HwSam)); + my->sam[i] = malloc(sizeof(HwSam)); sprintf(buf, "sam%d", i); if (0 > conHwSam(my->sam[i], buf, param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } } @@ -71,10 +71,10 @@ void deleteHardware(Hardware *my) for (i = 0; i < NSAMS; i++) { desHwSam(my->sam[i]); - freeMem(my->sam[i]); + free(my->sam[i]); } - freeMem(my); + free(my); } void Hardware_waitForTrigger(Hardware *my, void *partEvt) @@ -110,8 +110,8 @@ void Hardware_readout(Hardware *my, void *partEvt) { int i; void *subEvt = SubEvt_data(partEvt); - static UInt4 trigNr = 0; - UInt4 trigTag; + static uint32_t trigNr = 0; + uint32_t trigTag; /* init partial event, necessary for SubEvt_next() */ SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts); @@ -125,7 +125,7 @@ void Hardware_readout(Hardware *my, void *partEvt) trigTag = SubEvt_trigNr(subEvt) & 0xff; } else { if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) { - msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n", + syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x", my->sam[i]->name,trigTag, SubEvt_trigNr(subEvt)); } } @@ -138,6 +138,6 @@ void Hardware_readout(Hardware *my, void *partEvt) assert(SubEvt_size(partEvt) <= my->maxSubEvtSize); #ifndef NDEBUG - msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt)); + syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt)); #endif } diff --git a/hadaq/hwrace.c b/hadaq/hwrace.c index b3a354f..79f9373 100644 --- a/hadaq/hwrace.c +++ b/hadaq/hwrace.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrace.c,v 6.14 2001-04-12 09:56:23 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrace.c,v 6.15 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -10,7 +10,10 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + +#include + #include @@ -48,15 +51,15 @@ int conHwRace(HwRace *my, const char *name, const Param *param) Param_getInt(param, my->name, "cardbase", ¶mWasFound, &cardBase); if (!paramWasFound) { - msglog(LOG_WARNING, - "Parameter %s(%s) not found, default = 0\n", my->name, "cardbase"); + syslog(LOG_WARNING, + "Parameter %s(%s) not found, default = 0", my->name, "cardbase"); cardBase = 0; } - my->rc = allocMem(sizeof(Rc)); + my->rc = malloc(sizeof(Rc)); if (0 > conRc(my->rc, "rc", cardBase)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return -1; } @@ -67,7 +70,7 @@ int conHwRace(HwRace *my, const char *name, const Param *param) void desHwRace(HwRace *my) { desRc(my->rc); - freeMem(my->rc); + free(my->rc); } void HwRace_requestBuffer(HwRace *my) @@ -117,7 +120,7 @@ int HwRace_isEmpty(HwRace *my) int HwRace_readSubEvt(HwRace *my, void *subEvt) { - UInt4 *data = (UInt4 *) subEvt; + uint32_t *data = (uint32_t *) subEvt; int firstAddr; int size; @@ -133,7 +136,7 @@ int HwRace_readSubEvt(HwRace *my, void *subEvt) my->currAddr = (my->currAddr / RCPAGESIZE + 1) * RCPAGESIZE; } #ifndef NDEBUG - msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt)); + syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt)); #endif return 0; } diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c index 7c036ab..e33bf3e 100644 --- a/hadaq/hwrich.c +++ b/hadaq/hwrich.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.19 2001-08-30 09:06:48 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.20 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -42,23 +42,23 @@ Hardware *newHardware(void) int i; if (0 > conParam(param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } - my = allocMem(sizeof(Hardware)); + my = malloc(sizeof(Hardware)); - my->maxSubEvtSize = SubEvt_hdrSize() + (NRACES * 2500 * sizeof(UInt4)); + my->maxSubEvtSize = SubEvt_hdrSize() + (NRACES * 2500 * sizeof(uint32_t)); for (i = 0; i < NRACES; i++) { char buf[16]; - my->race[i] = allocMem(sizeof(HwRace)); + my->race[i] = malloc(sizeof(HwRace)); sprintf(buf, "race%d", i); if (0 > conHwRace(my->race[i], buf, param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } - my->lInt[i] = allocMem(sizeof(LInt)); + my->lInt[i] = malloc(sizeof(LInt)); conLInt(my->lInt[i], 100 + i); } @@ -72,11 +72,11 @@ void deleteHardware(Hardware *my) for (i = 0; i < NRACES; i++) { desLInt(my->lInt[i]); - freeMem(my->lInt[i]); + free(my->lInt[i]); desHwRace(my->race[i]); - freeMem(my->race[i]); + free(my->race[i]); } - freeMem(my); + free(my); } void Hardware_waitForTrigger(Hardware *my, void *subEvt) @@ -87,11 +87,11 @@ void Hardware_waitForTrigger(Hardware *my, void *subEvt) if (HwRace_isEmpty(my->race[i])) { HwRace_requestBuffer(my->race[i]); #ifndef NDEBUG - msglog(LOG_DEBUG, "%d buffer requested\n", i); + syslog(LOG_DEBUG, "%d buffer requested", i); #endif LInt_wait(my->lInt[i]); #ifndef NDEBUG - msglog(LOG_DEBUG, "%d irq received\n", i); + syslog(LOG_DEBUG, "%d irq received", i); #endif } } @@ -101,8 +101,8 @@ void Hardware_readout(Hardware *my, void *partEvt) { int i; void *subEvt = SubEvt_data(partEvt); - static UInt4 trigNr = 0; - UInt4 trigTag; + static uint32_t trigNr = 0; + uint32_t trigTag; /* init partial event, necessary for SubEvt_next() */ SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts); @@ -115,7 +115,7 @@ void Hardware_readout(Hardware *my, void *partEvt) trigTag = SubEvt_trigNr(subEvt) & 0xff; } else { if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) { - msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n", + syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x", my->race[i]->name,trigTag, SubEvt_trigNr(subEvt)); } } @@ -128,6 +128,6 @@ void Hardware_readout(Hardware *my, void *partEvt) assert(SubEvt_size(partEvt) <= my->maxSubEvtSize); #ifndef NDEBUG - msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt)); + syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt)); #endif } diff --git a/hadaq/hwsam.c b/hadaq/hwsam.c index a2b0960..0303a29 100644 --- a/hadaq/hwsam.c +++ b/hadaq/hwsam.c @@ -1,9 +1,12 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsam.c,v 6.10 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsam.c,v 6.11 2001-11-18 11:56:21 hadaq Exp $"; #include #include -#include +#include + +#include + #include #include @@ -41,19 +44,19 @@ int conHwSam(HwSam * my, const char *name, const Param *param) Param_getInt(param, my->name, "cardbase", ¶mWasFound, &cardBase); if (!paramWasFound) { - msglog(LOG_WARNING, - "Parameter %s(%s) not found, default = 0\n", my->name, "cardbase"); + syslog(LOG_WARNING, + "Parameter %s(%s) not found, default = 0", my->name, "cardbase"); cardBase = 0; } - my->cram = allocMem(sizeof(LVme)); + my->cram = malloc(sizeof(LVme)); if (0 > conLVme(my->cram, cardBase, 0x10000L, 0x09, 0x0, 4)) { - msglog(LOG_ERR, "HwSam on %p not found\n", cardBase); + syslog(LOG_ERR, "HwSam on %p not found", cardBase); return -1; } - my->regs = allocMem(sizeof(LVme)); + my->regs = malloc(sizeof(LVme)); if (0 > conLVme(my->regs, cardBase + 0x01000000, 0x10000L, 0x09, 0x4, 4)) { - msglog(LOG_ERR, "HwSam on %p not found\n", cardBase); + syslog(LOG_ERR, "HwSam on %p not found", cardBase); return -1; } my->currAddr = BUFSIZE; @@ -71,7 +74,7 @@ void HwSam_requestBuffer(HwSam *my) { int i; #ifndef NDEBUG - msglog(LOG_DEBUG, "requestBuffer in\n"); + syslog(LOG_DEBUG, "requestBuffer in"); #endif i = bankRequested(my) == 1 ? 0 : 1; do { @@ -84,7 +87,7 @@ void HwSam_requestBuffer(HwSam *my) { my->currAddr = BUFSIZE * bankRequested(my) + 8; #ifndef NDEBUG - msglog(LOG_DEBUG, "requestBuffer out\n"); + syslog(LOG_DEBUG, "requestBuffer out"); #endif } @@ -97,20 +100,20 @@ int HwSam_isEmpty(HwSam *my) { } void *HwSam_readSubEvt(HwSam *my, void *subEvt) { - UInt4 *data = (UInt4 *)subEvt; + uint32_t *data = (uint32_t *)subEvt; int firstAddr; int size; #ifndef NDEBUG - msglog(LOG_DEBUG, "readSubEvt in\n"); + syslog(LOG_DEBUG, "readSubEvt in"); #endif size = LVme_getL(my->cram, my->currAddr); #ifndef NDEBUG - msglog(LOG_DEBUG, "readSubEvt currAddr: 0x%08x\n", my->currAddr); + syslog(LOG_DEBUG, "readSubEvt currAddr: 0x%08x", my->currAddr); #endif if (my->currAddr + size > endOfData(my)) { - msglog(LOG_CRIT,"subEvt throw away : %d, %d\n", size, endOfData(my) - my->currAddr); + syslog(LOG_CRIT,"subEvt throw away : %d, %d", size, endOfData(my) - my->currAddr); /* create impossible subEvt */ SubEvt_setSize(subEvt, SubEvt_hdrSize()); SubEvt_setDecoding(subEvt, SubEvtDecoding_16bitData); @@ -123,12 +126,12 @@ void *HwSam_readSubEvt(HwSam *my, void *subEvt) { *data++ = LVme_getL(my->cram, my->currAddr); } #ifndef NDEBUG - msglog(LOG_DEBUG, "readSubEvt subevt: %s\n", SubEvt_2charP(subEvt)); + syslog(LOG_DEBUG, "readSubEvt subevt: %s", SubEvt_2charP(subEvt)); #endif } #ifndef NDEBUG - msglog(LOG_DEBUG, "readSubEvt out\n"); + syslog(LOG_DEBUG, "readSubEvt out"); #endif return 0; } diff --git a/hadaq/hwship.c b/hadaq/hwship.c index ec420ce..c42eea1 100644 --- a/hadaq/hwship.c +++ b/hadaq/hwship.c @@ -1,10 +1,13 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwship.c,v 6.17 2001-06-06 15:49:04 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwship.c,v 6.18 2001-11-18 11:56:21 hadaq Exp $"; #include #include #include -#include +#include + +#include + #include #include @@ -13,14 +16,14 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include "hwship.h" static int bankRequested(HwShip *my) { - UInt2 val; + uint16_t val; val = LVme_tstBitL(my->lvme, LVL2_ACCESS_VMEREG, 6); return val; } static int bankConfirmed(HwShip *my) { - UInt2 val; + uint16_t val; val = LVme_tstBitL(my->lvme, LVL2_ACCESS_VMEREG, 7); return val; @@ -42,14 +45,14 @@ int conHwShip(HwShip * my, const char *name, const Param *param) Param_getInt(param, my->name, "cardbase", ¶mWasFound, &cardBase); if (!paramWasFound) { - msglog(LOG_WARNING, - "Parameter %s(%s) not found, default = 0\n", my->name, "cardbase"); + syslog(LOG_WARNING, + "Parameter %s(%s) not found, default = 0", my->name, "cardbase"); cardBase = 0; } - my->lvme = allocMem(sizeof(LVme)); + my->lvme = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme, cardBase, 0x400000UL, 0x39UL, 0, 0)) { - msglog(LOG_ERR, "HwShip on %p not found\n", cardBase); + syslog(LOG_ERR, "HwShip on %p not found", cardBase); return -1; } /* Select VME-accessible register of LVL2-controller */ @@ -70,7 +73,7 @@ void HwShip_requestBuffer(HwShip *my) { int i; #ifndef NDEBUG - msglog(LOG_DEBUG, "wait for data\n"); + syslog(LOG_DEBUG, "wait for data"); #endif while ((LVme_getL(my->lvme, LVL2_ACCESS_VMEREG) >> 16 & 0xffff) <= 2) { #if 1 @@ -81,7 +84,7 @@ void HwShip_requestBuffer(HwShip *my) { #endif } #ifndef NDEBUG - msglog(LOG_DEBUG, "data available\n"); + syslog(LOG_DEBUG, "data available"); #endif i = bankRequested(my) == 1 ? 0 : 1; LVme_setL(my->lvme, LVL2_ACCESS_VMEREG, i); @@ -105,7 +108,7 @@ int HwShip_isEmpty(HwShip *my) { } int HwShip_readSubEvt(HwShip *my, void *subEvt) { - UInt4 *data = (UInt4 *)subEvt; + uint32_t *data = (uint32_t *)subEvt; int firstAddr; size_t size; @@ -117,7 +120,7 @@ int HwShip_readSubEvt(HwShip *my, void *subEvt) { } #ifndef NDEBUG - msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt)); + syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt)); #endif return 0; } diff --git a/hadaq/hwship.h b/hadaq/hwship.h index c19d639..32ab8d6 100644 --- a/hadaq/hwship.h +++ b/hadaq/hwship.h @@ -10,7 +10,7 @@ typedef struct HwShipS { LVme *lvme; unsigned currAddr; unsigned trigNr; - UInt1 oldBankConfirmed; + uint8_t oldBankConfirmed; } HwShip; diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c index 1fc3ebc..595efce 100644 --- a/hadaq/hwshow.c +++ b/hadaq/hwshow.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.18 2001-05-10 18:29:24 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.19 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -41,20 +41,20 @@ Hardware *newHardware(void) int i; if (0 > conParam(param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } - my = allocMem(sizeof(Hardware)); + my = malloc(sizeof(Hardware)); - my->maxSubEvtSize = SubEvt_hdrSize() + (NSHIPS * 1600 * sizeof(UInt4)); + my->maxSubEvtSize = SubEvt_hdrSize() + (NSHIPS * 1600 * sizeof(uint32_t)); for (i = 0; i < NSHIPS; i++) { char buf[16]; - my->ship[i] = allocMem(sizeof(HwShip)); + my->ship[i] = malloc(sizeof(HwShip)); sprintf(buf, "ipc%d", i); if (0 > conHwShip(my->ship[i], buf, param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } } @@ -70,10 +70,10 @@ void deleteHardware(Hardware *my) for (i = 0; i < NSHIPS; i++) { desHwShip(my->ship[i]); - freeMem(my->ship[i]); + free(my->ship[i]); } - freeMem(my); + free(my); } void Hardware_waitForTrigger(Hardware *my, void *subEvt) @@ -107,8 +107,8 @@ void Hardware_readout(Hardware *my, void *partEvt) { int i; void *subEvt = SubEvt_data(partEvt); - static UInt4 trigNr = 0; - UInt4 trigTag; + static uint32_t trigNr = 0; + uint32_t trigTag; /* init partial event, necessary for SubEvt_next() */ SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts); @@ -121,7 +121,7 @@ void Hardware_readout(Hardware *my, void *partEvt) trigTag = SubEvt_trigNr(subEvt) & 0xff; } else { if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) { - msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n", + syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x", my->ship[i]->name,trigTag, SubEvt_trigNr(subEvt)); } } @@ -134,6 +134,6 @@ void Hardware_readout(Hardware *my, void *partEvt) assert(SubEvt_size(partEvt) <= my->maxSubEvtSize); #ifndef NDEBUG - msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt)); + syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt)); #endif } diff --git a/hadaq/hwsis3801.c b/hadaq/hwsis3801.c index 42add16..4089de4 100644 --- a/hadaq/hwsis3801.c +++ b/hadaq/hwsis3801.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsis3801.c,v 1.4 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsis3801.c,v 1.5 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -9,7 +9,10 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + +#include + #include @@ -28,10 +31,10 @@ int conHwSis3801(HwSis3801 *my, const char *name, const Param *param) my->trigNr = 0; cardBase = Param_getInt(param, my->name, "cardbase"); - my->lvme = allocMem(sizeof(LVme)); + my->lvme = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme, cardBase, 0x10000, 0x09, SIS3801_MODID, 4)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return -1; } LVme_setL(my->lvme, SIS3801_RESET, 0); @@ -46,7 +49,7 @@ int conHwSis3801(HwSis3801 *my, const char *name, const Param *param) void desHwSis3801(HwSis3801 *my) { desLVme(my->lvme); - freeMem(my->lvme); + free(my->lvme); } int HwSis3801_isEmpty(HwSis3801 *my) @@ -56,11 +59,11 @@ int HwSis3801_isEmpty(HwSis3801 *my) int HwSis3801_readData(HwSis3801 *my, void *subEvt) { - UInt2 *data = SubEvt_end(subEvt); - UInt4 dummy; + uint16_t *data = SubEvt_end(subEvt); + uint32_t dummy; int nWords; - msglog(LOG_DEBUG, "Sis3801 Readout\n"); + syslog(LOG_DEBUG, "Sis3801 Readout"); dummy = LVme_getL(my->lvme, SIS3801_MODID); *data++ = dummy >> 16; nWords = SIS3801_NCHANNELS; diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c index 85974a7..8a58f5a 100644 --- a/hadaq/hwsoft.c +++ b/hadaq/hwsoft.c @@ -1,8 +1,9 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.22 2001-06-06 15:49:04 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.23 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L #include +#include #include @@ -21,7 +22,10 @@ size_t Hardware_maxSubEvtSize(const Hardware *my) return my->maxSubEvtSize; } -#include +#include + +#include + int Hardware_inSpill(const Hardware *my) { @@ -35,25 +39,24 @@ Hardware *newHardware(void) int paramWasFound; unsigned long size; - my = allocMem(sizeof(Hardware)); - my->maxSubEvtSize = 2 * SubEvt_hdrSize() + 5004 * sizeof(UInt4); + my = malloc(sizeof(Hardware)); + my->maxSubEvtSize = 2 * SubEvt_hdrSize() + 5004 * sizeof(uint32_t); - param = allocMem(sizeof(Param)); + param = malloc(sizeof(Param)); conParam(param); Param_getInt(param, "soft", "size", ¶mWasFound, &size); if (!paramWasFound) { - msglog(LOG_WARNING, - "Parameter %s(%s) not found, defaulting to 0\n", "soft", "size"); + syslog(LOG_WARNING, + "Parameter %s(%s) not found, defaulting to 0", "soft", "size"); size = 0; } - printf("size: %d\n", size); desParam(param); return my; } void deleteHardware(Hardware *my) { - freeMem(my); + free(my); } void Hardware_waitForTrigger(Hardware *my, void *partEvt) @@ -69,9 +72,9 @@ void Hardware_waitForTrigger(Hardware *my, void *partEvt) void readoutTrig(void *subEvt) { - UInt4 *data; - UInt4 *first; - static UInt1 trigTag; + uint32_t *data; + uint32_t *first; + static uint8_t trigTag; size_t size; SubEvt_setDecoding(subEvt, SubEvtDecoding_32bitData); @@ -88,17 +91,17 @@ void readoutTrig(void *subEvt) SubEvt_setSize(subEvt, (char *)data - (char *)subEvt); SubEvt_setId(subEvt, SubEvtId_trigCode); SubEvt_setTrigNr(subEvt, trigTag); - msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt)); + syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt)); trigTag++; } void readoutSoft(void *subEvt) { - UInt4 *data; - UInt4 *first; - static UInt1 trigTag; - UInt4 id; + uint32_t *data; + uint32_t *first; + static uint8_t trigTag; + uint32_t id; size_t size; SubEvt_setDecoding(subEvt, SubEvtDecoding_32bitData); @@ -128,7 +131,7 @@ void readoutSoft(void *subEvt) SubEvt_setSize(subEvt, size); SubEvt_setId(subEvt, id); SubEvt_setTrigNr(subEvt, trigTag); - msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt)); + syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt)); trigTag++; } @@ -136,9 +139,9 @@ void readoutSoft(void *subEvt) void Hardware_readout(Hardware *my, void *partEvt) { void *subEvt = SubEvt_data(partEvt); - static UInt4 trigNr; - static UInt1 trigTag; - UInt1 trigCode; + static uint32_t trigNr; + static uint8_t trigTag; + uint8_t trigCode; SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts); @@ -156,5 +159,5 @@ void Hardware_readout(Hardware *my, void *partEvt) SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt); SubEvt_setId(partEvt, trigCode); SubEvt_setTrigNr(partEvt, (trigNr << 8) | trigTag); - msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt)); + syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt)); } diff --git a/hadaq/hwtbus.c b/hadaq/hwtbus.c index bd26611..880cc38 100644 --- a/hadaq/hwtbus.c +++ b/hadaq/hwtbus.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtbus.c,v 1.7 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtbus.c,v 1.8 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -35,16 +35,16 @@ Hardware *newHardware(void) HwDtu *dtu; if (0 > conParam(param)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } - my = allocMem(sizeof(Hardware)); + my = malloc(sizeof(Hardware)); - my->maxSubEvtSize = SubEvt_hdrSize() + 2000 * sizeof(UInt4); + my->maxSubEvtSize = SubEvt_hdrSize() + 2000 * sizeof(uint32_t); - my->dtu = allocMem(sizeof(HwDtu)); + my->dtu = malloc(sizeof(HwDtu)); if (0 > conHwDtu(my->dtu, "dtu", param)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } @@ -55,16 +55,16 @@ Hardware *newHardware(void) void deleteHardware(Hardware *my) { desHwDtu(my->dtu); - freeMem(my->dtu); + free(my->dtu); - freeMem(my); + free(my); } void Hardware_waitForTrigger(Hardware *my, void *subEvt) { static int nextId = SubEvtId_trigCode; static int doReadOut; - static UInt1 trigTag = 0; + static uint8_t trigTag = 0; static unsigned long trigNr = 0; switch (nextId) { @@ -79,7 +79,7 @@ void Hardware_waitForTrigger(Hardware *my, void *subEvt) #endif } HwDtu_read(my->dtu); - msglog(LOG_DEBUG, "Dtu: tag: 0x%02x, code: 0x%02x\n", my->dtu->trigTag, my->dtu->trigCode); + syslog(LOG_DEBUG, "Dtu: tag: 0x%02x, code: 0x%02x", my->dtu->trigTag, my->dtu->trigCode); switch (my->dtu->trigCode & 0x7) { case 0x02: case 0x03: @@ -104,8 +104,8 @@ void Hardware_waitForTrigger(Hardware *my, void *subEvt) void Hardware_readout(Hardware *my, void *subEvt) { - UInt4 *data = SubEvt_data(subEvt); - UInt4 *first = data; + uint32_t *data = SubEvt_data(subEvt); + uint32_t *first = data; size_t size; switch (SubEvt_pureId(subEvt)) { @@ -120,7 +120,7 @@ void Hardware_readout(Hardware *my, void *subEvt) } break; } - size = SubEvt_size(subEvt) + sizeof(UInt4) * (data - first); + size = SubEvt_size(subEvt) + sizeof(uint32_t) * (data - first); if (size > my->maxSubEvtSize) { SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000); size = my->maxSubEvtSize; diff --git a/hadaq/hwtip.c b/hadaq/hwtip.c index 1df7c2f..a7b4ead 100644 --- a/hadaq/hwtip.c +++ b/hadaq/hwtip.c @@ -1,11 +1,14 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtip.c,v 1.20 2001-08-31 11:17:31 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtip.c,v 1.21 2001-11-18 11:56:21 hadaq Exp $"; #include #include #include #include -#include +#include + +#include + #include #include @@ -49,7 +52,7 @@ static LVme_L berrGetL(LVme * my, unsigned long offset) #if 0 if (oldOff != offset && oldWord == retVal) { - msglog(LOG_ERR, "word twice: 0x%08x on 0x%08x\n", retVal, offset); + syslog(LOG_ERR, "word twice: 0x%08x on 0x%08x", retVal, offset); } oldOff = offset; oldWord = retVal; @@ -79,7 +82,7 @@ static void berrSetL(LVme * my, unsigned long offset, LVme_L v) static int bankRequested(HwTip * my) { - UInt2 val; + uint16_t val; val = my->bankRequested; return val; @@ -88,7 +91,7 @@ static int bankRequested(HwTip * my) #if 0 static int bankConfirmed(HwTip * my) { - UInt2 val; + uint16_t val; val = -1; return val; @@ -114,15 +117,15 @@ int conHwTip(HwTip * my, const char *name, const Param *param) Param_getInt(param, my->name, "cardbase", ¶mWasFound, &cardBase); if (!paramWasFound) { - msglog(LOG_WARNING, - "Parameter %s(%s) not found, default = 0\n", my->name, "cardbase"); + syslog(LOG_WARNING, + "Parameter %s(%s) not found, default = 0", my->name, "cardbase"); cardBase = 0; } - msglog(LOG_INFO, "conc cardbase %.8x\n", cardBase ); + syslog(LOG_INFO, "conc cardbase %.8x", cardBase ); - my->lvme = allocMem(sizeof(LVme)); + my->lvme = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme, cardBase, 0x3000000UL, 0x09UL, 0, 0)) { - msglog(LOG_ERR, "HwTip on %p not found\n", cardBase); + syslog(LOG_ERR, "HwTip on %p not found", cardBase); return -1; } @@ -186,13 +189,13 @@ int HwTip_isEmpty(HwTip * my) int HwTip_readSubEvt(HwTip * my, void *subEvt) { - UInt4 *data = (UInt4 *) subEvt; + uint32_t *data = (uint32_t *) subEvt; int firstAddr; size_t size; size = LVme_getL(my->lvme, my->currAddr); if (size > 0x40000) { - msglog(LOG_ERR, "found size: %.8x , address: %.8x, too long, fatal! \n", size, my->currAddr); + syslog(LOG_ERR, "found size: %.8x , address: %.8x, too long, fatal! ", size, my->currAddr); exit(1); } /* copy one sub evt from RC to memory */ diff --git a/hadaq/hwtof.c b/hadaq/hwtof.c index afc71bb..7f17494 100644 --- a/hadaq/hwtof.c +++ b/hadaq/hwtof.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtof.c,v 1.19 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtof.c,v 1.20 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -42,21 +42,21 @@ Hardware *newHardware(void) int i; if (0 > conParam(param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } - my = allocMem(sizeof(Hardware)); + my = malloc(sizeof(Hardware)); - my->maxSubEvtSize = SubEvt_hdrSize() + (NCRATES * 620 * sizeof(UInt4)); + my->maxSubEvtSize = SubEvt_hdrSize() + (NCRATES * 620 * sizeof(uint32_t)); my->tipToRead = 0; for (i = 0; i < NTIPS; i++) { char buf[16]; - my->tip[i] = allocMem(sizeof(HwTip)); + my->tip[i] = malloc(sizeof(HwTip)); sprintf(buf, "tip%d", i); if (0 > conHwTip(my->tip[i], buf, param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } } @@ -72,10 +72,10 @@ void deleteHardware(Hardware *my) for (i = 0; i < NTIPS; i++) { desHwTip(my->tip[i]); - freeMem(my->tip[i]); + free(my->tip[i]); } - freeMem(my); + free(my); } void Hardware_waitForTrigger(Hardware *my, void *subEvt) @@ -95,8 +95,8 @@ void Hardware_waitForTrigger(Hardware *my, void *subEvt) void Hardware_readout(Hardware *my, void *partEvt) { - static UInt4 trigNr = 0; - UInt1 trigTag; + static uint32_t trigNr = 0; + uint8_t trigTag; void *subEvt = SubEvt_data(partEvt); int i; @@ -115,6 +115,6 @@ void Hardware_readout(Hardware *my, void *partEvt) SubEvt_setId(partEvt, 0); trigNr++; #ifndef NDEBUG - msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt)); + syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt)); #endif } diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c index 91f3ac7..ffe068f 100644 --- a/hadaq/hwtrig.c +++ b/hadaq/hwtrig.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.20 2001-11-18 09:35:40 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.21 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -47,7 +47,10 @@ size_t Hardware_maxSubEvtSize(const Hardware *my) return my->maxSubEvtSize; } -#include +#include + +#include + int Hardware_inSpill(const Hardware *my) { @@ -61,43 +64,43 @@ Hardware *newHardware(void) int paramWasFound; Param *param; - my = allocMem(sizeof(Hardware)); - my->maxSubEvtSize = (SubEvt_hdrSize() + 2 * 500 * sizeof(UInt4)) /* MU */ - + ( NCRATES * ( SubEvt_hdrSize() + 620 * sizeof(UInt4))); /* CONC */ + my = malloc(sizeof(Hardware)); + my->maxSubEvtSize = (SubEvt_hdrSize() + 2 * 500 * sizeof(uint32_t)) /* MU */ + + ( NCRATES * ( SubEvt_hdrSize() + 620 * sizeof(uint32_t))); /* CONC */ my->evtCount = 0; my->old_evtCount = 0; - param = allocMem(sizeof(Param)); + param = malloc(sizeof(Param)); conParam(param); Param_getInt(param, "mu", "cardbase", ¶mWasFound, &cardBase); - msglog(LOG_INFO, "MU cardbase %.8x\n", cardBase ); + syslog(LOG_INFO, "MU cardbase %.8x", cardBase ); if (!paramWasFound) { - msglog(LOG_WARNING, - "Parameter %s(%s) not found, default = 0\n", "mu", "cardbase"); + syslog(LOG_WARNING, + "Parameter %s(%s) not found, default = 0", "mu", "cardbase"); cardBase = 0; } - my->lvme0 = allocMem(sizeof(LVme)); + my->lvme0 = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme0, cardBase, 0x100000UL, 0x09UL, 0, 0)) { - msglog(LOG_ERR, "MU on %p not found\n", cardBase); + syslog(LOG_ERR, "MU on %p not found", cardBase); return NULL; } - my->lvme4 = allocMem(sizeof(LVme)); + my->lvme4 = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme4, cardBase + 0x4000000, 0x10000UL, 0x09UL, 0, 0)) { - msglog(LOG_ERR, "MU on %p not found\n", cardBase); + syslog(LOG_ERR, "MU on %p not found", cardBase); return NULL; } - my->lvme6 = allocMem(sizeof(LVme)); + my->lvme6 = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme6, cardBase + 0x6000000, 0x10000UL, 0x09UL, 0, 0)) { - msglog(LOG_ERR, "MU on %p not found\n", cardBase); + syslog(LOG_ERR, "MU on %p not found", cardBase); return NULL; } #ifdef TOF_READOUT - my->tip = allocMem(sizeof(HwTip)); + my->tip = malloc(sizeof(HwTip)); if (0 > conHwTip(my->tip, "conc", param)) { - msglog(LOG_ERR, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return NULL; } #endif @@ -111,16 +114,16 @@ void deleteHardware(Hardware *my) { #ifdef TOF_READOUT desHwTip(my->tip); - freeMem(my->tip); + free(my->tip); #endif desLVme(my->lvme6); - freeMem(my->lvme6); + free(my->lvme6); desLVme(my->lvme4); - freeMem(my->lvme4); + free(my->lvme4); desLVme(my->lvme0); - freeMem(my->lvme0); - freeMem(my); + free(my->lvme0); + free(my); } void Hardware_waitForTrigger(Hardware *my, void *partEvt) @@ -173,7 +176,7 @@ void Hardware_waitForTrigger(Hardware *my, void *partEvt) void readoutTrig(Hardware *my, void *subEvt) { - UInt4 *data; + uint32_t *data; size_t size; data = SubEvt_begin(subEvt); @@ -194,7 +197,7 @@ void readoutTrig(Hardware *my, void *subEvt) } #ifndef NDEBUG - msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt)); + syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt)); #endif } @@ -202,8 +205,8 @@ void Hardware_readout(Hardware *my, void *partEvt) { void *subEvt = SubEvt_data(partEvt); static unsigned long trigNr = 0; - UInt1 trigTag; - UInt1 trigCode; + uint8_t trigTag; + uint8_t trigCode; int i; SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts); @@ -229,7 +232,7 @@ void Hardware_readout(Hardware *my, void *partEvt) HwTip_readSubEvt(my->tip, subEvt); if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) { SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000); - msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n", + syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x", my->tip->name, trigTag, SubEvt_trigNr(subEvt)); } subEvt = SubEvt_next(partEvt, subEvt); @@ -245,7 +248,7 @@ void Hardware_readout(Hardware *my, void *partEvt) assert(SubEvt_size(partEvt) <= my->maxSubEvtSize); #ifndef NDEBUG - msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt)); + syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt)); #endif } diff --git a/hadaq/hwv488.c b/hadaq/hwv488.c index a1259df..ddde494 100644 --- a/hadaq/hwv488.c +++ b/hadaq/hwv488.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv488.c,v 1.7 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv488.c,v 1.8 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -9,7 +9,10 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + +#include + #include @@ -28,10 +31,10 @@ int conHwV488(HwV488 * my, const char *name, const Param *param) my->trigNr = 0; cardBase = Param_getInt(param, my->name, "cardbase"); - my->lvme = allocMem(sizeof(LVme)); + my->lvme = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme, cardBase, 0x10000, 0x39, V488_TYPE, 2)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return -1; } LVme_setW(my->lvme, V488_RESET, 0); @@ -48,7 +51,7 @@ int conHwV488(HwV488 * my, const char *name, const Param *param) void desHwV488(HwV488 * my) { desLVme(my->lvme); - freeMem(my->lvme); + free(my->lvme); } int HwV488_isEmpty(HwV488 *my) { @@ -57,25 +60,25 @@ int HwV488_isEmpty(HwV488 *my) { int HwV488_readData(HwV488 * my, void *subEvt) { - UInt2 *data = SubEvt_end(subEvt); - UInt2 hdr; + uint16_t *data = SubEvt_end(subEvt); + uint16_t hdr; int nWords; - UInt1 trigTag; + uint8_t trigTag; - msglog(LOG_DEBUG, "V488 Readout\n"); + syslog(LOG_DEBUG, "V488 Readout"); *data++ = my->id; if (!HwV488_isEmpty(my)) { *data++ = hdr = LVme_getW(my->lvme, V488_OUT_BUF); if ((hdr & 0x8000) != 0x8000) { - msglog(LOG_EMERG, "V488 First word not header: 0x%04x\n", hdr); + syslog(LOG_EMERG, "V488 First word not header: 0x%04x", hdr); } else { - msglog(LOG_DEBUG, "V488 First word is header: 0x%04x\n", hdr); + syslog(LOG_DEBUG, "V488 First word is header: 0x%04x", hdr); } #if 0 trigTag = hdr & 0xff; if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) { - msglog(LOG_EMERG, "%s trigNr mismatch: 0x%08x != 0x%02x \n", + syslog(LOG_EMERG, "%s trigNr mismatch: 0x%08x != 0x%02x ", my->name, SubEvt_trigNr(subEvt), trigTag); } #endif diff --git a/hadaq/hwv488.h b/hadaq/hwv488.h index c5224fd..59c5b50 100644 --- a/hadaq/hwv488.h +++ b/hadaq/hwv488.h @@ -8,7 +8,7 @@ typedef struct HwV488S { char name[16]; - UInt2 id; + uint16_t id; LVme *lvme; unsigned long trigNr; } HwV488; diff --git a/hadaq/hwv775.c b/hadaq/hwv775.c index dccfb93..66913ef 100644 --- a/hadaq/hwv775.c +++ b/hadaq/hwv775.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv775.c,v 1.12 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv775.c,v 1.13 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -9,7 +9,10 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + +#include + #include @@ -27,10 +30,10 @@ int conHwV775(HwV775 *my, const char *name, const Param *param) strcpy(my->name, name); cardBase = Param_getInt(param, my->name, "cardbase"); - my->lvme = allocMem(sizeof(LVme)); + my->lvme = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme, cardBase, 0x10000, 0x09, V775_GEO_ADDR, 2)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return -1; } LVme_setW(my->lvme, V775_RESET, 0); @@ -57,7 +60,7 @@ int conHwV775(HwV775 *my, const char *name, const Param *param) void desHwV775(HwV775 *my) { desLVme(my->lvme); - freeMem(my->lvme); + free(my->lvme); } int HwV775_isEmpty(HwV775 *my) @@ -67,18 +70,18 @@ int HwV775_isEmpty(HwV775 *my) int HwV775_readData(HwV775 *my, void *subEvt) { - UInt4 *data = SubEvt_end(subEvt); - UInt4 hdr; - UInt4 eob; + uint32_t *data = SubEvt_end(subEvt); + uint32_t hdr; + uint32_t eob; int nWords; - UInt1 trigTag; + uint8_t trigTag; - msglog(LOG_DEBUG, "V775 Readout\n"); + syslog(LOG_DEBUG, "V775 Readout"); *data++ = hdr = LVme_getL(my->lvme, V775_OUT_BUF); if ((hdr & 0x07000000) != 0x02000000) { - msglog(LOG_EMERG, "V775 First word not header: 0x%08x\n", hdr); + syslog(LOG_EMERG, "V775 First word not header: 0x%08x", hdr); } else { - msglog(LOG_DEBUG, "V775 First word is header: 0x%08x\n", hdr); + syslog(LOG_DEBUG, "V775 First word is header: 0x%08x", hdr); } nWords = hdr >> 8 & 0xff; @@ -88,15 +91,15 @@ int HwV775_readData(HwV775 *my, void *subEvt) *data++ = eob = LVme_getL(my->lvme, V775_OUT_BUF); if ((eob & 0x07000000) != 0x04000000) { - msglog(LOG_EMERG, "V775 Last word not eob: 0x%08x\n", eob); + syslog(LOG_EMERG, "V775 Last word not eob: 0x%08x", eob); } else { - msglog(LOG_DEBUG, "V775 Last word is eob: 0x%08x\n", eob); + syslog(LOG_DEBUG, "V775 Last word is eob: 0x%08x", eob); } trigTag = eob & 0xff; if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) { SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000); - msglog(LOG_EMERG, "%s trigNr mismatch: 0x%08x != 0x%02x \n", + syslog(LOG_EMERG, "%s trigNr mismatch: 0x%08x != 0x%02x ", my->name, SubEvt_trigNr(subEvt), trigTag); } SubEvt_setSize(subEvt, (char *) data - (char *) subEvt); diff --git a/hadaq/hwv878.c b/hadaq/hwv878.c index 3452ce7..4a85e73 100644 --- a/hadaq/hwv878.c +++ b/hadaq/hwv878.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv878.c,v 1.10 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwv878.c,v 1.11 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199309L @@ -9,7 +9,10 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + +#include + #include @@ -27,10 +30,10 @@ int conHwV878(HwV878 *my, const char *name, const Param *param) strcpy(my->name, name); cardBase = Param_getInt(param, my->name, "cardbase"); - my->lvme = allocMem(sizeof(LVme)); + my->lvme = malloc(sizeof(LVme)); if (0 > conLVme(my->lvme, cardBase, 0x10000, 0x09, V878_GEO_ADDR, 2)) { - msglog(LOG_DEBUG, "%s:%d:%s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); return -1; } /* reset, don't change next 2 lines */ @@ -60,7 +63,7 @@ int conHwV878(HwV878 *my, const char *name, const Param *param) void desHwV878(HwV878 *my) { desLVme(my->lvme); - freeMem(my->lvme); + free(my->lvme); } int HwV878_isEmpty(HwV878 *my) @@ -70,18 +73,18 @@ int HwV878_isEmpty(HwV878 *my) int HwV878_readData(HwV878 *my, void *subEvt) { - UInt4 *data = SubEvt_end(subEvt); - UInt4 hdr; - UInt4 eob; + uint32_t *data = SubEvt_end(subEvt); + uint32_t hdr; + uint32_t eob; int nWords; - UInt1 trigTag; + uint8_t trigTag; - msglog(LOG_DEBUG, "V878 Readout\n"); + syslog(LOG_DEBUG, "V878 Readout"); *data++ = hdr = LVme_getL(my->lvme, V878_OUT_BUF); if ((hdr & 0x07000000) != 0x02000000) { - msglog(LOG_EMERG, "V878 First word not header: 0x%08x\n", hdr); + syslog(LOG_EMERG, "V878 First word not header: 0x%08x", hdr); } else { - msglog(LOG_DEBUG, "V878 First word is header: 0x%08x\n", hdr); + syslog(LOG_DEBUG, "V878 First word is header: 0x%08x", hdr); } nWords = hdr >> 8 & 0xff; @@ -91,15 +94,15 @@ int HwV878_readData(HwV878 *my, void *subEvt) *data++ = eob = LVme_getL(my->lvme, V878_OUT_BUF); if ((eob & 0x07000000) != 0x04000000) { - msglog(LOG_EMERG, "V878 Last word not eob: 0x%08x\n", eob); + syslog(LOG_EMERG, "V878 Last word not eob: 0x%08x", eob); } else { - msglog(LOG_DEBUG, "V878 Last word is eob: 0x%08x\n", eob); + syslog(LOG_DEBUG, "V878 Last word is eob: 0x%08x", eob); } trigTag = eob & 0xff; if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) { SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000); - msglog(LOG_EMERG, "%s trigNr mismatch: 0x%08x != 0x%02x \n", + syslog(LOG_EMERG, "%s trigNr mismatch: 0x%08x != 0x%02x ", my->name, SubEvt_trigNr(subEvt), trigTag); } SubEvt_setSize(subEvt, (char *) data - (char *) subEvt); diff --git a/hadaq/makeenv b/hadaq/makeenv index 432003a..979682b 100644 --- a/hadaq/makeenv +++ b/hadaq/makeenv @@ -6,72 +6,72 @@ then export AR="ar" export CC="c89" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -ltclParam -lhadesstd -llatm -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -ltclParam -llatm -L/usr/fore/lib -latm -lrt -ltk -lX11 -ltcl -lm" export INCLUDES="-I/usr/local/include -I$HOME/include" - export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT" + export DEFINES="" export ARFLAGS="rv" elif test $HADAQ_CONF = "HPUX" then export AR="ar" export CC="cc -Ae" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme -ltk -lX11 -ltcl -lm" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -ltclParam -llatm -llvme -ltk -lX11 -ltcl -lm" export INCLUDES="-I/usr/local/include -I$HOME/include" - export DEFINES="-DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT" + export DEFINES="" export ARFLAGS="rv" elif test $HADAQ_CONF = "UNIX_NOATM" then export AR="ar" export CC="c89" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -lrt_p -ltk -lX11 -ltcl -lm" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -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 DEFINES="-DNOATM" export ARFLAGS="rv" elif test $HADAQ_CONF = "LINUX" then export AR="ar" export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -lpthread -lrt_p -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl" + export LOADLIBES="-L$HOME/lib/$SYSTYPE -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 DEFINES="-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 -lpthread -lrt -lm -ldl" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -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 -DPOSIX_SEMAPHORES_DONT_WORK -DNOATM" + export DEFINES="-DPOSIX_SEMAPHORES_DONT_WORK -DNOATM" export ARFLAGS="rv" elif test $HADAQ_CONF = "LINUX_E128" then export AR="ar" export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -ltclParam -llatm -llvme" export INCLUDES="-I/usr/local/include -I$HOME/include" - export DEFINES="-DLVME_SOFTSWAP -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM" + export DEFINES="-DLVME_SOFTSWAP -DNOATM" export ARFLAGS="rv" elif test $HADAQ_CONF = "LYNXOS" then export AR="ar" export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llatm -llvme -ltcl -lm -lrpc -lnetinet -L/usr/ATM/lib -L$HOME/ATM/lib -latm -L/lib/ces -lvme -lbma -luio" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lcompat -ltclParam -llatm -llvme -ltcl -lm -lrpc -lnetinet -L/usr/ATM/lib -L$HOME/ATM/lib -latm -L/lib/ces -lvme -lbma -luio" export INCLUDES="-I/usr/local/include -I$HOME/include" - export DEFINES="-DHADESSTD_NEXITSTAT" + export DEFINES="-DLOG_PERROR_DOESNT_WORK" export ARFLAGS="rv" elif test $HADAQ_CONF = "LYNXOS_E7" then export AR="ar" export CC="gcc" export RPCGEN="rpcgen" - export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lhadesstd -ltclParam -llvme -ltcl -lm -lrpc -lnetinet ../*.o" + export LOADLIBES="-L/usr/local/lib -L$HOME/lib/$SYSTYPE -lcompat -ltclParam -llvme -ltcl -lm -lrpc -lnetinet ../*.o" export INCLUDES="-I/usr/local/include -I$HOME/include" - export DEFINES="-DHADESSTD_NEXITSTAT -DNOATM" + export DEFINES="-DLOG_PERROR_DOESNT_WORK -DNOATM" export ARFLAGS="rv" else echo "Unknown HADAQ_CONF: $HADAQ_CONF, not set." >&2 diff --git a/hadaq/memnet.c b/hadaq/memnet.c index b4a1060..5105754 100644 --- a/hadaq/memnet.c +++ b/hadaq/memnet.c @@ -1,8 +1,12 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/memnet.c,v 6.13 2001-11-15 13:53:45 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/memnet.c,v 6.14 2001-11-18 11:56:21 hadaq Exp $"; #define _GNU_C_SOURCE +#define SYSLOG_NAMES #include +#ifdef __GNUC__ +#include +#endif #include @@ -13,7 +17,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + #include #include "shmtrans.h" @@ -44,18 +49,17 @@ static int min(int a, int b) static void usage(const char *progName) { - msglog(LOG_ERR, "Usage: %s [-a (agentCtrl)] -o outPath\n", progName); - msglog(LOG_ERR, "Usage: [-w bandwidth] [-p priority] [-q queueSize]\n"); - msglog_usage(); + syslog(LOG_ERR, "Usage: %s [-a (agentCtrl)] -o outPath", progName); + syslog(LOG_ERR, "Usage: [-w bandwidth] [-p priority] [-q queueSize]"); } static void argsDump(TheArgs *my) { - msglog(LOG_DEBUG, "outPath: %s\n", my->outPath); - msglog(LOG_DEBUG, "bandWidth: %d\n", my->bandWidth); - msglog(LOG_DEBUG, "priority: %d\n", my->priority); - msglog(LOG_DEBUG, "isStandalone: %d\n", my->isStandalone); - msglog(LOG_DEBUG, "queueSize: %d\n", my->queueSize); - msglog(LOG_DEBUG, "verbosity: %s\n", my->verbosity); + syslog(LOG_DEBUG, "outPath: %s", my->outPath); + syslog(LOG_DEBUG, "bandWidth: %d", my->bandWidth); + syslog(LOG_DEBUG, "priority: %d", my->priority); + syslog(LOG_DEBUG, "isStandalone: %d", my->isStandalone); + syslog(LOG_DEBUG, "queueSize: %d", my->queueSize); + syslog(LOG_DEBUG, "verbosity: %s", my->verbosity); } static void argsDefault(TheArgs *my) { @@ -155,7 +159,10 @@ int main(int argc, char *argv[]) ShmTrans *shmTrans; int exitStat; - msglog_setlevel(argv[0], "info"); + openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0); + setlogmask(LOG_UPTO(LOG_INFO)); + + argsDefault(theArgs); argsFromParam(theArgs, argc, argv); @@ -164,10 +171,15 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (msglog_setlevel(argv[0], theArgs->verbosity) != 1) { - msglog_usage(); + for (i = 0; prioritynames[i].c_name != NULL + && 0 != strcmp(prioritynames[i].c_name, theArgs->verbosity); i++) { + } + if (prioritynames[i].c_name == NULL) { exit(EXIT_FAILURE); + } else { + setlogmask(LOG_UPTO(prioritynames[i].c_val)); } + argsDump(theArgs); if (strcmp(theArgs->outPath, "") == 0) { @@ -175,19 +187,19 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } if (NULL == (worker = Worker_initBegin(argv[0], sigHandler, theArgs->priority, theArgs->isStandalone))) { - msglog(LOG_ERR, "initializing working process: %s\n"), strerror(errno); + syslog(LOG_ERR, "initializing working process: %s"), strerror(errno); exitStat = EXIT_FAILURE; goto bailOut0; } if (NULL == (shmTrans = ShmTrans_create("subevtqueue", 2 * theArgs->queueSize))) { - msglog(LOG_ERR, - "creating shared memory \"subevtqueue\": %s\n"), strerror(errno); + syslog(LOG_ERR, + "creating shared memory \"subevtqueue\": %s"), strerror(errno); exitStat = EXIT_FAILURE; goto bailOut1; } if (NULL == (netTrans = NetTrans_open(theArgs->outPath, theArgs->bandWidth, worker))) { - msglog(LOG_ERR, - "opening network transport %s: %s\n", theArgs->outPath, strerror(errno)); + syslog(LOG_ERR, + "opening network transport %s: %s", theArgs->outPath, strerror(errno)); exitStat = EXIT_FAILURE; goto bailOut2; } @@ -201,7 +213,7 @@ int main(int argc, char *argv[]) hadTuQueue = ShmTrans_recv(shmTrans); if (0 > NetTrans_send(netTrans, hadTuQueue)) { - msglog(LOG_ERR, "sending network packet: %s\n", strerror(errno)); + syslog(LOG_ERR, "sending network packet: %s", strerror(errno)); exitStat = EXIT_FAILURE; goto bailOut3; } diff --git a/hadaq/netmem.c b/hadaq/netmem.c index 424f351..37db1eb 100644 --- a/hadaq/netmem.c +++ b/hadaq/netmem.c @@ -1,8 +1,12 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.17 2001-11-15 13:53:45 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.18 2001-11-18 11:56:21 hadaq Exp $"; #define _GNU_C_SOURCE +#define SYSLOG_NAMES #include +#ifdef __GNUC__ +#include +#endif #include #include @@ -10,7 +14,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + #include #include "worker.h" @@ -39,21 +44,20 @@ void sigHandler(int sig) static void usage(const char *progName) { - msglog(LOG_ERR, "Usage: %s -i inPath [-i inPath] -m nrOfMsgs [-p priority]\n", progName); - msglog_usage(); + syslog(LOG_ERR, "Usage: %s -i inPath [-i inPath] -m nrOfMsgs [-p priority]", progName); } static void argsDump(TheArgs *my) { int i; for (i = 0; i < my->inPathCnt; i++) { - msglog(LOG_DEBUG, "inPath[%d]: %s\n", i, my->inPath[i]); + syslog(LOG_DEBUG, "inPath[%d]: %s", i, my->inPath[i]); } - msglog(LOG_DEBUG, "nrOfMsgs: %d\n", my->nrOfMsgs); - msglog(LOG_DEBUG, "priority: %d\n", my->priority); - msglog(LOG_DEBUG, "isStandalone: %d\n", my->isStandalone); - msglog(LOG_DEBUG, "queueSize: %d\n", my->queueSize); - msglog(LOG_DEBUG, "verbosity: %s\n", my->verbosity); + syslog(LOG_DEBUG, "nrOfMsgs: %d", my->nrOfMsgs); + syslog(LOG_DEBUG, "priority: %d", my->priority); + syslog(LOG_DEBUG, "isStandalone: %d", my->isStandalone); + syslog(LOG_DEBUG, "queueSize: %d", my->queueSize); + syslog(LOG_DEBUG, "verbosity: %s", my->verbosity); } static void argsDefault(TheArgs *my) { @@ -163,7 +167,10 @@ int main(int argc, char *argv[]) void **hadTu; size_t *hadTuSize; - msglog_setlevel(argv[0], "info"); + openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0); + setlogmask(LOG_UPTO(LOG_INFO)); + + argsDefault(theArgs); argsFromParam(theArgs, argc, argv); @@ -172,23 +179,28 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (msglog_setlevel(argv[0], theArgs->verbosity) != 1) { - msglog_usage(); + for (i = 0; prioritynames[i].c_name != NULL + && 0 != strcmp(prioritynames[i].c_name, theArgs->verbosity); i++) { + } + if (prioritynames[i].c_name == NULL) { exit(EXIT_FAILURE); + } else { + setlogmask(LOG_UPTO(prioritynames[i].c_val)); } + argsDump(theArgs); if (theArgs->inPathCnt == 0 || theArgs->nrOfMsgs == 0 || theArgs->inPathCnt != theArgs->nrOfMsgs) { usage(argv[0]); exit(EXIT_FAILURE); } - netTrans = allocMem(theArgs->nrOfMsgs * sizeof(NetTrans *)); - shmTrans = allocMem(theArgs->nrOfMsgs * sizeof(ShmTrans *)); - hadTu = allocMem(theArgs->nrOfMsgs * sizeof(void *)); - hadTuSize = allocMem(theArgs->nrOfMsgs * sizeof(size_t)); + netTrans = malloc(theArgs->nrOfMsgs * sizeof(NetTrans *)); + shmTrans = malloc(theArgs->nrOfMsgs * sizeof(ShmTrans *)); + hadTu = malloc(theArgs->nrOfMsgs * sizeof(void *)); + hadTuSize = malloc(theArgs->nrOfMsgs * sizeof(size_t)); if (NULL == (worker = Worker_initBegin(argv[0], sigHandler, theArgs->priority, theArgs->isStandalone))) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); exit(EXIT_FAILURE); } for (i = 0; i < theArgs->nrOfMsgs; i++) { @@ -196,14 +208,14 @@ int main(int argc, char *argv[]) netTrans[i] = NetTrans_create(theArgs->inPath[i], 0, worker); if (netTrans[i] == NULL) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); exit(EXIT_FAILURE); } sprintf(buf, "netqueue%d", i); shmTrans[i] = ShmTrans_open(buf, 2 * theArgs->queueSize); if (shmTrans[i] == NULL) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, strerror(errno)); exit(EXIT_FAILURE); } diff --git a/hadaq/nettrans.c b/hadaq/nettrans.c index 40c723e..d97b7b7 100644 --- a/hadaq/nettrans.c +++ b/hadaq/nettrans.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.23 2001-11-15 14:58:32 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.24 2001-11-18 11:56:21 hadaq Exp $"; #define _GNU_SOURCE @@ -17,7 +17,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + #include #include "hadtu.h" @@ -68,7 +69,7 @@ static int openUdp(NetTrans *my, unsigned long addr, int port, int fl) { } if (0 > retVal) { - msglog(LOG_DEBUG, "openAtm: %s\n", strerror(errno)); + syslog(LOG_DEBUG, "openAtm: %s", strerror(errno)); } return retVal; } @@ -84,7 +85,7 @@ static int openAtm(NetTrans *my, int vpi, int vci, size_t bw, int fl) { lAtmAttr->vci = vci; lAtmAttr->peakBandwidth = bw; - msglog(LOG_DEBUG, "aal: %d; vpi: %d; vci: %d; bandwidth: %d\n", + syslog(LOG_DEBUG, "aal: %d; vpi: %d; vci: %d; bandwidth: %d", lAtmAttr->aal, lAtmAttr->vpi, lAtmAttr->vci, lAtmAttr->peakBandwidth); my->lAtm = newLAtm("/dev/fa0", fl); @@ -114,7 +115,7 @@ static int openAtm(NetTrans *my, int vpi, int vci, size_t bw, int fl) { } if (0 > retVal) { - msglog(LOG_DEBUG, "openAtm: %s\n", strerror(errno)); + syslog(LOG_DEBUG, "openAtm: %s", strerror(errno)); } return retVal; } @@ -156,7 +157,7 @@ int openGeneric(NetTrans *my, const char *name, int flags, size_t bandwidth) { } if (0 > retVal) { - msglog(LOG_DEBUG, "openGeneric: %s\n", strerror(errno)); + syslog(LOG_DEBUG, "openGeneric: %s", strerror(errno)); } return retVal; } @@ -178,7 +179,7 @@ int closeGeneric(NetTrans *my) { } if (0 > retVal) { - msglog(LOG_DEBUG, "closeGeneric: %s\n", strerror(errno)); + syslog(LOG_DEBUG, "closeGeneric: %s", strerror(errno)); } return retVal; } @@ -216,7 +217,7 @@ int sendGeneric(NetTrans *my) { } if (0 > retVal) { - msglog(LOG_DEBUG, "sendGeneric: %s\n", strerror(errno)); + syslog(LOG_DEBUG, "sendGeneric: %s", strerror(errno)); } return retVal; } @@ -236,7 +237,7 @@ int recvGeneric(NetTrans *my) { } if (0 > retVal) { - msglog(LOG_DEBUG, "recvGeneric: %s\n", strerror(errno)); + syslog(LOG_DEBUG, "recvGeneric: %s", strerror(errno)); } else { my->pktSize = retVal; } @@ -256,7 +257,7 @@ NetTrans *NetTrans_create(const char *name, size_t bandwidth, Worker *worker) char buf[80]; static int instance = 0; - my = allocMem(sizeof(NetTrans)); + my = malloc(sizeof(NetTrans)); if (0 > openGeneric(my, name, O_RDONLY, bandwidth)) { return NULL; @@ -289,7 +290,7 @@ NetTrans *NetTrans_open(const char *name, size_t bandwidth, Worker *worker) NetTrans *my; char buf[80]; - my = allocMem(sizeof(NetTrans)); + my = malloc(sizeof(NetTrans)); if (0 > openGeneric(my, name, O_WRONLY, bandwidth)) { return NULL; @@ -313,13 +314,13 @@ NetTrans *NetTrans_open(const char *name, size_t bandwidth, Worker *worker) void NetTrans_close(NetTrans *my) { closeGeneric(my); - freeMem(my); + free(my); } void NetTrans_remove(NetTrans *my) { closeGeneric(my); - freeMem(my); + free(my); } static size_t adjustedSize(NetTrans *my, void *hadTu) { @@ -374,13 +375,13 @@ static int assembleMsg(NetTrans *my, void *hadTu, size_t size) /* the parent functions this should be handled, but this would need */ /* better sunc. between nettrans & shmtrans */ if (hadTu == NULL) { - my->pkt = allocMem(my->mtuSize); + my->pkt = malloc(my->mtuSize); if (0 > recvGeneric(my)) { abort(); } my->offset = 0; (*my->pktsDiscarded)++; - freeMem(my->pkt); + free(my->pkt); return 0; } diff --git a/hadaq/nettrans.h b/hadaq/nettrans.h index 2bd9e98..fe4aad0 100644 --- a/hadaq/nettrans.h +++ b/hadaq/nettrans.h @@ -1,7 +1,6 @@ #ifndef NETTRANS_H #define NETTRANS_H -#include #include #include "worker.h" diff --git a/hadaq/online.c b/hadaq/online.c index 39486c1..a8345d4 100644 --- a/hadaq/online.c +++ b/hadaq/online.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/online.c,v 6.5 2001-08-28 12:06:18 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/online.c,v 6.6 2001-11-18 11:56:21 hadaq Exp $"; #define _GNU_SOURCE @@ -7,7 +7,6 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include #include "evt.h" #include "online.h" diff --git a/hadaq/rc.c b/hadaq/rc.c index 6c0d0c8..23b3356 100644 --- a/hadaq/rc.c +++ b/hadaq/rc.c @@ -1,8 +1,7 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/rc.c,v 6.3 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/rc.c,v 6.4 2001-11-18 11:56:21 hadaq Exp $"; #include -#include #include #include "rc.h" diff --git a/hadaq/readout.c b/hadaq/readout.c index e64ae7d..ad02967 100644 --- a/hadaq/readout.c +++ b/hadaq/readout.c @@ -1,8 +1,12 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.20 2001-11-15 13:53:45 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.21 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199506L +#define SYSLOG_NAMES #include +#ifdef __GNUC__ +#include +#endif #include "grmblfx.h" #include @@ -11,7 +15,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + #include #include "hardware.h" @@ -36,17 +41,16 @@ void sigHandler(int sig) static void usage(const char *progName) { - msglog(LOG_ERR, "Usage: %s [-a (agentCtrl)] [-p priority]\n", progName); - msglog(LOG_ERR, "Usage: [-q queueSize] [-w waterMark]\n"); - msglog_usage(); + syslog(LOG_ERR, "Usage: %s [-a (agentCtrl)] [-p priority]", progName); + syslog(LOG_ERR, "Usage: [-q queueSize] [-w waterMark]"); } static void argsDump(TheArgs *my) { - msglog(LOG_DEBUG, "waterMark: %d\n", my->waterMark); - msglog(LOG_DEBUG, "priority: %d\n", my->priority); - msglog(LOG_DEBUG, "isStandalone: %d\n", my->isStandalone); - msglog(LOG_DEBUG, "queueSize: %d\n", my->queueSize); - msglog(LOG_DEBUG, "verbosity: %s\n", my->verbosity); + syslog(LOG_DEBUG, "waterMark: %d", my->waterMark); + syslog(LOG_DEBUG, "priority: %d", my->priority); + syslog(LOG_DEBUG, "isStandalone: %d", my->isStandalone); + syslog(LOG_DEBUG, "queueSize: %d", my->queueSize); + syslog(LOG_DEBUG, "verbosity: %s", my->verbosity); } static void argsDefault(TheArgs *my) { @@ -133,6 +137,7 @@ static void storeInfoStop(const char *n, time_t t, Worker *w) { void main(int argc, char *argv[]) { + int i; TheArgs theArgsS, *theArgs = &theArgsS; Hardware *hw; void *subEvt; @@ -142,7 +147,10 @@ void main(int argc, char *argv[]) unsigned long *subevtsRead; unsigned long *subevtsDataErr; - msglog_setlevel(argv[0], "info"); + openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0); + setlogmask(LOG_UPTO(LOG_INFO)); + + argsDefault(theArgs); argsFromParam(theArgs, argc, argv); @@ -151,23 +159,28 @@ void main(int argc, char *argv[]) goto bailOut0; } - if (msglog_setlevel(argv[0], theArgs->verbosity) != 1) { - msglog_usage(); + for (i = 0; prioritynames[i].c_name != NULL + && 0 != strcmp(prioritynames[i].c_name, theArgs->verbosity); i++) { + } + if (prioritynames[i].c_name == NULL) { goto bailOut0; + } else { + setlogmask(LOG_UPTO(prioritynames[i].c_val)); } + argsDump(theArgs); if (NULL == (worker = Worker_initBegin(argv[0], sigHandler, theArgs->priority, theArgs->isStandalone))) { - msglog(LOG_ERR, "connecting to agent: %s\n", strerror(errno)); + syslog(LOG_ERR, "connecting to agent: %s", strerror(errno)); goto bailOut0; } if (NULL == (hw = newHardware())) { - msglog(LOG_ERR, "initializing hardware: %s\n", strerror(errno)); + syslog(LOG_ERR, "initializing hardware: %s", strerror(errno)); goto bailOut1; } if (NULL == (shmTrans = ShmTrans_open("subevtqueue", 2 * theArgs->queueSize))) { - msglog(LOG_ERR, - "opening shared memory \"%s\": %s\n", "subevtqueue", strerror(errno)); + syslog(LOG_ERR, + "opening shared memory \"%s\": %s", "subevtqueue", strerror(errno)); goto bailOut2; } trigAccepted = Worker_addStatistic(worker, "trigAccepted"); @@ -193,10 +206,10 @@ void main(int argc, char *argv[]) hadTu = ShmTrans_alloc(shmTrans, transportSize); #ifndef NDEBUG - msglog(LOG_DEBUG, - "shmTrans: %p = hadTu: %s\n", hadTu, HadTu_2charP(hadTu)); + syslog(LOG_DEBUG, + "shmTrans: %p = hadTu: %s", hadTu, HadTu_2charP(hadTu)); #endif - hadTuQueue = allocMem(HadTuQueue_sizeOf()); + hadTuQueue = malloc(HadTuQueue_sizeOf()); conHadTuQueue(hadTuQueue, hadTu, transportSize); while ( HadTuQueue_size(hadTuQueue) <= theArgs->waterMark @@ -211,13 +224,13 @@ void main(int argc, char *argv[]) } (*trigAccepted) = SubEvt_trigNr(subEvt) >> 8; #ifndef NDEBUG - msglog(LOG_DEBUG, "hadTuQueue: %p = subEvt: %s\n", subEvt, SubEvt_2charP(subEvt)); + syslog(LOG_DEBUG, "hadTuQueue: %p = subEvt: %s", subEvt, SubEvt_2charP(subEvt)); #endif HadTuQueue_push(hadTuQueue); } desHadTuQueue(hadTuQueue); - freeMem(hadTuQueue); + free(hadTuQueue); ShmTrans_send(shmTrans); } storeInfoStop(argv[0], time(NULL), worker); diff --git a/hadaq/shmtrans.c b/hadaq/shmtrans.c index 0d67559..33d5f9f 100644 --- a/hadaq/shmtrans.c +++ b/hadaq/shmtrans.c @@ -1,8 +1,9 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.4 2001-11-14 09:29:27 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/shmtrans.c,v 6.5 2001-11-18 11:56:21 hadaq Exp $"; #define _POSIX_C_SOURCE 199506L #include +#include #include "grmblfx.h" #include @@ -16,7 +17,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + #include "psxshm.h" #include "hadtuqueue.h" @@ -45,10 +47,10 @@ ShmTrans *ShmTrans_create(const char *name, size_t size) size_t shmSize; char *addr; - my = allocMem(sizeof(ShmTrans)); + my = malloc(sizeof(ShmTrans)); - my->wrQueue = (HadTuQueue *) allocMem(HadTuQueue_sizeOf()); - my->rdQueue = (HadTuQueue *) allocMem(HadTuQueue_sizeOf()); + my->wrQueue = (HadTuQueue *) malloc(HadTuQueue_sizeOf()); + my->rdQueue = (HadTuQueue *) malloc(HadTuQueue_sizeOf()); strcpy(my->name, name); @@ -59,14 +61,14 @@ ShmTrans *ShmTrans_create(const char *name, size_t size) case ENOENT: break; default: - msglog(LOG_DEBUG, - "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, + "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut1; break; } } if (0 > (pageSize = sysconf(_SC_PAGESIZE))) { - msglog(LOG_DEBUG, "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut1; } shmSize = 2 * (size + SPACE_IN_FRONT); @@ -74,7 +76,7 @@ ShmTrans *ShmTrans_create(const char *name, size_t size) ? (shmSize & ~(pageSize - 1)) + pageSize : shmSize; if (NULL == (my->shm = PsxShm_open(ipcName, O_CREAT | O_RDWR, S_IRWXU, shmSize))) { - msglog(LOG_DEBUG, "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut1; } addr = my->shm->addr; @@ -94,14 +96,14 @@ ShmTrans *ShmTrans_create(const char *name, size_t size) case ENOENT: break; default: - msglog(LOG_DEBUG, - "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, + "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut2; break; } } if ((sem_t *) -1 == (my->switchRequest = sem_open(ipcName, O_CREAT | O_EXCL, S_IRWXU, 0))) { - msglog(LOG_DEBUG, "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut2; } strcpy(ipcName, my->name); @@ -111,14 +113,14 @@ ShmTrans *ShmTrans_create(const char *name, size_t size) case ENOENT: break; default: - msglog(LOG_DEBUG, - "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, + "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut3; break; } } if ((sem_t *) -1 == (my->switchComplete = sem_open(ipcName, O_CREAT | O_EXCL, S_IRWXU, 0))) { - msglog(LOG_DEBUG, "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut3; } return my; @@ -137,9 +139,9 @@ ShmTrans *ShmTrans_create(const char *name, size_t size) strcat(ipcName, ".shm"); PsxShm_unlink(ipcName); bailOut1: - freeMem(my->wrQueue); - freeMem(my->rdQueue); - freeMem(my); + free(my->wrQueue); + free(my->rdQueue); + free(my); return NULL; } @@ -166,9 +168,9 @@ void ShmTrans_remove(ShmTrans *my) strcat(ipcName, ".shm"); PsxShm_unlink(ipcName); - freeMem(my->wrQueue); - freeMem(my->rdQueue); - freeMem(my); + free(my->wrQueue); + free(my->rdQueue); + free(my); } ShmTrans *ShmTrans_open(const char *name, size_t size) @@ -179,10 +181,10 @@ ShmTrans *ShmTrans_open(const char *name, size_t size) size_t shmSize; char *addr; - my = allocMem(sizeof(ShmTrans)); + my = malloc(sizeof(ShmTrans)); - my->wrQueue = (HadTuQueue *) allocMem(HadTuQueue_sizeOf()); - my->rdQueue = (HadTuQueue *) allocMem(HadTuQueue_sizeOf()); + my->wrQueue = (HadTuQueue *) malloc(HadTuQueue_sizeOf()); + my->rdQueue = (HadTuQueue *) malloc(HadTuQueue_sizeOf()); strcpy(my->name, name); @@ -190,7 +192,7 @@ ShmTrans *ShmTrans_open(const char *name, size_t size) strcat(ipcName, ".shm"); if (0 > (pageSize = sysconf(_SC_PAGESIZE))) { - msglog(LOG_DEBUG, "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut1; } shmSize = 2 * (size + SPACE_IN_FRONT); @@ -198,7 +200,7 @@ ShmTrans *ShmTrans_open(const char *name, size_t size) ? (shmSize & ~(pageSize - 1)) + pageSize : shmSize; if (NULL == (my->shm = PsxShm_open(ipcName, O_RDWR, 0, shmSize))) { - msglog(LOG_DEBUG, "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut1; } addr = my->shm->addr; @@ -214,14 +216,14 @@ ShmTrans *ShmTrans_open(const char *name, size_t size) strcat(ipcName, "SR.sem"); if ((sem_t *) -1 == (my->switchRequest = sem_open(ipcName, 0, 0, 0))) { - msglog(LOG_DEBUG, "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut2; } strcpy(ipcName, my->name); strcat(ipcName, "SC.sem"); if ((sem_t *) -1 == (my->switchComplete = sem_open(ipcName, 0, 0, 0))) { - msglog(LOG_DEBUG, "%s, line %d: %s\n", __FILE__, __LINE__, strerror(errno)); + syslog(LOG_DEBUG, "%s, line %d: %s", __FILE__, __LINE__, strerror(errno)); goto bailOut3; } return my; @@ -234,9 +236,9 @@ ShmTrans *ShmTrans_open(const char *name, size_t size) PsxShm_close(my->shm); bailOut1: - freeMem(my->wrQueue); - freeMem(my->rdQueue); - freeMem(my); + free(my->wrQueue); + free(my->rdQueue); + free(my); return NULL; } @@ -248,9 +250,9 @@ void ShmTrans_close(ShmTrans *my) desHadTuQueue(my->rdQueue); desHadTuQueue(my->wrQueue); PsxShm_close(my->shm); - freeMem(my->wrQueue); - freeMem(my->rdQueue); - freeMem(my); + free(my->wrQueue); + free(my->rdQueue); + free(my); } void *ShmTrans_alloc(ShmTrans *my, size_t size) diff --git a/hadaq/showevt.c b/hadaq/showevt.c index f443fa2..e9b7ad4 100644 --- a/hadaq/showevt.c +++ b/hadaq/showevt.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/showevt.c,v 6.6 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/showevt.c,v 6.7 2001-11-18 11:56:21 hadaq Exp $"; #define _ANSI_C_SOURCE @@ -6,13 +6,16 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include +#include + +#include + #include "hldread.h" int startAnalysis(int argc, char **argv) { - msglog(LOG_DEBUG, "startAnalysis called\n"); + syslog(LOG_DEBUG, "startAnalysis called\n"); return 0; } @@ -21,7 +24,7 @@ int analyseEvt(void *evt) int i; void *subEvt; - msglog(LOG_DEBUG, "analyseEvt called\n"); + syslog(LOG_DEBUG, "analyseEvt called\n"); /* print the event header */ printf( @@ -38,21 +41,21 @@ int analyseEvt(void *evt) printf("size: 0x%08x decoding: 0x%08x id: 0x%08x trigNr: 0x%08x\n", SubEvt_size(subEvt), SubEvt_decoding(subEvt), SubEvt_id(subEvt), SubEvt_trigNr(subEvt)); if (SubEvt_decoding(subEvt) == SubEvtDecoding_32bitData) { - for (i = 0; i < SubEvt_dataSize(subEvt) / sizeof(UInt4); i++) { + for (i = 0; i < SubEvt_dataSize(subEvt) / sizeof(uint32_t); i++) { if (i % 4 == 0) { /* newline and the offset in the subEvt */ - printf("\n%08x:", i * sizeof(UInt4)); + printf("\n%08x:", i * sizeof(uint32_t)); } printf(" 0x%08x", SubEvt_dataValue(subEvt, i)); } } else if (SubEvt_decoding(subEvt) == SubEvtDecoding_16bitData) { - for (i = 0; i < SubEvt_dataSize(subEvt) / sizeof(UInt2); i++) { + for (i = 0; i < SubEvt_dataSize(subEvt) / sizeof(uint16_t); i++) { if (i % 8 == 0) { /* newline and the offset in the subEvt */ - printf("\n%08x:", i * sizeof(UInt2)); + printf("\n%08x:", i * sizeof(uint16_t)); } printf(" 0x%04x", SubEvt_dataValue(subEvt, i)); } } else if (SubEvt_decoding(subEvt) == SubEvtDecoding_8bitData) { - for (i = 0; i < SubEvt_dataSize(subEvt) / sizeof(UInt1); i++) { + for (i = 0; i < SubEvt_dataSize(subEvt) / sizeof(uint8_t); i++) { if (i % 16 == 0) { /* newline and the offset in the subEvt */ printf("\n%08x:", i); } @@ -75,6 +78,6 @@ int analyseEvt(void *evt) int stopAnalysis(void) { - msglog(LOG_DEBUG, "stopAnalysis called\n"); + syslog(LOG_DEBUG, "stopAnalysis called\n"); return 0; } diff --git a/hadaq/sniff.c b/hadaq/sniff.c index b0ea1f5..7f0e0bd 100644 --- a/hadaq/sniff.c +++ b/hadaq/sniff.c @@ -1,12 +1,18 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/sniff.c,v 6.3 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/sniff.c,v 6.4 2001-11-18 11:56:21 hadaq Exp $"; +#define SYSLOG_NAMES #include +#ifdef __GNUC__ +#include +#endif +#include #include #include -#include +#include + #include "online.h" @@ -18,7 +24,10 @@ main(int argc, char *argv[]) struct rpc_err rpcErrS, *rpcErr = &rpcErrS; rpcevt rpcEvtS, *rpcEvt = &rpcEvtS; - msglog_setlevel(argv[0], "info"); + openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0); + setlogmask(LOG_UPTO(LOG_INFO)); + + server = NULL; @@ -28,26 +37,28 @@ main(int argc, char *argv[]) server = optarg; break; case 'v': - if (msglog_setlevel(argv[0], optarg) == 1) { + for (i = 0; prioritynames[i].c_name != NULL + && 0 != strcmp(prioritynames[i].c_name, optarg); i++) { + } + if (prioritynames[i].c_name != NULL) { + setlogmask(LOG_UPTO(prioritynames[i].c_val)); break; } /* FALLTHROUGH to default */ default: - msglog(LOG_ERR, "Usage: %s -h evtBuildHost\n", argv[0]); - msglog_usage(); + syslog(LOG_ERR, "Usage: %s -h evtBuildHost", argv[0]); exit(EXIT_FAILURE); break; } } if (server == NULL) { - msglog(LOG_ERR, "Usage: %s -h evtBuildHost\n", argv[0]); - msglog_usage(); + syslog(LOG_ERR, "Usage: %s -h evtBuildHost", argv[0]); exit(EXIT_FAILURE); } while (1) { if (NULL == (cl = clnt_create(server, DAQPROG, DAQVERS, "tcp"))) { - msglog(LOG_INFO, "online server not running, trying to connect\n"); - msglog(LOG_DEBUG, "%s, %d: %s\n", __FILE__, __LINE__, clnt_spcreateerror(server)); + syslog(LOG_INFO, "online server not running, trying to connect"); + syslog(LOG_DEBUG, "%s, %d: %s", __FILE__, __LINE__, clnt_spcreateerror(server)); sleep(5); } else { do { @@ -57,11 +68,11 @@ main(int argc, char *argv[]) case RPC_TIMEDOUT: break; case RPC_CANTRECV: - msglog(LOG_INFO, "server shutdown, trying to reconnect\n"); - msglog(LOG_DEBUG, "%s, %d: %s\n", __FILE__, __LINE__, clnt_sperror(cl, "onlineevt_1")); + syslog(LOG_INFO, "server shutdown, trying to reconnect"); + syslog(LOG_DEBUG, "%s, %d: %s", __FILE__, __LINE__, clnt_sperror(cl, "onlineevt_1")); break; default: - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, clnt_sperror(cl, "onlineevt_1")); + syslog(LOG_ERR, "%s, %d: %s", __FILE__, __LINE__, clnt_sperror(cl, "onlineevt_1")); break; } } else { diff --git a/hadaq/subevt.c b/hadaq/subevt.c index 6f22bfa..372db44 100644 --- a/hadaq/subevt.c +++ b/hadaq/subevt.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/subevt.c,v 6.5 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/subevt.c,v 6.6 2001-11-18 11:56:21 hadaq Exp $"; #include @@ -24,7 +24,7 @@ size_t SubEvt_hdrLen(void) size_t SubEvt_hdrSize(void) { - return SubEvt_hdrLen() * sizeof(UInt4); + return SubEvt_hdrLen() * sizeof(uint32_t); } size_t SubEvt_dataSize(const void *my) @@ -37,41 +37,47 @@ void *SubEvt_data(const void *my) return (void *) ((char *) my + SubEvt_hdrSize()); } -UInt4 SubEvt_dataValue(const void *my, unsigned idx) { - UInt4 val; +uint32_t SubEvt_dataValue(const void *my, unsigned idx) { + uint32_t val; switch (SubEvt_alignment(my)) { case 4: if (SubEvt_isSwapped(my)) { - UInt4 v; - swabInt4(((UInt4 *)SubEvt_data(my)) + idx, &v, 4); - val = v; + uint32_t tmp0; + uint32_t tmp1; + + tmp0 = ((uint32_t *)SubEvt_data(my))[idx]; + ((char *) &tmp1)[0] = ((char *) &tmp0)[3]; + ((char *) &tmp1)[1] = ((char *) &tmp0)[2]; + ((char *) &tmp1)[2] = ((char *) &tmp0)[1]; + ((char *) &tmp1)[3] = ((char *) &tmp0)[0]; + val = tmp1; } else { - val = ((UInt4 *)SubEvt_data(my))[idx]; + val = ((uint32_t *)SubEvt_data(my))[idx]; } break; case 2: if (SubEvt_isSwapped(my)) { - UInt2 v; - swab(((UInt2 *)SubEvt_data(my)) + idx, &v, 2); + uint16_t v; + swab(((uint16_t *)SubEvt_data(my)) + idx, &v, 2); val = v; } else { - val = ((UInt2 *)SubEvt_data(my))[idx]; + val = ((uint16_t *)SubEvt_data(my))[idx]; } break; default: - val = ((UInt1 *)SubEvt_data(my))[idx]; + val = ((uint8_t *)SubEvt_data(my))[idx]; break; } return val; } -UInt4 SubEvt_id(const void *my) +uint32_t SubEvt_id(const void *my) { return SubEvt_hdrValue(my, SubEvtIdx_id); } -UInt4 SubEvt_pureId(const void *my) +uint32_t SubEvt_pureId(const void *my) { return SubEvt_hdrValue(my, SubEvtIdx_id) & 0x7fffffffU; } @@ -81,17 +87,17 @@ int SubEvt_dataError(const void *my) return (SubEvt_hdrValue(my, SubEvtIdx_id) & 0x80000000) != 0; } -void SubEvt_setId(void *my, UInt4 id) +void SubEvt_setId(void *my, uint32_t id) { SubEvt_setHdrValue(my, SubEvtIdx_id, id); } -UInt4 SubEvt_trigNr(const void *my) +uint32_t SubEvt_trigNr(const void *my) { return SubEvt_hdrValue(my, SubEvtIdx_trigNr); } -void SubEvt_setTrigNr(void *my, UInt4 trigNr) +void SubEvt_setTrigNr(void *my, uint32_t trigNr) { SubEvt_setHdrValue(my, SubEvtIdx_trigNr, trigNr); } @@ -106,11 +112,11 @@ char *SubEvt_2charP(const void *my) return buf; } -void *newSubEvt(UInt4 decoding, UInt4 id, UInt4 trigNr) +void *newSubEvt(uint32_t decoding, uint32_t id, uint32_t trigNr) { void *my; - my = allocMem(SubEvt_hdrSize()); + my = malloc(SubEvt_hdrSize()); SubEvt_setSize(my, SubEvt_hdrSize()); SubEvt_setDecoding(my, decoding); @@ -122,13 +128,13 @@ void *newSubEvt(UInt4 decoding, UInt4 id, UInt4 trigNr) void deleteSubEvt(void *my) { - freeMem(my); + free(my); } void *SubEvt_appendData(void *my, const void *data, size_t size) { - my = reallocMem(my, SubEvt_paddedSize(my) + size); + my = realloc(my, SubEvt_paddedSize(my) + size); memcpy(SubEvt_end(my), data, size); SubEvt_setSize(my, SubEvt_paddedSize(my) + size); diff --git a/hadaq/subevt.h b/hadaq/subevt.h index 8757428..a0a46d5 100644 --- a/hadaq/subevt.h +++ b/hadaq/subevt.h @@ -1,7 +1,8 @@ #ifndef SUBEVT_H #define SUBEVT_H -#include +#include + #include "hadtu.h" @@ -49,17 +50,17 @@ size_t SubEvt_hdrLen(void); size_t SubEvt_hdrSize(void); size_t SubEvt_dataSize(const void *my); void *SubEvt_data(const void *my); -UInt4 SubEvt_dataValue(const void *my, unsigned idx); +uint32_t SubEvt_dataValue(const void *my, unsigned idx); char *SubEvt_2charP(const void *my); -UInt4 SubEvt_id(const void *my); -UInt4 SubEvt_pureId(const void *my); +uint32_t SubEvt_id(const void *my); +uint32_t SubEvt_pureId(const void *my); int SubEvt_dataError(const void *my); -void SubEvt_setId(void *my, UInt4 id); -UInt4 SubEvt_trigNr(const void *my); -void SubEvt_setTrigNr(void *my, UInt4 trigNr); +void SubEvt_setId(void *my, uint32_t id); +uint32_t SubEvt_trigNr(const void *my); +void SubEvt_setTrigNr(void *my, uint32_t trigNr); -void *newSubEvt(UInt4 decoding, UInt4 id, UInt4 trigNr); +void *newSubEvt(uint32_t decoding, uint32_t id, uint32_t trigNr); void deleteSubEvt(void *my); void *SubEvt_appendData(void *my, const void *data, size_t size); diff --git a/hadaq/tcldaq.c b/hadaq/tcldaq.c index b3924b3..5b2826c 100644 --- a/hadaq/tcldaq.c +++ b/hadaq/tcldaq.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tcldaq.c,v 6.3 2001-03-07 16:02:44 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/tcldaq.c,v 6.4 2001-11-18 11:56:21 hadaq Exp $"; #include @@ -12,7 +12,6 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include #include -#include #include "worker.h" #include "agent.h" -- 2.43.0