obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Major changes : new cython subclasses to handle columns with multiple

Browse Source 
elements per line in a more efficient way + now elements_names are
passed as a list + new function to recover only the header of a column
This commit is contained in:
Celine Mercier
2015-10-14 18:05:34 +02:00
parent 21923e213d
commit 0eaa5aa784
22 changed files with 749 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
src/obidmscolumn.c
View File

@ -639,7 +639,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
minimum_line_count = get_line_count_per_page(data_type, nb_elements_per_line);
if (nb_lines > MAXIMUM_LINE_COUNT)
{
obidebug(1, "\nCan't create column because of line count greater than the maximum allowed (%lld)", MAXIMUM_LINE_COUNT);
obidebug(1, "\nCan't create column because of line count greater than the maximum allowed (%ld)", MAXIMUM_LINE_COUNT);
return NULL;
}
else if (nb_lines < minimum_line_count)
@ -1341,7 +1341,7 @@ OBIType_t obi_column_get_data_type(OBIDMS_column_p column)
}
OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_name)
OBIDMS_column_header_p obi_column_get_header_from_name(OBIDMS_p dms, const char* column_name)
{
OBIDMS_column_header_p header;
OBIDMS_column_directory_p column_directory;
@ -1349,7 +1349,6 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
int column_file_descriptor;
int column_dir_file_descriptor;
size_t header_size;
OBIType_t data_type;
obiversion_t version_number;
// Get the column directory structure associated to the column
@ -1357,7 +1356,7 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
if (column_directory == NULL)
{
obidebug(1, "\nError opening a column directory structure");
return -1;
return NULL;
}
// Get the file descriptor associated to the column directory
@ -1367,7 +1366,7 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
obidebug(1, "\nError getting the file descriptor of a column directory");
obi_close_column_directory(column_directory);
return -1;
return NULL;
}
// Calculate the header size
@ -1378,14 +1377,14 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
if (version_number < 0)
{
obidebug(1, "\nError getting the latest version number in a column directory");
return -1;
return NULL;
}
// Get the column file name
column_file_name = build_column_file_name(column_name, version_number);
if (column_file_name == NULL)
{
return -1;
return NULL;
}
// Open the column file (READ-ONLY)
@ -1395,7 +1394,7 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
obidebug(1, "\nError opening a column file");
obi_set_errno(OBICOL_UNKNOWN_ERROR);
free(column_file_name);
return -1;
return NULL;
}
// Fill the header structure
@ -1413,103 +1412,27 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
obidebug(1, "\nError mmapping the header of a column");
close(column_file_descriptor);
free(column_file_name);
return -1;
return NULL;
}
// TODO Check endianness?
data_type = header->data_type;
free(column_file_name);
close(column_file_descriptor);
munmap(header, header_size);
return data_type;
return header;
}
size_t obi_column_get_line_count_from_name(OBIDMS_p dms, const char* column_name)
int obi_unmap_header(OBIDMS_column_header_p header)
{
OBIDMS_column_header_p header;
OBIDMS_column_directory_p column_directory;
char* column_file_name;
int column_file_descriptor;
int column_dir_file_descriptor;
size_t header_size;
size_t line_count;
obiversion_t version_number;
// Get the column directory structure associated to the column
column_directory = obi_open_column_directory(dms, column_name);
if (column_directory == NULL)
{
obidebug(1, "\nError opening a column directory structure");
return -1;
}
// Get the file descriptor associated to the column directory
column_dir_file_descriptor = dirfd(column_directory->directory);
if (column_dir_file_descriptor < 0)
{
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
obidebug(1, "\nError getting the file descriptor of a column directory");
obi_close_column_directory(column_directory);
return -1;
}
// Calculate the header size
header_size = obi_get_platform_header_size();
// Get the latest version number
version_number = obi_get_latest_version_number(column_directory);
if (version_number < 0)
{
obidebug(1, "\nError getting the latest version number in a column directory");
return -1;
}
// Get the column file name
column_file_name = build_column_file_name(column_name, version_number);
if (column_file_name == NULL)
{
return -1;
}
// Open the column file (READ-ONLY)
column_file_descriptor = openat(column_dir_file_descriptor, column_file_name, O_RDONLY);
if (column_file_descriptor < 0)
{
obidebug(1, "\nError opening a column file");
obi_set_errno(OBICOL_UNKNOWN_ERROR);
free(column_file_name);
return -1;
}
// Fill the header structure
header = mmap(NULL,
header_size,
PROT_READ,
MAP_SHARED,
column_file_descriptor,
0
);
if (header == MAP_FAILED)
if (munmap(header, header->header_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError mmapping the header of a column");
close(column_file_descriptor);
free(column_file_name);
obidebug(1, "\nError munmapping a column header");
return -1;
}
// TODO Check endianness?
line_count = header->line_count;
free(column_file_name);
close(column_file_descriptor);
munmap(header, header_size);
return line_count;
return 0;
}
@ -1567,7 +1490,7 @@ size_t obi_column_get_nb_elements_per_line(OBIDMS_column_p column)
}
char* obi_column_get_formatted_creation_date(OBIDMS_column_p column)
char* obi_column_get_formatted_creation_date(OBIDMS_column_p column) // TODO
{
char* formatted_time;
struct tm* tmp;
@ -1593,7 +1516,7 @@ char* obi_column_get_formatted_creation_date(OBIDMS_column_p column)
}
char* obi_column_get_formatted_creation_date_from_name(OBIDMS_p dms, const char* column_name)
char* obi_column_get_formatted_creation_date_from_name(OBIDMS_p dms, const char* column_name) // TODO
{
OBIDMS_column_header_p header;
OBIDMS_column_directory_p column_directory;
@ -1691,8 +1614,15 @@ char* obi_column_get_formatted_creation_date_from_name(OBIDMS_p dms, const char*
return NULL;
}
// Munmap header
if (munmap(header, header->header_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError munmapping header after getting the creation date of a column");
}
free(column_file_name);
close(column_file_descriptor);
munmap(header, header_size);
return formatted_time;
}