- Added bridge functions to histmemsec to make it look more like histmem

- Modifed many modules using histmem to work also with histmemsec
- Extended tasker with task names and task groups
- There is a new taskobj which allows to list tasks and to interact with them.
- Task now supports running Tcl functions as tasks
- There is a new experimental sctcomtask module which allows to define communication
  tasks against a scriptcontext. This is a new feature which should facilitate
  writing sequential scripts using asynchronous communication.
- A fix to make spss7 work when there are no switches
- ORION support for single X. TRICS measures crystals hanging down, ORION
  standing up
This commit is contained in:
koennecke
2012-12-20 11:32:34 +00:00
parent 28cea49d01
commit 59d292cb79
9 changed files with 44 additions and 65 deletions

View File

@@ -151,15 +151,10 @@ static int JVLHandler(Ascon *a)
return 1;
break;
case AsconReading:
if(!validResponse(priv)){
a->state = AsconWriteStart;
return 1;
}
if(time(NULL) > priv->start + a->timeout){
a->state = AsconReadDone;
DynStringConcat(a->rdBuffer,"timeout");
return 1;
}
/* if(!validResponse(priv)){ */
/* a->state = AsconWriteStart; */
/* return 1; */
/* } */
ret = AsconReadChar(a->fd, &chr);
if (ret < 0) {
/* EINTR means we must retry */
@@ -170,6 +165,10 @@ static int JVLHandler(Ascon *a)
*(priv->rdPtr) = (unsigned char)chr;
priv->toRead--;
priv->rdPtr++;
if(!validResponse(priv)){
a->state=AsconWriteStart;
return 1;
}
if(priv->toRead <= 0){
a->state = AsconReadDone;
if(priv->reading){
@@ -190,6 +189,12 @@ static int JVLHandler(Ascon *a)
}
}
}
} else {
if(time(NULL) > priv->start + a->timeout){
a->state = AsconReadDone;
DynStringConcat(a->rdBuffer,"timeout");
return 1;
}
}
return 1;
break;