-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 <unistd.h>
+#ifdef __GNUC__
+#include <getopt.h>
+#endif
#include <stddef.h>
#include <errno.h>
#include <stdio.h>
#include <signal.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include "worker.h"
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[])
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;
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:
}
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);
#include <sys/types.h>
#include <ces/vmelib.h>
-#include <hadesstd.h>
+#include <stdint.h>
+
#define STATUS1 0x00
#define DEAD1 0x04
#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;
}
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);
}
*(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;
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
))
) {
-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 <stdlib.h>
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);
}
}
-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 <stdlib.h>
#include <stddef.h>
#include <signal.h>
#include <allParam.h>
-#include <hadesstd.h>
+#include <syslog.h>
#include "daq_lib.h"
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];
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
-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
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <syslog.h>
#include "evt.h"
#include "subevt.h"
size_t Evt_hdrSize(void)
{
- return Evt_hdrLen() * sizeof(UInt4);
+ return Evt_hdrLen() * sizeof(uint32_t);
}
size_t Evt_dataSize(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);
}
char *Evt_expId2charP(const void *my)
{
static char buffer[3];
- UInt4 expId;
+ uint32_t expId;
expId = Evt_expId(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)
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);
void deleteEvt(void *my)
{
- freeMem(my);
+ free(my);
}
void *Evt_appendSubEvt(void *my, void *subEvt)
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;
#include <stdio.h>
#include <time.h>
-#include <hadesstd.h>
+#include <stdint.h>
+
#include "hadtu.h"
#include "subevt.h"
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);
-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 <unistd.h>
+#ifdef __GNUC__
+#include <getopt.h>
+#endif
#include <errno.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <time.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <allParam.h>
#include "grmblfx.h"
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);
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);
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) {
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);
void *subEvt;
int scanWasSuccessful;
- UInt4 currTrigNr;
- UInt4 currId;
+ uint32_t currTrigNr;
+ uint32_t currId;
unsigned long *evtsDiscarded;
unsigned long *evtsComplete;
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);
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 */
}
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);
}
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) {
/*
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];
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) {
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) {
}
if (HadTuQueue_empty(hadTuQueue[i])) {
desHadTuQueue(hadTuQueue[i]);
- freeMem(hadTuQueue[i]);
+ free(hadTuQueue[i]);
hadTuQueue[i] = NULL;
ShmTrans_free(shmTrans[i]);
}
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++) {
-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
#include <stdio.h>
#include <string.h>
-#include <hadesstd.h>
#include "hadtu.h"
#define HADTU_H
#include <stddef.h>
-#include <hadesstd.h>
+#include <stdint.h>
+
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);
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)
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];
}
}
-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);
}
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);
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);
-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 <unistd.h>
+#ifdef __GNUC__
+#include <getopt.h>
+#endif
#include <stddef.h>
#include <signal.h>
#include <limits.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include "evt.h"
#include "hldread.h"
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)
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':
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;
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) {
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);
-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
#include <string.h>
#include <stdio.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include <lvme.h>
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;
void desHwDtu(HwDtu *my)
{
desLVme(my->lvme);
- freeMem(my->lvme);
+ free(my->lvme);
}
int HwDtu_isEmpty(HwDtu *my)
char name[16];
LVme *lvme;
unsigned long trigNr;
- UInt1 trigTag;
- UInt1 trigCode;
+ uint8_t trigTag;
+ uint8_t trigCode;
} HwDtu;
#define DTU_TRIG_CODE 0x18
-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
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;
}
}
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)
{
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);
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));
}
}
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
}
-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
#include <stdio.h>
#include <time.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <lvme.h>
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;
}
void desHwRace(HwRace *my)
{
desRc(my->rc);
- freeMem(my->rc);
+ free(my->rc);
}
void HwRace_requestBuffer(HwRace *my)
int HwRace_readSubEvt(HwRace *my, void *subEvt)
{
- UInt4 *data = (UInt4 *) subEvt;
+ uint32_t *data = (uint32_t *) subEvt;
int firstAddr;
int size;
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;
}
-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
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);
}
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)
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
}
}
{
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);
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));
}
}
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
}
-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 <assert.h>
#include <string.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <lvme.h>
#include <allParam.h>
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;
int i;
#ifndef NDEBUG
- msglog(LOG_DEBUG, "requestBuffer in\n");
+ syslog(LOG_DEBUG, "requestBuffer in");
#endif
i = bankRequested(my) == 1 ? 0 : 1;
do {
my->currAddr = BUFSIZE * bankRequested(my) + 8;
#ifndef NDEBUG
- msglog(LOG_DEBUG, "requestBuffer out\n");
+ syslog(LOG_DEBUG, "requestBuffer out");
#endif
}
}
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);
*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;
}
-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 <assert.h>
#include <string.h>
#include <sys/time.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <lvme.h>
#include <allParam.h>
#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;
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 */
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
#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);
}
int HwShip_readSubEvt(HwShip *my, void *subEvt) {
- UInt4 *data = (UInt4 *)subEvt;
+ uint32_t *data = (uint32_t *)subEvt;
int firstAddr;
size_t size;
}
#ifndef NDEBUG
- msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt));
+ syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt));
#endif
return 0;
}
LVme *lvme;
unsigned currAddr;
unsigned trigNr;
- UInt1 oldBankConfirmed;
+ uint8_t oldBankConfirmed;
} HwShip;
-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
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;
}
}
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)
{
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);
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));
}
}
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
}
-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
#include <string.h>
#include <stdio.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <lvme.h>
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);
void desHwSis3801(HwSis3801 *my)
{
desLVme(my->lvme);
- freeMem(my->lvme);
+ free(my->lvme);
}
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;
-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 <unistd.h>
+#include <stdlib.h>
#include <sys/time.h>
return my->maxSubEvtSize;
}
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
int Hardware_inSpill(const Hardware *my)
{
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)
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);
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);
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++;
}
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);
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));
}
-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
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;
}
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) {
#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:
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)) {
}
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;
-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 <assert.h>
#include <string.h>
#include <signal.h>
#include <sys/time.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <lvme.h>
#include <allParam.h>
#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;
static int bankRequested(HwTip * my)
{
- UInt2 val;
+ uint16_t val;
val = my->bankRequested;
return val;
#if 0
static int bankConfirmed(HwTip * my)
{
- UInt2 val;
+ uint16_t val;
val = -1;
return val;
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;
}
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 */
-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
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;
}
}
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)
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;
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
}
-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 <unistd.h>
return my->maxSubEvtSize;
}
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
int Hardware_inSpill(const Hardware *my)
{
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
{
#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)
void readoutTrig(Hardware *my, void *subEvt)
{
- UInt4 *data;
+ uint32_t *data;
size_t size;
data = SubEvt_begin(subEvt);
}
#ifndef NDEBUG
- msglog(LOG_DEBUG, "subEvt: %s\n", SubEvt_2charP(subEvt));
+ syslog(LOG_DEBUG, "subEvt: %s", SubEvt_2charP(subEvt));
#endif
}
{
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);
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);
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
}
-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
#include <string.h>
#include <stdio.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <lvme.h>
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);
void desHwV488(HwV488 * my)
{
desLVme(my->lvme);
- freeMem(my->lvme);
+ free(my->lvme);
}
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
typedef struct HwV488S {
char name[16];
- UInt2 id;
+ uint16_t id;
LVme *lvme;
unsigned long trigNr;
} HwV488;
-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
#include <string.h>
#include <stdio.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <lvme.h>
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);
void desHwV775(HwV775 *my)
{
desLVme(my->lvme);
- freeMem(my->lvme);
+ free(my->lvme);
}
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;
*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);
-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
#include <string.h>
#include <stdio.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include <lvme.h>
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 */
void desHwV878(HwV878 *my)
{
desLVme(my->lvme);
- freeMem(my->lvme);
+ free(my->lvme);
}
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;
*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);
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
-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 <unistd.h>
+#ifdef __GNUC__
+#include <getopt.h>
+#endif
#include <stddef.h>
#include <string.h>
#include <strings.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include <allParam.h>
#include "shmtrans.h"
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) {
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);
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) {
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;
}
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;
}
-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 <unistd.h>
+#ifdef __GNUC__
+#include <getopt.h>
+#endif
#include <errno.h>
#include <setjmp.h>
#include <stdlib.h>
#include <string.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include <allParam.h>
#include "worker.h"
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) {
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);
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++) {
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);
}
-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
#include <sys/time.h>
#include <sys/types.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include <latm.h>
#include "hadtu.h"
}
if (0 > retVal) {
- msglog(LOG_DEBUG, "openAtm: %s\n", strerror(errno));
+ syslog(LOG_DEBUG, "openAtm: %s", strerror(errno));
}
return retVal;
}
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);
}
if (0 > retVal) {
- msglog(LOG_DEBUG, "openAtm: %s\n", strerror(errno));
+ syslog(LOG_DEBUG, "openAtm: %s", strerror(errno));
}
return retVal;
}
}
if (0 > retVal) {
- msglog(LOG_DEBUG, "openGeneric: %s\n", strerror(errno));
+ syslog(LOG_DEBUG, "openGeneric: %s", strerror(errno));
}
return retVal;
}
}
if (0 > retVal) {
- msglog(LOG_DEBUG, "closeGeneric: %s\n", strerror(errno));
+ syslog(LOG_DEBUG, "closeGeneric: %s", strerror(errno));
}
return retVal;
}
}
if (0 > retVal) {
- msglog(LOG_DEBUG, "sendGeneric: %s\n", strerror(errno));
+ syslog(LOG_DEBUG, "sendGeneric: %s", strerror(errno));
}
return retVal;
}
}
if (0 > retVal) {
- msglog(LOG_DEBUG, "recvGeneric: %s\n", strerror(errno));
+ syslog(LOG_DEBUG, "recvGeneric: %s", strerror(errno));
} else {
my->pktSize = retVal;
}
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;
NetTrans *my;
char buf[80];
- my = allocMem(sizeof(NetTrans));
+ my = malloc(sizeof(NetTrans));
if (0 > openGeneric(my, name, O_WRONLY, bandwidth)) {
return NULL;
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) {
/* 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;
}
#ifndef NETTRANS_H
#define NETTRANS_H
-#include <hadesstd.h>
#include <latm.h>
#include "worker.h"
-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
#include <stdio.h>
#include <rpc/rpc.h>
-#include <hadesstd.h>
#include "evt.h"
#include "online.h"
-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 <stdlib.h>
-#include <hadesstd.h>
#include <lvme.h>
#include "rc.h"
-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 <unistd.h>
+#ifdef __GNUC__
+#include <getopt.h>
+#endif
#include "grmblfx.h"
#include <errno.h>
#include <string.h>
#include <sys/types.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include <allParam.h>
#include "hardware.h"
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) {
void main(int argc, char *argv[])
{
+ int i;
TheArgs theArgsS, *theArgs = &theArgsS;
Hardware *hw;
void *subEvt;
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);
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");
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
}
(*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);
-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 <unistd.h>
+#include <stdlib.h>
#include "grmblfx.h"
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include "psxshm.h"
#include "hadtuqueue.h"
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);
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);
? (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;
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);
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;
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;
}
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)
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);
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);
? (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;
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;
PsxShm_close(my->shm);
bailOut1:
- freeMem(my->wrQueue);
- freeMem(my->rdQueue);
- freeMem(my);
+ free(my->wrQueue);
+ free(my->rdQueue);
+ free(my);
return NULL;
}
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)
-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
#include <stdio.h>
#include <string.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
+#include <stdint.h>
+
#include "hldread.h"
int startAnalysis(int argc, char **argv)
{
- msglog(LOG_DEBUG, "startAnalysis called\n");
+ syslog(LOG_DEBUG, "startAnalysis called\n");
return 0;
}
int i;
void *subEvt;
- msglog(LOG_DEBUG, "analyseEvt called\n");
+ syslog(LOG_DEBUG, "analyseEvt called\n");
/* print the event header */
printf(
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);
}
int stopAnalysis(void)
{
- msglog(LOG_DEBUG, "stopAnalysis called\n");
+ syslog(LOG_DEBUG, "stopAnalysis called\n");
return 0;
}
-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 <unistd.h>
+#ifdef __GNUC__
+#include <getopt.h>
+#endif
+#include <stdlib.h>
#include <stdio.h>
#include <rpc/rpc.h>
-#include <hadesstd.h>
+#include <syslog.h>
+
#include "online.h"
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;
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 {
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 {
-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 <stdlib.h>
size_t SubEvt_hdrSize(void)
{
- return SubEvt_hdrLen() * sizeof(UInt4);
+ return SubEvt_hdrLen() * sizeof(uint32_t);
}
size_t SubEvt_dataSize(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;
}
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);
}
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);
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);
#ifndef SUBEVT_H
#define SUBEVT_H
-#include <hadesstd.h>
+#include <stdint.h>
+
#include "hadtu.h"
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);
-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 <unistd.h>
#include <rpc/rpc.h>
#include <tcl.h>
-#include <hadesstd.h>
#include "worker.h"
#include "agent.h"
jspc29 / daqdata.git / commitdiff