Modifications for circular FIFO and memory leak corrected done during beamtime - to be tested

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@447 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2013-02-04 10:13:48 +00:00
parent 09d9e2fd03
commit 247e84ba7b
4 changed files with 105 additions and 31 deletions

View File

@ -246,6 +246,12 @@ private:
/** Receiver buffer */
char* buffer;
/** Receiver buffer */
char *mem0, *memfull;
/** latest data */
char* latestData;
@ -266,6 +272,8 @@ private:
/** circular fifo to read and write data*/
CircularFifo<dataStruct,FIFO_SIZE>* fifo;
/** circular fifo to read and write data*/
CircularFifo<char,FIFO_SIZE>* fifofree;
/** short frames */
int shortFrame;
@ -275,13 +283,21 @@ private:
/** number of packets per frame*/
int packetsPerFrame;
/** gui wants data */
int guiRequiresData;
/** current frame number */
int currframenum;
public:
/** File Descriptor */
static FILE *sfilefd;
/** if the listening thread is running*/
static int listening_thread_running;
dataStruct *dataWriteFrame;
};