Skip to content

[win32] Bugfix freeing page-aligned memory on Win32 #53

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
yann-lty merged 1 commit into from
Nov 29, 2018
Merged

[win32] Bugfix freeing page-aligned memory on Win32 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions src/popsift/common/assist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,13 @@ static void* memalign(size_t alignment, size_t size)
#endif
}

static void memalign_free( void* ptr )
{
#ifdef _WIN32
_aligned_free( ptr );
#else
free( ptr );
#endif
}

}; // namespace popsift
12 changes: 4 additions & 8 deletions src/popsift/common/plane_2d.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,16 @@ void PlaneBase::freeHost2D( void* data, PlaneMapMode m )
{
if (!data)
return;
if (m == CudaAllocated) {
else if (m == CudaAllocated) {
cudaFreeHost(data);
return;
}
if (m == Unaligned) {
else if (m == Unaligned) {
free(data);
return;
}
if (m == PageAligned) {
#ifdef _WIN32
_aligned_free(data);
#else
free(data);
#endif
else if (m == PageAligned) {
memalign_free( data );
return;
}
assert(!"Invalid PlaneMapMode");
Expand Down
4 changes: 2 additions & 2 deletions src/popsift/features.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ FeaturesHost::FeaturesHost( int num_ext, int num_ori )

FeaturesHost::~FeaturesHost( )
{
free( _ext );
free( _ori );
memalign_free( _ext );
memalign_free( _ori );
}

void FeaturesHost::reset( int num_ext, int num_ori )
Expand Down