chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a common buffer during PRS1 import, reducing heap mess and increasing import performance.

Browse Source
This commit is contained in:
Mark Watkins 2011-05-28 13:27:07 +10:00
parent 70b5934186
commit 6b4b3dc5bc
6 changed files with 77 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SleepyHead.depend
View File

@ -7870,9 +7870,9 @@
<sleeplib/machine.h>
<list>
1306505346 /home/mark/projects/git/sleepyhead/version.h
1306553009 /home/mark/projects/git/sleepyhead/version.h
1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h"
"machine_loader.h"
"profiles.h"
@ -7901,7 +7901,7 @@
"SleepyHeadMain.h"
"sleeplib/profiles.h"
1306502417 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
1306553006 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/log.h>
@ -7947,7 +7947,7 @@
"machine_loader.h"
"tinyxml/tinyxml.h"
1306489627 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
1306552903 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
<wx/dir.h>
<wx/filename.h>
<wx/ffile.h>

24
SleepyHead.layout
View File

@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Windows" />
<ActiveTarget name="Debug" />
<File name="GUIFrame.cpp" open="0" top="0" tabpos="7">
<Cursor position="1774" topLine="0" />
</File>
<File name="SleepyHeadApp.cpp" open="0" top="0" tabpos="12">
<Cursor position="308" topLine="0" />
</File>
<File name="SleepyHeadMain.cpp" open="1" top="1" tabpos="3">
<Cursor position="1408" topLine="21" />
<File name="SleepyHeadMain.cpp" open="1" top="0" tabpos="3">
<Cursor position="13420" topLine="361" />
</File>
<File name="SleepyHeadMain.h" open="0" top="0" tabpos="4">
<Cursor position="199" topLine="0" />
<File name="SleepyHeadMain.h" open="1" top="0" tabpos="4">
<Cursor position="851" topLine="10" />
</File>
<File name="graphs/graph.cpp" open="0" top="0" tabpos="6">
<Cursor position="112" topLine="0" />
<File name="graphs/graph.cpp" open="1" top="0" tabpos="6">
<Cursor position="576" topLine="0" />
</File>
<File name="graphs/graph.h" open="0" top="0" tabpos="5">
<Cursor position="0" topLine="0" />
<File name="graphs/graph.h" open="1" top="0" tabpos="5">
<Cursor position="15192" topLine="423" />
</File>
<File name="libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11">
<Cursor position="0" topLine="0" />
@ -26,7 +26,7 @@
<Cursor position="0" topLine="0" />
</File>
<File name="libs/sleeplib/machine.cpp" open="1" top="0" tabpos="1">
<Cursor position="4763" topLine="174" />
<Cursor position="4763" topLine="162" />
</File>
<File name="libs/sleeplib/machine.h" open="1" top="0" tabpos="2">
<Cursor position="108" topLine="0" />
@ -49,8 +49,8 @@
<File name="libs/sleeplib/profiles.h" open="0" top="0" tabpos="17">
<Cursor position="28" topLine="0" />
</File>
<File name="libs/sleeplib/prs1_loader.cpp" open="0" top="0" tabpos="7">
<Cursor position="0" topLine="0" />
<File name="libs/sleeplib/prs1_loader.cpp" open="1" top="1" tabpos="7">
<Cursor position="556" topLine="0" />
</File>
<File name="libs/sleeplib/prs1_loader.h" open="0" top="0" tabpos="18">
<Cursor position="31" topLine="0" />

4
graphs/graph.cpp
View File

@ -11,7 +11,7 @@ License: LGPL
#include "graph.h"
#if !wxCHECK_VERSION(2,9,0)
wxColor zwxYELLOW=wxColor(0xcf,0xcf,0x40,0xff);
wxColor zwxYELLOW=wxColor(0xc0,0xc0,0x40,0xff);
wxColor *wxYELLOW=&zwxYELLOW;
#endif
wxColor zwxAQUA=wxColor(0x00,0xff,0xff,0xff);
@ -20,7 +20,7 @@ wxColor zwxPURPLE=wxColor(0xff,0x40,0xff,0xff);
wxColor * wxPURPLE=&zwxPURPLE;
wxColor zwxGREEN2=wxColor(0x40,0xff,0x40,0x5f);
wxColor * wxGREEN2=&zwxGREEN2;
wxColor zwxLIGHT_YELLOW(248,248,188,255);
wxColor zwxLIGHT_YELLOW(228,228,168,255);
wxColor *wxLIGHT_YELLOW=&zwxLIGHT_YELLOW;
wxColor zwxDARK_GREEN=wxColor(20,128,20,255);
wxColor *wxDARK_GREEN=&zwxDARK_GREEN;

