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

- Fixed documentation typos

Browse Source 
- In support of HMsec, allow the count command in countsec to run without a
  preset parameter. If this is missing the old, stored preset is used.
- Removed a check which causes initialisation of the HM from a batch file fail
  for POLDI
- fixed @nl@ encoding of \n problem with certain kinds of batch files generated by GTSE
- Fixed a bug with summing on hitsmemsec. nxdataset now uses 64 bit int for dimensions.
- Fixed motorsec to remove itself properly from a parent when linked. Please note
  that there is still the limitation that a second generation motor can only be linked
  once in a Hipadaba tree
- Extended subsampling a HM for second generation HM
- Added a hscriptnotify. This calls a script on the update of a node
- POLDI has been rebuilt, chnages to data file writing
- For testing, sinqhttopt now understands a special command, byteswapoff,
  which switches off byte swapping. Required when the HM ius run on an Intel box.


SKIPPED:
	psi/polterwrite.c
	psi/sinqhttpopt.c
This commit is contained in:
koennecke
2013-09-16 09:27:50 +00:00
parent 5a06bb9b90
commit 3e6501d806
14 changed files with 220 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SCinter.h
View File

@ -145,7 +145,7 @@ char *FindAliases(SicsInterp * pSics, char *name);
/*-------------------------------------------------------------------------
FindCommandData finds a command with the name given. It tests the name in the
ObjectDescriptor to be of name class. If all this succeeds a pointer
to the commands data structure is retuned. Else NULL.
to the commands data structure is returned. Else NULL.
Do not test the Object Descriptor name when comclass == NULL.
*/
void *FindCommandData(SicsInterp * pSics, char *name, char *comclass);

26
countersec.c
View File

@ -401,12 +401,21 @@ static int CountCmd(pSICSOBJ ccmd, SConnection * con,
Hdb * cmdNode, Hdb * par[], int nPar)
{
float preset;
pHdb presetNode = NULL;
if(nPar < 1){
return 0;
presetNode = GetHipadabaNode(ccmd->objectNode,"preset");
if(presetNode != NULL){
preset = presetNode->value.v.doubleValue;
} else {
/*
This can really only happen when the counter is corrupt
*/
assert(0);
}
} else {
preset = par[0]->value.v.doubleValue;
}
return DoCount((pCounter)ccmd, preset, con, 1);
}
/*--------------------------------------------------------------------------*/
@ -414,12 +423,21 @@ static int CountNBCmd(pSICSOBJ ccmd, SConnection * con,
Hdb * cmdNode, Hdb * par[], int nPar)
{
float preset;
pHdb presetNode = NULL;
if(nPar < 1){
return 0;
presetNode = GetHipadabaNode(ccmd->objectNode,"preset");
if(presetNode != NULL){
preset = presetNode->value.v.doubleValue;
} else {
/*
This can really only happen when the counter is corrupt
*/
assert(0);
}
} else {
preset = par[0]->value.v.doubleValue;
}
return DoCount((pCounter)ccmd, preset, con, 0);
}
/*--------------------------------------------------------------------------*/

4
devexec.c
View File

@ -711,7 +711,7 @@ int SicsIdle(SConnection * pCon, SicsInterp * pSics, void *pData,
int Success(SConnection * pCon, SicsInterp * pSics, void *pData,
int argc, char *argv[])
{
int iRet, level;
int iRet, level = RUNRUN;
Status eOld;
pExeList self = (pExeList)pData;
@ -722,8 +722,6 @@ int Success(SConnection * pCon, SicsInterp * pSics, void *pData,
if(strcmp(argv[1],"RUNDRIVE") == 0){
level = RUNDRIVE;
}
} else {
level = RUNRUN;
}
if(level == RUNRUN) {

29
exebuf.c
View File

@ -91,13 +91,39 @@ static char *locateName(char *filename)
}
return filename;
}
/*----------------------------------------------------------------------
If this is MOUNTAINBATCH file, replace ocurrences of @nl@ with \n
------------------------------------------------------------------------*/
static void fixMountainBatch(pExeBuf self)
{
char *pPtr, *pData, *pNL;
pPtr = GetCharArray(self->bufferContent);
if(strstr(pPtr, "#MOUNTAINBATCH") != pPtr){
/*
nothing to do
*/
return;
}
pData = strdup(pPtr);
DynStringClear(self->bufferContent);
pPtr = pData;
while((pNL = strstr(pPtr,"@nl@")) != NULL){
*pNL = '\n';
*(pNL+1) = '\0';
DynStringConcat(self->bufferContent, pPtr);
pPtr = pNL +4;
}
DynStringConcat(self->bufferContent,pPtr);
free(pData);
}
/*-----------------------------------------------------------------------*/
int exeBufLoad(pExeBuf self, char *filename)
{
char line[256], *pPtr;
FILE *fd = NULL;
int status, idx;
int status, idx, gtsebatch = 0;
assert(self);
fd = fopen(filename, "r");
@ -128,6 +154,7 @@ int exeBufLoad(pExeBuf self, char *filename)
free(self->name);
}
self->name = strdup(locateName(filename));
fixMountainBatch(self);
return 1;
}

