Skip to content

Check all allocs in the Arrow tree #9488

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

Open
wiredfool wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −33
Open

Check all allocs in the Arrow tree #9488

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
3 changes: 3 additions & 0 deletions src/_imaging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ PyObject *
ExportArrowArrayPyCapsule(ImagingObject *self) {
struct ArrowArray *array =
(struct ArrowArray *)calloc(1, sizeof(struct ArrowArray));
if (!array) {
return ArrowError(IMAGING_CODEC_MEMORY);
}
int err = export_imaging_array(self->image, array);
if (err == 0) {
return PyCapsule_New(array, "arrow_array", ReleaseArrowArrayPyCapsule);
Expand Down
76 changes: 43 additions & 33 deletions src/libImaging/Arrow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

static void
ReleaseExportedSchema(struct ArrowSchema *array) {
// This should not be called on already released array
// assert(array->release != NULL);
// TODO here: release and/or deallocate all data directly owned by
// the ArrowArray struct, such as the private_data.

if (!array->release) {
return;
Expand All @@ -30,31 +30,36 @@ ReleaseExportedSchema(struct ArrowSchema *array) {
}

// Release children
for (int64_t i = 0; i < array->n_children; ++i) {
struct ArrowSchema *child = array->children[i];
if (child->release != NULL) {
child->release(child);
child->release = NULL;
}
free(array->children[i]);
}
if (array->children) {
for (int64_t i = 0; i < array->n_children; ++i) {
struct ArrowSchema *child = array->children[i];
if (child != NULL) {
if (child->release != NULL) {
child->release(child);
child->release = NULL;
}
free(array->children[i]);
}
}
free(array->children);
array->children = NULL;
}

// Release dictionary
struct ArrowSchema *dict = array->dictionary;
if (dict != NULL && dict->release != NULL) {
dict->release(dict);
dict->release = NULL;
if (dict != NULL) {
if (dict->release != NULL) {
dict->release(dict);
dict->release = NULL;
}
free(dict);
array->dictionary = NULL;
}

// TODO here: release and/or deallocate all data directly owned by
// the ArrowArray struct, such as the private_data.

// Mark array released
array->release = NULL;
}

char *
image_band_json(Imaging im) {
char *format = "{\"bands\": [\"%s\", \"%s\", \"%s\", \"%s\"]}";
Expand Down Expand Up @@ -220,13 +225,19 @@ export_imaging_schema(Imaging im, struct ArrowSchema *schema) {
// if it's not 1 band, it's an int32 at the moment. 4 uint8 bands.
schema->n_children = 1;
schema->children = calloc(1, sizeof(struct ArrowSchema *));
if (!schema->children) {
schema->release(schema);
return IMAGING_CODEC_MEMORY;
}
schema->children[0] = (struct ArrowSchema *)calloc(1, sizeof(struct ArrowSchema));
if (!schema->children[0]) {
schema->release(schema);
return IMAGING_CODEC_MEMORY;
}
retval = export_named_type(
schema->children[0], im->arrow_band_format, getModeData(im->mode)->name
);
if (retval != 0) {
free(schema->children[0]);
free(schema->children);
schema->release(schema);
return retval;
}
Expand Down Expand Up @@ -256,11 +267,12 @@ release_const_array(struct ArrowArray *array) {
array->buffers = NULL;
}
if (array->children) {
// undone -- does arrow release all the children recursively?
for (int i = 0; i < array->n_children; i++) {
if (array->children[i]->release) {
array->children[i]->release(array->children[i]);
array->children[i]->release = NULL;
if (array->children[i]) {
if (array->children[i]->release) {
array->children[i]->release(array->children[i]);
array->children[i]->release = NULL;
}
free(array->children[i]);
}
}
Expand Down Expand Up @@ -303,8 +315,11 @@ export_single_channel_array(Imaging im, struct ArrowArray *array) {
};

// Allocate list of buffers
array->buffers = (const void **)malloc(sizeof(void *) * array->n_buffers);
// assert(array->buffers != NULL);
array->buffers = (const void **)calloc(1, sizeof(void *) * array->n_buffers);
if (!array->buffers) {
array->release(array);
return IMAGING_CODEC_MEMORY;
}
array->buffers[0] = NULL; // no nulls, null bitmap can be omitted

if (im->block) {
Expand Down Expand Up @@ -386,6 +401,9 @@ export_fixed_pixel_array(Imaging im, struct ArrowArray *array) {

array->children[0]->buffers =
(const void **)calloc(2, sizeof(void *) * array->n_buffers);
if (!array->children[0]->buffers) {
goto err;
}

if (im->block) {
array->children[0]->buffers[1] = im->block;
Expand All @@ -395,15 +413,7 @@ export_fixed_pixel_array(Imaging im, struct ArrowArray *array) {
return 0;

err:
if (array->children[0]) {
free(array->children[0]);
}
if (array->children) {
free(array->children);
}
if (array->buffers) {
free(array->buffers);
}
array->release(array);
return IMAGING_CODEC_MEMORY;
}

Expand Down
Loading