Skip to content

Improved resource releasing #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simogasp merged 12 commits into from
Feb 25, 2020
Merged

Improved resource releasing #71

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df44615
[popsift] using nullptr
simogasp Feb 4, 2020
1f138d9
[popsift] adding state attribute _isInit
simogasp Feb 4, 2020
e2f56ba
[popsift] removed unused member _current in Pipe
simogasp Feb 5, 2020
82296d7
[popsift] init members of Pipe
simogasp Feb 5, 2020
0c4e98a
[popsift] set nullptr after delete
simogasp Feb 5, 2020
2ec970e
[popsift] no need to check nullptr if only delete
simogasp Feb 5, 2020
d6b581c
[popsift] using unique_ptr instead of raw pointer for threads
simogasp Feb 9, 2020
d2d7618
[popsift] no need to explicit init
simogasp Feb 21, 2020
72796c8
[popsift] removed default and copy constructors
simogasp Feb 21, 2020
d6204cf
[popsift] fix uninit members
simogasp Feb 21, 2020
fb033e4
[cmake] add language CXX to apps
simogasp Feb 21, 2020
da4aeda
[popsift] remove redundant 0-initialization
Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 53 additions & 30 deletions src/popsift/popsift.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using namespace std;

PopSift::PopSift( const popsift::Config& config, popsift::Config::ProcessingMode mode, ImageMode imode )
: _image_mode( imode )
: _image_mode( imode ), _isInit(true)
{
if( imode == ByteImages )
{
Expand All @@ -26,19 +26,19 @@ PopSift::PopSift( const popsift::Config& config, popsift::Config::ProcessingMode
_pipe._unused.push( new popsift::ImageFloat );
_pipe._unused.push( new popsift::ImageFloat );
}
_pipe._pyramid = 0;
_pipe._pyramid = nullptr;

configure( config, true );

_pipe._thread_stage1 = new boost::thread( &PopSift::uploadImages, this );
_pipe._thread_stage1.reset( new boost::thread( &PopSift::uploadImages, this ));
if( mode == popsift::Config::ExtractingMode )
_pipe._thread_stage2 = new boost::thread( &PopSift::extractDownloadLoop, this );
_pipe._thread_stage2.reset( new boost::thread( &PopSift::extractDownloadLoop, this ));
else
_pipe._thread_stage2 = new boost::thread( &PopSift::matchPrepareLoop, this );
_pipe._thread_stage2.reset( new boost::thread( &PopSift::matchPrepareLoop, this ));
}

PopSift::PopSift( ImageMode imode )
: _image_mode( imode )
: _image_mode( imode ), _isInit(true)
{
if( imode == ByteImages )
{
Expand All @@ -50,19 +50,23 @@ PopSift::PopSift( ImageMode imode )
_pipe._unused.push( new popsift::ImageFloat );
_pipe._unused.push( new popsift::ImageFloat );
}
_pipe._pyramid = 0;
_pipe._pyramid = nullptr;

_pipe._thread_stage1 = new boost::thread( &PopSift::uploadImages, this );
_pipe._thread_stage2 = new boost::thread( &PopSift::extractDownloadLoop, this );
_pipe._thread_stage1.reset( new boost::thread( &PopSift::uploadImages, this ));
_pipe._thread_stage2.reset( new boost::thread( &PopSift::extractDownloadLoop, this ));
}

PopSift::~PopSift()
{
if(_isInit)
{
uninit();
}
}

bool PopSift::configure( const popsift::Config& config, bool force )
{
if( _pipe._pyramid != 0 ) {
if( _pipe._pyramid != nullptr ) {
return false;
}

Expand Down Expand Up @@ -97,7 +101,7 @@ bool PopSift::private_init( int w, int h )
float upscaleFactor = _config.getUpscaleFactor();
float scaleFactor = 1.0f / powf( 2.0f, -upscaleFactor );

if( p._pyramid != 0 ) {
if( p._pyramid != nullptr ) {
p._pyramid->resetDimensions( _config,
ceilf( w * scaleFactor ),
ceilf( h * scaleFactor ) );
Expand All @@ -121,19 +125,14 @@ bool PopSift::private_init( int w, int h )

void PopSift::uninit( )
{
_pipe._queue_stage1.push( 0 );
_pipe._thread_stage2->join();
_pipe._thread_stage1->join();
delete _pipe._thread_stage2;
delete _pipe._thread_stage1;

while( !_pipe._unused.empty() ) {
popsift::ImageBase* img = _pipe._unused.pull();
delete img;
if(!_isInit)
{
std::cout << "[warning] Attempt to release resources from an uninitialized instance" << std::endl;
return;
}
_pipe.uninit();

delete _pipe._pyramid;
_pipe._pyramid = 0;
_isInit = false;
}

SiftJob* PopSift::enqueue( int w,
Expand Down Expand Up @@ -171,20 +170,20 @@ SiftJob* PopSift::enqueue( int w,
void PopSift::uploadImages( )
{
SiftJob* job;
while( ( job = _pipe._queue_stage1.pull() ) != 0 ) {
while( ( job = _pipe._queue_stage1.pull() ) != nullptr ) {
popsift::ImageBase* img = _pipe._unused.pull();
job->setImg( img );
_pipe._queue_stage2.push( job );
}
_pipe._queue_stage2.push( 0 );
_pipe._queue_stage2.push( nullptr );
}

void PopSift::extractDownloadLoop( )
{
Pipe& p = _pipe;

SiftJob* job;
while( ( job = p._queue_stage2.pull() ) != 0 ) {
while( ( job = p._queue_stage2.pull() ) != nullptr ) {
popsift::ImageBase* img = job->getImg();

private_init( img->getWidth(), img->getHeight() );
Expand Down Expand Up @@ -217,7 +216,7 @@ void PopSift::matchPrepareLoop( )
Pipe& p = _pipe;

SiftJob* job;
while( ( job = p._queue_stage2.pull() ) != 0 ) {
while( ( job = p._queue_stage2.pull() ) != nullptr ) {
popsift::ImageBase* img = job->getImg();

private_init( img->getWidth(), img->getHeight() );
Expand All @@ -238,12 +237,12 @@ void PopSift::matchPrepareLoop( )
SiftJob::SiftJob( int w, int h, const unsigned char* imageData )
: _w(w)
, _h(h)
, _img(0)
, _img(nullptr)
{
_f = _p.get_future();

_imageData = (unsigned char*)malloc( w*h );
if( _imageData != 0 ) {
if( _imageData != nullptr ) {
memcpy( _imageData, imageData, w*h );
} else {
cerr << __FILE__ << ":" << __LINE__ << " Memory limitation" << endl
Expand All @@ -255,12 +254,12 @@ SiftJob::SiftJob( int w, int h, const unsigned char* imageData )
SiftJob::SiftJob( int w, int h, const float* imageData )
: _w(w)
, _h(h)
, _img(0)
, _img(nullptr)
{
_f = _p.get_future();

_imageData = (unsigned char*)malloc( w*h*sizeof(float) );
if( _imageData != 0 ) {
if( _imageData != nullptr ) {
memcpy( _imageData, imageData, w*h*sizeof(float) );
} else {
cerr << __FILE__ << ":" << __LINE__ << " Memory limitation" << endl
Expand Down Expand Up @@ -317,3 +316,27 @@ popsift::FeaturesDev* SiftJob::getDev()
return dynamic_cast<popsift::FeaturesDev*>( _f.get() );
}

void PopSift::Pipe::uninit()
{
Comment thread
griwodz marked this conversation as resolved.
_queue_stage1.push( nullptr );
if(_thread_stage2 != nullptr)
{
_thread_stage2->join();
_thread_stage2.reset(nullptr);
}
if(_thread_stage1 != nullptr)
{
_thread_stage1->join();
_thread_stage1.reset(nullptr);
}

while( !_unused.empty() )
{
popsift::ImageBase* img = _unused.pull();
delete img;
}

delete _pyramid;
_pyramid = nullptr;

}
27 changes: 19 additions & 8 deletions src/popsift/popsift.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,18 @@ class PopSift
{
struct Pipe
{
boost::thread* _thread_stage1;
boost::thread* _thread_stage2;
std::unique_ptr<boost::thread> _thread_stage1{nullptr};
std::unique_ptr<boost::thread> _thread_stage2{nullptr};
Comment thread
simogasp marked this conversation as resolved.
Outdated
boost::sync_queue<SiftJob*> _queue_stage1;
boost::sync_queue<SiftJob*> _queue_stage2;
boost::sync_queue<popsift::ImageBase*> _unused;
popsift::ImageBase* _current;

popsift::Pyramid* _pyramid;
popsift::Pyramid* _pyramid{nullptr};

/**
* @brief Release the allocated resources, if any.
*/
void uninit();
};

public:
Expand All @@ -95,8 +99,8 @@ class PopSift
/* We support more than 1 streams, but we support only one sigma and one
* level parameters.
*/
PopSift( ImageMode imode = ByteImages );
PopSift( const popsift::Config& config,
explicit PopSift( ImageMode imode = ByteImages );
explicit PopSift( const popsift::Config& config,
popsift::Config::ProcessingMode mode = popsift::Config::ExtractingMode,
ImageMode imode = ByteImages );
~PopSift();
Expand All @@ -118,10 +122,14 @@ class PopSift
int h,
const float* imageData );

/** deprecated */
/**
* @deprecated
* */
inline void uninit( int /*pipe*/ ) { uninit(); }

/** deprecated */
/**
* @deprecated
**/
inline bool init( int /*pipe*/, int w, int h ) {
_last_init_w = w;
_last_init_h = h;
Expand Down Expand Up @@ -164,5 +172,8 @@ class PopSift
int _last_init_w; /* to support depreacted interface */
int _last_init_h; /* to support depreacted interface */
ImageMode _image_mode;

/// whether the object is initialized
bool _isInit{false};
Comment thread
simogasp marked this conversation as resolved.
Outdated
};