linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed temperature logging

Browse Source
This commit is contained in:
cvs
2000-04-12 19:07:39 +00:00
parent 917413878f
commit 1f3d41a83e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tecs/tecs.c
View File

@ -554,7 +554,7 @@ int PeriodicTask(void) {
t2[0]=cryo.temp; t2[0]=cryo.temp;
t2[1]=samp.temp; t2[1]=samp.temp;
time(&putTim); time(&putTim);
DlogPut(&dset, putTim, 2, t2); DlogUpd(&dset); /* DlogPut(&dset, putTim, 2, t2); DlogUpd(&dset); */
logTime=(putTim/logPeriod+1)*logPeriod; logTime=(putTim/logPeriod+1)*logPeriod;
time(&tim); time(&tim);
if (tim-putTim>1) { if (tim-putTim>1) {
@ -991,6 +991,7 @@ int main(int argc, char *argv[])
ERR_I(iret=CocHandleRequests(100, 0)); ERR_I(iret=CocHandleRequests(100, 0));
ftime(&tim0); ftime(&tim0);
tim=tim0.time; tim=tim0.time;
/*
str_copy(buf, logDir); str_copy(buf, logDir);
str_append(buf, serverId); str_append(buf, serverId);
str_append(buf, ".dlog"); str_append(buf, ".dlog");
@ -1002,6 +1003,7 @@ int main(int argc, char *argv[])
logfileOut(LOG_INFO, "opened\n"); logfileOut(LOG_INFO, "opened\n");
} }
logfileWrite(logMask); logfileWrite(logMask);
*/
LscCmd(ser, "MODE:[mode]"); LscCmd(ser, "MODE:[mode]");
per=period; per=period;
cntError=0; cntError=0;
@ -1020,7 +1022,9 @@ int main(int argc, char *argv[])
ERR_MSG("got quit command"); ERR_MSG("got quit command");
OnError: OnError:
logfileShowErr("exit TecsServer"); logfileShowErr("exit TecsServer");
/*
DlogClose(&dset); DlogClose(&dset);
*/
SerClose(ser); SerClose(ser);
CocCloseServer(); CocCloseServer();
return(0); return(0);

9
tecs/tecs_dlog.c
View File

@ -51,16 +51,17 @@ int DlogFill(DlogSet *dset, int from, int to) {
} }
} }
ERR_SI(lseek(dset->fd, p, SEEK_SET)); ERR_SI(lseek(dset->fd, p, SEEK_SET));
for (i=p; i<q-sizeof(fill); i+=sizeof(fill)) { size=sizeof(fill);
ERR_SI(write(dset->fd, fill, sizeof(fill))); for (i=p; i<q-size; i+=size) {
ERR_SI(write(dset->fd, fill, size));
} }
if (q>i) ERR_SI(write(dset->fd, fill, q-i)); if (q>i) ERR_SI(write(dset->fd, fill, q-i));
if (e>0) { if (e>0) {
p = dset -> headsize; p = dset -> headsize;
ERR_SI(lseek(dset->fd, p, SEEK_SET)); ERR_SI(lseek(dset->fd, p, SEEK_SET));
for (i=p; i<e-sizeof(fill); i+=sizeof(fill)) { for (i=p; i<e-size; i+=size) {
ERR_SI(write(dset->fd, fill, sizeof(fill))); ERR_SI(write(dset->fd, fill, size));
} }
if (e>i) ERR_SI(write(dset->fd, fill, q-i)); if (e>i) ERR_SI(write(dset->fd, fill, q-i));
} }