Skip to content
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

Increase reference count also in other load_chunk overload #1225

Merged
merged 2 commits into from
Apr 5, 2022
Merged

Increase reference count also in other load_chunk overload #1225

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76eddd8
Increase reference count also in other load_chunk overload
ax3l Feb 18, 2022
3d52992
Add comment
ax3l Mar 14, 2022
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
58 changes: 28 additions & 30 deletions src/binding/python/RecordComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,53 +539,51 @@ void load_chunk(
}
}

auto load_data =
[&r, &buffer, &buffer_info, &offset, &extent](auto cxxtype) {
using CXXType = decltype(cxxtype);
buffer.inc_ref();
// buffer_info.inc_ref();
void *data = buffer_info.ptr;
std::shared_ptr<CXXType> shared(
(CXXType *)data, [buffer](CXXType *) { buffer.dec_ref(); });
r.loadChunk(std::move(shared), offset, extent);
};

if (r.getDatatype() == Datatype::CHAR)
r.loadChunk<char>(shareRaw((char *)buffer_info.ptr), offset, extent);
load_data((char)0);
else if (r.getDatatype() == Datatype::UCHAR)
r.loadChunk<unsigned char>(
shareRaw((unsigned char *)buffer_info.ptr), offset, extent);
load_data((unsigned char)0);
else if (r.getDatatype() == Datatype::SHORT)
r.loadChunk<short>(shareRaw((short *)buffer_info.ptr), offset, extent);
load_data((short)0);
else if (r.getDatatype() == Datatype::INT)
r.loadChunk<int>(shareRaw((int *)buffer_info.ptr), offset, extent);
load_data((int)0);
else if (r.getDatatype() == Datatype::LONG)
r.loadChunk<long>(shareRaw((long *)buffer_info.ptr), offset, extent);
load_data((long)0);
else if (r.getDatatype() == Datatype::LONGLONG)
r.loadChunk<long long>(
shareRaw((long long *)buffer_info.ptr), offset, extent);
load_data((long long)0);
else if (r.getDatatype() == Datatype::USHORT)
r.loadChunk<unsigned short>(
shareRaw((unsigned short *)buffer_info.ptr), offset, extent);
load_data((unsigned short)0);
else if (r.getDatatype() == Datatype::UINT)
r.loadChunk<unsigned int>(
shareRaw((unsigned int *)buffer_info.ptr), offset, extent);
load_data((unsigned int)0);
else if (r.getDatatype() == Datatype::ULONG)
r.loadChunk<unsigned long>(
shareRaw((unsigned long *)buffer_info.ptr), offset, extent);
load_data((unsigned long)0);
else if (r.getDatatype() == Datatype::ULONGLONG)
r.loadChunk<unsigned long long>(
shareRaw((unsigned long long *)buffer_info.ptr), offset, extent);
load_data((unsigned long long)0);
else if (r.getDatatype() == Datatype::LONG_DOUBLE)
r.loadChunk<long double>(
shareRaw((long double *)buffer_info.ptr), offset, extent);
load_data((long double)0);
else if (r.getDatatype() == Datatype::DOUBLE)
r.loadChunk<double>(
shareRaw((double *)buffer_info.ptr), offset, extent);
load_data((double)0);
else if (r.getDatatype() == Datatype::FLOAT)
r.loadChunk<float>(shareRaw((float *)buffer_info.ptr), offset, extent);
load_data((float)0);
else if (r.getDatatype() == Datatype::CLONG_DOUBLE)
r.loadChunk<std::complex<long double>>(
shareRaw((std::complex<long double> *)buffer_info.ptr),
offset,
extent);
load_data((std::complex<long double>)0);
else if (r.getDatatype() == Datatype::CDOUBLE)
r.loadChunk<std::complex<double>>(
shareRaw((std::complex<double> *)buffer_info.ptr), offset, extent);
load_data((std::complex<double>)0);
else if (r.getDatatype() == Datatype::CFLOAT)
r.loadChunk<std::complex<float>>(
shareRaw((std::complex<float> *)buffer_info.ptr), offset, extent);
load_data((std::complex<float>)0);
else if (r.getDatatype() == Datatype::BOOL)
r.loadChunk<bool>(shareRaw((bool *)buffer_info.ptr), offset, extent);
load_data((bool)0);
else
throw std::runtime_error(
std::string("Datatype not known in 'loadChunk'!"));
Expand Down