4
histmem.c
View File

@ -1329,10 +1329,6 @@ int HistAction(SConnection * pCon, SicsInterp * pSics, void *pData,
}
} else if (strcmp(argv[1], "init") == 0) {
if (GetStatus() != eEager) {
SCWrite(pCon, "ERROR: cannot initialize HM while running", eError);
return 0;
}
if (SCMatchRights(pCon, usMugger)) {
iRet = HistConfigure(self, pCon, pSics);
if (iRet) {

11
histmemsec.c
View File

@ -203,7 +203,7 @@ static int SumCmd(pSICSOBJ ccmd, SConnection * pCon,
{
pHdb dimNode = NULL, dataNode = NULL;
int xstart, xend, ystart, yend, i;
long lSum;
long lSum = 0;
dimNode = GetHipadabaNode(ccmd->objectNode,"dim");
dataNode = GetHipadabaNode(ccmd->objectNode,"data");
@ -325,6 +325,15 @@ int MakeSecHM(SConnection * pCon, SicsInterp * pSics, void *pData,
if(pRes == NULL){
return 0;
}
/*
remove count and rename countnb to it
*/
node = GetHipadabaNode(pRes->pDes->parNode,"count");
DeleteHipadabaNode(node,NULL);
node = GetHipadabaNode(pRes->pDes->parNode,"countnb");
strcpy(node->name,"count");
pRes->pCountInt->TransferData = HMCtrTransferData;
node = pRes->objectNode;

2
hmdata.c
View File

@ -536,7 +536,7 @@ static pNXDS hmDataToNXDataset(pHMdata self)
if (isInTOFMode(self)) {
result->rank++;
}
result->dim = malloc(self->rank * sizeof(int));
result->dim = malloc(self->rank * sizeof(int64_t));
if (result->dim == NULL) {
free(result);
return NULL;

4
motorsec.c
View File

@ -713,6 +713,7 @@ pMotor SecMotorInit(char *name)
child = MakeHipadabaNode("sign", HIPFLOAT, 1);
SetHdbProperty(child, "__save", "true");
SetHdbProperty(child, "priv", "user");
AddHipadabaChild(node, child, NULL);
AppendHipadabaCallback(child,
MakeHipadabaCallback(SecMotorSignCallback, pM,
@ -721,6 +722,7 @@ pMotor SecMotorInit(char *name)
child = MakeHipadabaNode("softzero", HIPFLOAT, 1);
SetHdbProperty(child, "__save", "true");
SetHdbProperty(child, "priv", "user");
AddHipadabaChild(node, child, NULL);
AppendHipadabaCallback(child,
MakeHipadabaCallback(SecMotorZeroCallback, pM,
@ -835,6 +837,8 @@ static void SecMotorKill(void *data)
free(self->pDrivInt);
}
RemoveHdbNodeFromParent(self->objectNode,NULL);
if (self->pCall) {
DeleteCallBackInterface(self->pCall);
}

49
sicshdbadapter.c
View File

@ -910,10 +910,13 @@ int HdbSubSample(SConnection * pCon, SicsInterp * pSics, void *pData,
{
pHistMem pHM = NULL;
pHdb node = NULL;
int bank = 0, length = -1, status;
int bank = 0, length = -1, status, i;
HistInt *data = NULL;
char *pPtr = NULL;
char error[132];
hdbValue v;
HMdata hdata;
pHdb hmnode = NULL;
if (argc < 4) {
SCWrite(pCon,
@ -928,14 +931,19 @@ int HdbSubSample(SConnection * pCon, SicsInterp * pSics, void *pData,
pPtr++;
sscanf(pPtr, "%d", &bank);
}
pHM = (pHistMem) FindCommandData(pSics, argv[1], "HistMem");
node = FindHdbNode(NULL, argv[2], pCon);
if (pHM == NULL || node == NULL) {
SCWrite(pCon, "ERROR: either histogram memory or node not found!",
if (node == NULL) {
SCWrite(pCon, "ERROR: node not found!",
eError);
return 0;
}
/*
old HM
*/
pHM = (pHistMem) FindCommandData(pSics, argv[1], "HistMem");
if(pHM != NULL){
if (pHM->pDriv->SubSample == NULL) {
SCWrite(pCon, "ERROR: hm does not support subsampling", eError);
return 0;
@ -945,6 +953,39 @@ int HdbSubSample(SConnection * pCon, SicsInterp * pSics, void *pData,
SCWrite(pCon, "ERROR: sub sampling failed", eError);
return 0;
}
}
/*
new HM
*/
pHM = (pHistMem) FindCommandData(pSics, argv[1], "HistMemSec");
if(pHM != NULL){
memset(&hdata,0,sizeof(HMdata));
hmnode = GetHipadabaNode(pHM->pDes->parNode,"dim");
if(hmnode == NULL){
SCWrite(pCon,"ERROR: dim node not found",eError);
return 0;
}
hdata.rank = hmnode->value.arrayLength;
for(i = 0; i < hdata.rank; i++){
hdata.iDim[i] = hmnode->value.v.intArray[i];
}
hmnode = GetHipadabaNode(pHM->pDes->parNode,"data");
if(hmnode == NULL){
SCWrite(pCon,"ERROR: data node not found",eError);
return 0;
}
hdata.localBuffer = hmnode->value.v.intArray;
data = subSample(&hdata, argv[3], error, sizeof(error));
if(data == NULL){
SCPrintf(pCon,eError,"ERROR: %s while processing %s with %s",
error, argv[1], argv[3]);
return 0;
}
} else {
SCPrintf(pCon,eError,"ERROR: hm %s not found", argv[1]);
return 0;
}
v.dataType = HIPINTVARAR;
v.arrayLength = data[0];

79
sicshipadaba.c
View File

@ -2392,6 +2392,8 @@ static int SetHdbNode(SConnection * pCon, SicsInterp * pSics, void *pData,
pDynString parData = NULL;
char error[512], value[132];
int i, status, priv;
pIDrivable pDriv = NULL;
pDummy data = NULL;
if (argc < 3) {
@ -2415,6 +2417,25 @@ static int SetHdbNode(SConnection * pCon, SicsInterp * pSics, void *pData,
return 0;
}
/**
* special code to handle certain types of motors right
**/
status = GetHdbProperty(targetNode,"sicsdev",value,sizeof(value));
if(status == 1){
data = (pDummy)FindCommandData(pSics,value,NULL);
if(data != NULL){
pDriv = GetDrivableInterface(data);
if(pDriv != NULL){
status = StartDevice(pServ->pExecutor,value, data->pDescriptor,
data, pCon,RUNRUN, atof(argv[2]));
if(status == 1){
SCSendOK(pCon);
}
return status;
}
}
}
if (!cloneHdbValue(&targetNode->value, &newValue)) {
SCWrite(pCon, "ERROR: out of memory cloning node", eError);
@ -3848,6 +3869,63 @@ static int AddCheck(SConnection * pCon, SicsInterp * pSics,
return 1;
}
/*---------------------------------------------------------------------------*/
static hdbCallbackReturn SICSNotifyScriptCallback(pHdb node, void *userData,
pHdbMessage message)
{
char *pPath = NULL;
int macro, status;
pHdbDataMessage mm = NULL;
SConnection *tstCon;
char script[256];
/*
* Deal with update messages
*/
if ((mm = GetHdbUpdateMessage(message)) == NULL) {
return hdbContinue;
}
status = GetHdbProperty(node, "updatescript", script, sizeof(script));
if(status == 0){
tracePar(node->name,"ERROR: did not find updatescript property");
return hdbContinue;
}
copyHdbValue(mm->v, &node->value);
status = Tcl_Eval(InterpGetTcl(pServ->pSics), script);
if (status != TCL_OK) {
tracePar(node->name,"ERROR: %s while evaluating updatescript %s",
Tcl_GetStringResult(InterpGetTcl(pServ->pSics)), script);
}
return hdbContinue;
}
/*---------------------------------------------------------------------------*/
static int AddScriptNotify(SConnection * pCon, SicsInterp * pSics,
void *pData, int argc, char *argv[])
{
pHdb node = NULL;
if(argc < 3) {
SCWrite(pCon,"ERROR: Parameter missing, Usage: hscriptnotify node script",
eError);
return 0;
}
node = FindHdbNode(NULL,argv[1],pCon);
if (node == NULL) {
SCPrintf(pCon,eLogError, "ERROR: node %s to add script update not found",
argv[1]);
return 0;
}
SetHdbProperty(node,"updatescript",strdup(argv[2]));
AppendHipadabaCallback(node,MakeHipadabaCallback(SICSNotifyScriptCallback,
NULL,NULL));
SCSendOK(pCon);
return 1;
}
/*======================= Factory Functions =================================*/
void killSICSHipadaba()
{
@ -3891,6 +3969,7 @@ int InstallSICSHipadaba(SConnection * pCon, SicsInterp * pSics,
AddCommand(pSics, "hlistprop", ListSICSHdbProperty, NULL, NULL);
AddCommand(pSics, "hcallnotify",CallNotify, NULL, NULL);
AddCommand(pSics, "haddcheck",AddCheck, NULL, NULL);
AddCommand(pSics, "hscriptnotify",AddScriptNotify, NULL, NULL);
InstallSICSPoll(pCon, pSics, pData, argc, argv);
poller = (pSicsPoll) FindCommandData(pSics, "sicspoll", "SicsPoll");

2
syncedprot.c
View File

@ -9,7 +9,7 @@
*
* This is a scriptcontext driver 'connecting' to its own sics server.
* The argument of the send command is a sync id.
* The next script of the scriptchain is called when all actions realted to
* The next script of the scriptchain is called when all actions related to
* this sync id are finished or on timeout.
*
* In addition the functions needed to implement other mechanisms than scriptcontext to

12
test/sicsstat.tcl
View File

@ -6,7 +6,7 @@ exe syspath ./
#--- BEGIN (commands producing errors on last restore)
#--- END (commands producing errors on last restore)
lotte UNKNOWN
lotte bloerzx
lotte setAccess 2
# Motor brumm
brumm sign 1.000000
@ -46,12 +46,6 @@ lieselotte SetMode Timer
# Counter multi
multi SetPreset 0.000000
multi SetMode Timer
sicsdatapath ./
sicsdatapath setAccess 1
sicsdataprefix regression
sicsdataprefix setAccess 1
sicsdatapostfix .dat
sicsdatapostfix setAccess 1
# Motor a1
a1 sign 1.000000
a1 SoftZero 0.000000
@ -283,7 +277,3 @@ eva ignorefault 0
eva movecount 10
eva staticoffset 0

8
test/testini.tcl
View File

@ -213,6 +213,12 @@ hfactory /target plain spy none
hfactory /target/ta3 plain internal float
hattach target a3 /target/ta3
proc upsctest {} {
broadcast "An update script has been called"
set txt [hval /instrument/title]
broadcast "Update to $txt"
}
restore
#==================================================
@ -834,7 +840,7 @@ if {$secmot == 1} {
}
set zwickroll 1
set zwickroll 0
if {$zwickroll == 1} {
source ../tcl/zwickroll.tcl

10
testprot.c
View File

@ -108,6 +108,16 @@ static void findResponse(Ascon *a)
DynStringConcat(a->errmsg,GetCharArray(a->wrBuffer));
return;
}
/**
Tclescape is an escape string/character which idetifies a response as a tcl invocation.
Thus the algorithm runs:
* Find out if there is a Tcl escape
* If so:
* Is the tslcescape in the response
* If so:
* Invoke the Tcl function for the response
In all other cases the response is passed on unmodified.
**/
status = StringDictGet(dict,"tclescape",tclEscape,sizeof(tclEscape));
if(status == 1){
test = strstr(response, tclEscape);