94
libs/sleeplib/prs1_loader.cpp
View File

@ -24,7 +24,8 @@ extern wxProgressDialog *loader_progress;
map<int,wxString> ModelMap= {
{34,wxT("RemStar Pro with C-Flex+")},
{35,wxT("RemStar Auto with A-Flex")}
{35,wxT("RemStar Auto with A-Flex")},
{37,wxT("RemStar BIPAP Auto with Bi-Flex")}
};
PRS1::PRS1(Profile *p,MachineID id):CPAP(p,id)
@ -43,6 +44,7 @@ PRS1::~PRS1()
PRS1Loader::PRS1Loader()
{
m_buffer=new unsigned char [max_load_buffer_size]; //allocate once and reuse.
}
PRS1Loader::~PRS1Loader()
@ -50,6 +52,7 @@ PRS1Loader::~PRS1Loader()
for (auto i=PRS1List.begin(); i!=PRS1List.end(); i++) {
delete i->second;
}
delete [] m_buffer;
}
Machine *PRS1Loader::CreateMachine(wxString serial,Profile *profile)
{
@ -87,7 +90,7 @@ bool PRS1Loader::Open(wxString & path,Profile *profile)
wxString newpath;
wxString sep=wxFileName::GetPathSeparator();
wxString pseries=wxT("P-Series");
if (path.Right(pseries.Len()+sep.Len())==pseries) {
if (path.Right(pseries.Len()+sep.Len())==sep+pseries) {
newpath=path;
} else {
newpath=path+sep+pseries;
@ -256,8 +259,8 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path)
delete sess;
continue;
}
const double ignore_thresh=300.0/3600.0;// Ignore useless sessions under 5 minute
if (sess->hours()<ignore_thresh) {
const double ignore_thresh=0;//300.0/3600.0;// Ignore useless sessions under 5 minute
if (sess->hours()<=ignore_thresh) {
delete sess;
continue;
}
@ -299,18 +302,20 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
int size,sequence,seconds,br;
time_t timestamp;
unsigned char header[24];
unsigned char ext;
unsigned char ext,sum;
//wxLogMessage(wxT("Opening PRS1 Summary ")+filename);
wxFFile f(filename,wxT("rb"));
if (!f.IsOpened()) return false;
if (!f.IsOpened())
return false;
int hl=16;
br=f.Read(header,hl);
if (header[0]!=header[5]) return false;
if (header[0]!=header[5])
return false;
sequence=size=timestamp=seconds=ext=0;
sequence=(header[10] << 24) | (header[9] << 16) | (header[8] << 8) | header[7];
@ -318,28 +323,26 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
size=(header[2] << 8) | header[1];
ext=header[6];
if (ext!=1) return false;
if (ext!=1)
return false;
//size|=(header[3]<<16) | (header[4]<<24); // the jury is still out on the 32bitness of one. doesn't matter here anyway.
size-=(hl+2);
unsigned char sum=0;
sum=0;
for (int i=0; i<hl-1; i++) sum+=header[i];
if (sum!=header[hl-1]) return false;
if (sum!=header[hl-1])
return false;
wxDateTime date(timestamp);
//wxDateTime tmpdate=date;
//wxLogMessage(date.Format()+wxT(" UTC=")+tmpdate.Format());
//int ticks=date.GetTicks();
if (!date.IsValid()) return false;
unsigned char *buffer=(unsigned char *)malloc(size);
unsigned char * buffer=m_buffer;
br=f.Read(buffer,size);
if (br<size) {
delete buffer;
return false;
}
@ -395,7 +398,6 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
session->summary[CPAP_RERA]=(long)buffer[0x2E] | (buffer[0x2F] << 8);
session->summary[CPAP_FlowLimit]=(long)buffer[0x30] | (buffer[0x31] << 8);
delete buffer;
return true;
}
@ -498,7 +500,7 @@ bool PRS1Loader::OpenEvents(Session *session,wxString filename)
{
int size,sequence,seconds,br;
time_t timestamp;
unsigned char header[24];
unsigned char header[24]; // use m_buffer?
unsigned char ext;
//wxLogMessage(wxT("Opening PRS1 Events ")+filename);
@ -526,15 +528,13 @@ bool PRS1Loader::OpenEvents(Session *session,wxString filename)
for (int i=0; i<hl-1; i++) sum+=header[i];
if (sum!=header[hl-1]) return false;
unsigned char *buffer=(unsigned char *)malloc(size);
unsigned char *buffer=(unsigned char *)m_buffer;
br=f.Read(buffer,size);
if (br<size) {
delete buffer;
return false;
}
Parse002(session,buffer,size,timestamp);
delete buffer;
return true;
}
@ -542,6 +542,7 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
{
//wxLogMessage(wxT("Opening PRS1 Waveforms ")+filename);
int size,sequence,seconds,br;
unsigned cnt=0;
time_t timestamp;
@ -551,24 +552,26 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
unsigned char ext;
wxFFile f(filename,wxT("rb"));
int hl=24;
vector<char *> wavedata;
vector<int> wavesize;
int samples=0;
long samples=0;
int duration=0;
char * buffer=(char *)m_buffer;
while (true) {
br=f.Read(header,hl);
if (br<hl) {
if (cnt==0)
return false;
else break;
break;
}
if (header[0]!=header[5]) {
if (cnt==0)
return false;
else break;
break;
}
sequence=size=timestamp=seconds=ext=0;
@ -588,7 +591,7 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
if (ext!=5) {
if (cnt==0)
return false;
else break;
break;
}
unsigned char sum=0;
@ -596,14 +599,19 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
if (sum!=header[hl-1])
return false;
char * buffer=new char [size];
br=f.Read(buffer,size);
if (samples+size>max_load_buffer_size) {
wxLogError(wxT("max_load_buffer_size is too small in PRS1 Loader"));
if (cnt==0) return false;
break;
}
br=f.Read((char *)&buffer[samples],size);
if (br<size) {
delete [] buffer;
break;
}
wavedata.push_back(buffer);
wavesize.push_back(size);
//wavedata.push_back(buffer);
//wavesize.push_back(size);
cnt++;
duration+=seconds;
@ -623,25 +631,23 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
//double rate=double(duration)/double(samples);
// Convert to SampleFormat
SampleFormat *data=new SampleFormat [samples];
int s=0;
SampleFormat min,max,c;
SampleFormat min,max;
bool first=true;
//assert (cnt==wavedata.size());
cnt=wavedata.size();
for (unsigned i=0; i<cnt; i++) {
for (int j=0; j<wavesize[i]; j++) {
c=wavedata[i][j];
if (first) {
min=max=c;
}
if (min>c) min=c;
if (max<c) max=c;
data[s++]=c;
for (long i=0;i<samples;i++) {
data[i]=buffer[i];
SampleFormat &c=data[i];
if (first) {
min=max=c;
first=false;
}
delete wavedata[i];
if (min>c) min=c;
if (max<c) max=c;
}
Waveform *w=new Waveform(start,CPAP_FlowRate,data,samples,duration,min,max);
session->AddWaveform(w);
//wxLogMessage(wxT("Done PRS1 Waveforms ")+filename);

4
libs/sleeplib/prs1_loader.h
View File

@ -22,6 +22,8 @@ public:
virtual ~PRS1();
};
const int max_load_buffer_size=384*1024;
class PRS1Loader : public MachineLoader
{
public:
@ -41,7 +43,7 @@ protected:
bool OpenEvents(Session *session,wxString filename);
bool OpenWaveforms(Session *session,wxString filename);
bool Parse002(Session *session,unsigned char *buffer,int size,time_t timestamp);
unsigned char * m_buffer;
};

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 1377;
static const long REVISION = 1994;
static const long BUILD = 1402;
static const long REVISION = 2124;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 5094;
#define RC_FILEVERSION 0,7,1377,1994
#define RC_FILEVERSION_STRING "0, 7, 1377, 1994\0"
static const char FULLVERSION_STRING[] = "0.7.1377.1994";
static const long BUILDS_COUNT = 5151;
#define RC_FILEVERSION 0,7,1402,2124
#define RC_FILEVERSION_STRING "0, 7, 1402, 2124\0"
static const char FULLVERSION_STRING[] = "0.7.1402.2124";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;