detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40:02 +02:00
Code Issues Actions Packages Releases Activity

changed the receiver back to using fwrite instead of mmap

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@561 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-16 14:17:51 +00:00
parent 3754d61fa1
commit 9693169bcd
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -428,9 +428,6 @@ int slsReceiverFunctionList::startWriting(){
cout << "In startWriting()" <<endl; cout << "In startWriting()" <<endl;
#endif #endif
void *address;
int memsize = bufferSize*maxFramesPerFile;
char *wbuf; char *wbuf;
int sleepnumber=0; int sleepnumber=0;
@ -473,26 +470,14 @@ int slsReceiverFunctionList::startWriting(){
else sprintf(savefilename, "%s/%s_f%012d_%d.raw", filePath,fileName,framesCaught,fileIndex); else sprintf(savefilename, "%s/%s_f%012d_%d.raw", filePath,fileName,framesCaught,fileIndex);
if(enableFileWrite && cbAction > DO_NOTHING){ if(enableFileWrite && cbAction > DO_NOTHING){
//sync file and close fd
if(sfilefd) {
msync(address,memsize, MS_ASYNC);
munmap(address,memsize);
fclose(sfilefd);
}
//create file , truncate size and map file to memory if(sfilefd)
if (NULL == (sfilefd = fopen((const char *) (savefilename), "w+"))){ fclose(sfilefd);
if (NULL == (sfilefd = fopen((const char *) (savefilename), "w"))){
cout << "Error: Could not create file " << savefilename << endl; cout << "Error: Could not create file " << savefilename << endl;
break; break;
} }
if (-1 == ftruncate(fileno(sfilefd),memsize)) {
perror("Error:Could not truncate file:");
break;
}
address = mmap(NULL,memsize,PROT_READ|PROT_WRITE,MAP_SHARED,fileno(sfilefd),0);
if(address == MAP_FAILED)
perror("Error: Could not map file to memory:");
//printing packet losses and file names //printing packet losses and file names
if(prevframenum == 0) if(prevframenum == 0)
@ -537,7 +522,7 @@ int slsReceiverFunctionList::startWriting(){
//default writing to file //default writing to file
else if(enableFileWrite){ else if(enableFileWrite){
if(sfilefd) if(sfilefd)
memcpy((((char*)address)+bufferSize*framesInFile),wbuf, bufferSize); fwrite(wbuf, 1, bufferSize, sfilefd);
else{ else{
cout << "You do not have permissions to overwrite: " << savefilename << endl; cout << "You do not have permissions to overwrite: " << savefilename << endl;
usleep(50000); usleep(50000);
@ -575,12 +560,10 @@ int slsReceiverFunctionList::startWriting(){
} }
listening_thread_running = 0; listening_thread_running = 0;
cout << "Total Frames Caught:"<< totalFramesCaught << endl; cout << "Total Frames Caught:"<< totalFramesCaught << endl;
//sync file and close fd, memsize is still for maxframes because of truncate
if(sfilefd){
msync(address,memsize, MS_ASYNC); if(sfilefd)
munmap(address,memsize);
fclose(sfilefd); fclose(sfilefd);
}
#ifdef VERBOSE #ifdef VERBOSE
cout << "sfield:" << (int)sfilefd << endl; cout << "sfield:" << (int)sfilefd << endl;
#endif #endif