- Added some hipadab array math
- Added missing cnvrt files, stolen from Markus - Debugged the new sinqhttpopt driver for SINQ HTTP HM - Debugged the driver for the new S7 Siemens SPS - Added handling of hexadecimal terminators to ascon.c - Increased the write buffer size in asynnet again - Fixed a core dump in lld.c - Added writing of second gen HM to nxscript.c - Added doubletime command to SICS - Fixed a core dump issue in sicshdbadapter.c on dimension changes - Modified sicsobj to look for lower case keys too SKIPPED: psi/cnvrt.c psi/cnvrt.h psi/el734hp.c psi/make_gen psi/sinqhttpopt.c psi/sinqhttpprot.c psi/spss7.c psi/swmotor.c
This commit is contained in:
@ -28,6 +28,7 @@
|
||||
#include "sicshipadaba.h"
|
||||
#include "sicshdbadapter.h"
|
||||
#include "sicsdata.h"
|
||||
#include "HistMem.i"
|
||||
|
||||
#define PRIVNAM "priv"
|
||||
/*==================== support code ====================================*/
|
||||
@ -337,6 +338,7 @@ static long totalSum(int *data, int length)
|
||||
/*----------------------------------------------------------------------*/
|
||||
typedef struct {
|
||||
pHistMem pHM;
|
||||
pHdb node;
|
||||
} HMAdapter, *pHMAdapter;
|
||||
/*-------------------------------------------------------------------------*/
|
||||
static hdbCallbackReturn HMDataGetCallback(pHdb currentNode,
|
||||
@ -359,9 +361,21 @@ static hdbCallbackReturn HMDataGetCallback(pHdb currentNode,
|
||||
currentNode->value.arrayLength = GetHistLength(pHMA->pHM);
|
||||
currentNode->value.v.intArray =
|
||||
(int *) GetHistogramPointer(pHMA->pHM, pCon);
|
||||
NotifyHipadabaPar(pHMA->node, NULL);
|
||||
return hdbContinue;
|
||||
}
|
||||
/*----------------------------------------------------------------------*/
|
||||
static int DimCallback(int iEvent, void *eventData, void *userData)
|
||||
{
|
||||
pHMAdapter pHMA = (pHMAdapter)userData;
|
||||
|
||||
if(iEvent == DIMCHANGE){
|
||||
pHMA->node->value.arrayLength = GetHistLength(pHMA->pHM);
|
||||
pHMA->node->value.v.intArray =
|
||||
(int *) GetHistogramPointer(pHMA->pHM, pServ->dummyCon);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
/*----------------------------------------------------------------------*/
|
||||
static pHdb MakeHMDataNode(pHistMem pHM, char *name)
|
||||
{
|
||||
@ -375,6 +389,7 @@ static pHdb MakeHMDataNode(pHistMem pHM, char *name)
|
||||
return NULL;
|
||||
}
|
||||
pHMA->pHM = pHM;
|
||||
pHMA->node = node;
|
||||
node->value.doNotFree = 1;
|
||||
node->value.v.intArray = (int *)GetHistogramPointer(pHM, pServ->dummyCon);
|
||||
pCall = MakeHipadabaCallback(HMDataGetCallback, pHMA, free);
|
||||
@ -383,7 +398,7 @@ static pHdb MakeHMDataNode(pHistMem pHM, char *name)
|
||||
}
|
||||
AppendHipadabaCallback(node, pCall);
|
||||
AppendHipadabaCallback(node, MakeReadOnlyCallback());
|
||||
|
||||
RegisterCallback(pHM->pCall,DIMCHANGE, DimCallback, pHMA, NULL);
|
||||
return node;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user