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

Fixed rather large memory leak with flow data

Browse Source
This commit is contained in:
Mark Watkins 2011-05-28 13:41:44 +10:00
parent 6b4b3dc5bc
commit 9061677642
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SleepyHead.depend
View File

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

7
graphs/graph.cpp
View File

@ -1560,7 +1560,8 @@ void FlowData::Reload(Day *day)
for (auto s=day->begin();s!=day->end(); s++) { for (auto s=day->begin();s!=day->end(); s++) {
if ((*s)->waveforms.find(code)==(*s)->waveforms.end()) continue; if ((*s)->waveforms.find(code)==(*s)->waveforms.end()) continue;
for (auto l=(*s)->waveforms[code].begin();l!=(*s)->waveforms[code].end();l++) { for (auto l=(*s)->waveforms[code].begin();l!=(*s)->waveforms[code].end();l++) {
if (vc<=(int)point.size()) { int ps=point.size();
if (vc>=ps) {
AddSegment(max_points); // TODO: Add size limit capabilities. AddSegment(max_points); // TODO: Add size limit capabilities.
} }
int t=0; int t=0;
@ -1626,7 +1627,7 @@ void PressureData::Reload(Day *day)
bool first=true; bool first=true;
for (auto s=day->begin();s!=day->end(); s++) { for (auto s=day->begin();s!=day->end(); s++) {
if ((*s)->events.find(code)==(*s)->events.end()) continue; if ((*s)->events.find(code)==(*s)->events.end()) continue;
if (vc<=(int)point.size()) { if (vc>=(int)point.size()) {
AddSegment(max_points); AddSegment(max_points);
} }
@ -1777,7 +1778,7 @@ void AHIData::Reload(Day *day)
} }
FlagData::FlagData(MachineCode _code,double _value,int _field,int _offset) FlagData::FlagData(MachineCode _code,double _value,int _field,int _offset)
:gPointData(512),code(_code),value(_value),field(_field),offset(_offset) :gPointData(1024),code(_code),value(_value),field(_field),offset(_offset)
{ {
AddSegment(max_points); AddSegment(max_points);
} }

2
libs/sleeplib/prs1_loader.cpp
View File

@ -599,7 +599,7 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
if (sum!=header[hl-1]) if (sum!=header[hl-1])
return false; return false;
if (samples+size>max_load_buffer_size) { if (samples+size>=max_load_buffer_size) {
wxLogError(wxT("max_load_buffer_size is too small in PRS1 Loader")); wxLogError(wxT("max_load_buffer_size is too small in PRS1 Loader"));
if (cnt==0) return false; if (cnt==0) return false;
break; break;

12
version.h
View File

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