- Modified collective drive operations to run motors in individual tasks
- Added a processnode methos to scriptcontext. processnode waits for the scriptchain of a node to finish. - Fixed a bug in sicsget - Made histmemsec dim and rank manager privilege. To allow chnage at runtime. Is required for SANS - Fixed some issues with multicountersec, mostly relating to passing things through in a sensible way. - Updated motorsec.c to work with a client based driver SKIPPED: psi/polterwrite.c psi/tabledrive.c psi/tabledrive.h
This commit is contained in:
@ -596,6 +596,7 @@ static hdbCallbackReturn SICSNotifyCallback(pHdb node, void *userData,
|
||||
pHdbPtrMessage cmm = NULL;
|
||||
pHdbDataMessage mm = NULL;
|
||||
SConnection *tstCon;
|
||||
char updatePath[1024];
|
||||
|
||||
cbInfo = (HdbCBInfo *) userData;
|
||||
|
||||
@ -657,7 +658,7 @@ static hdbCallbackReturn SICSNotifyCallback(pHdb node, void *userData,
|
||||
return hdbContinue;
|
||||
}
|
||||
|
||||
pPath = GetHipadabaPath(node);
|
||||
GetHdbPath(node,updatePath,sizeof(updatePath));
|
||||
result = CreateDynString(128, 128);
|
||||
if ((protocol = isJSON(cbInfo->pCon)) == 1)
|
||||
outCode = eHdbEvent;
|
||||
@ -671,14 +672,13 @@ static hdbCallbackReturn SICSNotifyCallback(pHdb node, void *userData,
|
||||
if (GetHdbProperty(node, "transfer", value, 80) == 1) {
|
||||
if (strstr(value, "zip") != NULL || strstr(value,"bin") != NULL) {
|
||||
status = sendZippedNodeData(node, *(mm->v), cbInfo->pCon);
|
||||
free(pPath);
|
||||
DeleteDynString(result);
|
||||
return hdbContinue;
|
||||
}
|
||||
}
|
||||
if (mm->v->arrayLength < 100) {
|
||||
printedData = formatValue(*(mm->v), node);
|
||||
if (pPath == NULL || printedData == NULL || result == NULL) {
|
||||
if (printedData == NULL || result == NULL) {
|
||||
SCWrite(cbInfo->pCon, "ERROR: out of memory formatting data",
|
||||
eEvent);
|
||||
/*
|
||||
@ -687,7 +687,7 @@ static hdbCallbackReturn SICSNotifyCallback(pHdb node, void *userData,
|
||||
*/
|
||||
return hdbContinue;
|
||||
}
|
||||
formatNameValue(protocol, pPath, GetCharArray(printedData), result,
|
||||
formatNameValue(protocol, updatePath, GetCharArray(printedData), result,
|
||||
mm->v->dataType);
|
||||
/* SCWrite(cbInfo->pCon, GetCharArray(result), outCode); */
|
||||
SCPureSockWrite(cbInfo->pCon, GetCharArray(result), outCode);
|
||||
@ -696,7 +696,6 @@ static hdbCallbackReturn SICSNotifyCallback(pHdb node, void *userData,
|
||||
formatNameValue(protocol, pPath, "!!datachange!!", result, HIPTEXT);
|
||||
SCWrite(cbInfo->pCon, GetCharArray(result), outCode);
|
||||
}
|
||||
free(pPath);
|
||||
DeleteDynString(result);
|
||||
|
||||
return hdbContinue;
|
||||
|
Reference in New Issue
Block a user