core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Performance: BUFR decoding: fixes

This commit is contained in:
Shahram Najm 2019-09-20 18:30:41 +01:00
parent 4ce294d0c8
commit a7452b5da4
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/grib_io.c
View File

@ -1948,7 +1948,6 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
void* mesg = NULL; void* mesg = NULL;
size_t size = 0; size_t size = 0;
off_t offset = 0; off_t offset = 0;
codes_bufr_header* headers = *result;
if (!c) c=grib_context_get_default(); if (!c) c=grib_context_get_default();
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
@ -1958,21 +1957,30 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
return GRIB_IO_PROBLEM; return GRIB_IO_PROBLEM;
} }
err = grib_count_in_file(c, fp, num_messages); err = grib_count_in_file(c, fp, num_messages);
if (err) return err; if (err) {
fclose(fp);
return err;
}
headers = (codes_bufr_header*)calloc((size_t)num_messages, sizeof(codes_bufr_header)); size = *num_messages;
if (!headers) { *result = (codes_bufr_header*)calloc(size, sizeof(codes_bufr_header));
if (!*result) {
fclose(fp);
return GRIB_OUT_OF_MEMORY; return GRIB_OUT_OF_MEMORY;
} }
i = 0; i = 0;
while (err != GRIB_END_OF_FILE) { while (err != GRIB_END_OF_FILE) {
mesg = wmo_read_bufr_from_file_malloc(fp, 0, &size, &offset, &err); mesg = wmo_read_bufr_from_file_malloc(fp, 0, &size, &offset, &err);
if (mesg != NULL && err == 0) { if (mesg != NULL && err == 0) {
int err2 = bufr_decode_header(mesg, offset, size, &headers[i++]); int err2 = bufr_decode_header(mesg, offset, size, &(*result)[i++]);
if (err2) return err2; if (err2) {
fclose(fp);
return err2;
}
grib_context_free(c, mesg); grib_context_free(c, mesg);
} }
} }
fclose(fp);
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }