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

Error handling: obidebug() with message for all errors, and removed

Browse Source 
commands closing directories when an error occurred (creating more
errors).
This commit is contained in:
celinemercier
2015-08-03 15:10:39 +02:00
parent 1e01c9059c
commit 41f627091f
4 changed files with 108 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
src/obidmscolumn.c
View File

@ -152,7 +152,7 @@ static char *build_column_file_name(const char *column_name, obiversion_t versio
if (asprintf(&filename,"%s@%d.odc", column_name, version_number) < 0)
{
obi_set_errno(OBICOL_MEMORY_ERROR);
obidebug(1, "\nasprintf() function failed");
obidebug(1, "\nError building a column file name");
return NULL;
}
@ -168,6 +168,7 @@ static char *build_version_file_name(const char *column_name)
if (asprintf(&filename,"%s.odv", column_name) < 0)
{
obi_set_errno(OBICOL_MEMORY_ERROR);
obidebug(1, "\nError building a version file name");
return NULL;
}
@ -204,6 +205,7 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (column_dir_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError getting the file descriptor for a column file directory");
free(version_file_name);
return -1;
}
@ -212,7 +214,6 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
version_file_descriptor = openat(column_dir_file_descriptor, version_file_name, O_RDWR);
if (version_file_descriptor < 0)
{
free(version_file_name);
if (errno == ENOENT)
return create_version_file(column_directory);
else
@ -220,14 +221,16 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
obi_set_errno(OBICOL_UNKNOWN_ERROR);
return -1;
}
obidebug(1, "\nError opening a version file");
free(version_file_name);
}
// Test if the version file size is ok
if (lseek(version_file_descriptor, 0, SEEK_END) < loc_size)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError testing if a version file size is ok");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -236,8 +239,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (lseek(version_file_descriptor, 0, SEEK_SET) != 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError preparing a version file for locking");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -246,8 +249,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (lockf(version_file_descriptor, lock_mode, loc_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError locking a version file");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -256,8 +259,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (read(version_file_descriptor, &little_endian, sizeof(bool)) < sizeof(bool))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError reading the endianness of a version file");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -266,8 +269,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (little_endian != obi_is_little_endian())
{
obi_set_errno(OBICOL_BAD_ENDIAN_ERROR);
obidebug(1, "\nEndianness of a version file is incorrect");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -276,8 +279,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (read(version_file_descriptor, &new_version_number, sizeof(obiversion_t)) < sizeof(obiversion_t))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError reading a version file");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -288,8 +291,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (lseek(version_file_descriptor, sizeof(bool), SEEK_SET) != sizeof(bool))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError writing a new version number in a version file");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -297,8 +300,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (write(version_file_descriptor, &new_version_number, sizeof(obiversion_t)) < sizeof(obiversion_t))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError writing a new version number in a version file");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -307,8 +310,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (lseek(version_file_descriptor, 0, SEEK_SET) != 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError preparing the unlocking of a version file");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -317,8 +320,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_
if (lockf(version_file_descriptor, F_ULOCK, loc_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError unlocking a version file");
close(version_file_descriptor);
close(column_dir_file_descriptor);
free(version_file_name);
return -1;
}
@ -351,6 +354,7 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (column_dir_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError getting the file descriptor for a column directory");
free(version_file_name);
return -1;
}
@ -360,8 +364,8 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (version_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError opening a version file");
free(version_file_name);
close(column_dir_file_descriptor);
return -1;
}
@ -369,9 +373,9 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (lockf(version_file_descriptor, F_LOCK, loc_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError locking a version file");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -379,9 +383,9 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (ftruncate(version_file_descriptor, loc_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError truncating a version file");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -389,9 +393,9 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (lseek(version_file_descriptor, 0, SEEK_SET) != 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError changing offset of a version file");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -401,9 +405,9 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (write(version_file_descriptor, &little_endian, sizeof(bool)) < sizeof(bool))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError writing endianness of a version file");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -411,9 +415,9 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (write(version_file_descriptor, &version_number, sizeof(obiversion_t)) < sizeof(obiversion_t))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError writing version number in a version file");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -421,9 +425,9 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (lseek(version_file_descriptor, 0, SEEK_SET) != 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError preparing a version file for unlocking");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -431,9 +435,9 @@ static int create_version_file(OBIDMS_column_directory_p column_directory)
if (lockf(version_file_descriptor, F_ULOCK, loc_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError unlocking a version file");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -448,7 +452,10 @@ int obi_column_set_elements_names(OBIDMS_column_p column, const char* elements_n
{
(column->header)->elements_names = malloc(strlen(elements_names)*sizeof(char) + 1);
if ((column->header)->elements_names == NULL)
{
obidebug(1, "\nError allocating the memory for elements names in an OBIDMS column");
return -1;
}
strcpy((column->header)->elements_names, elements_names);
return 0;
}
@ -481,6 +488,7 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_dire
if (column_dir_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError getting the file descriptor for a column directory");
free(version_file_name);
return -1;
}
@ -490,8 +498,8 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_dire
if (version_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError opening a version file");
free(version_file_name);
close(column_dir_file_descriptor);
return -1;
}
@ -499,9 +507,9 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_dire
if (lseek(version_file_descriptor, 0, SEEK_END) < loc_size)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError testing if a version file size is ok");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -509,9 +517,9 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_dire
if (lseek(version_file_descriptor, 0, SEEK_SET) != 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError setting the offset of a version file to 0");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -519,9 +527,9 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_dire
if (read(version_file_descriptor, &little_endian, sizeof(bool)) < sizeof(bool))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError reading the endianness of a version file");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -529,9 +537,9 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_dire
if (little_endian != obi_is_little_endian())
{
obi_set_errno(OBICOL_BAD_ENDIAN_ERROR);
obidebug(1, "\nEndianness of a version file is incorrect");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -539,9 +547,9 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_dire
if (read(version_file_descriptor, &latest_version_number, sizeof(obiversion_t)) < sizeof(obiversion_t))
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obidebug(1, "\nError reading the latest version number in a version file");
free(version_file_name);
close(version_file_descriptor);
close(column_dir_file_descriptor);
return -1;
}
@ -561,7 +569,7 @@ obiversion_t obi_column_get_latest_version_from_name(OBIDMS_p dms, const char* c
column_directory = obi_open_column_directory(dms, column_name);
if (column_directory == NULL)
{
obidebug(1, "\nProblem opening column directory");
obidebug(1, "\nProblem opening a column directory structure");
return -1;
}
@ -569,8 +577,7 @@ obiversion_t obi_column_get_latest_version_from_name(OBIDMS_p dms, const char* c
latest_version = obi_get_latest_version_number(column_directory);
if (latest_version < 0)
{
obidebug(1, "\nProblem getting the latest version number");
obi_close_column_directory(column_directory);
obidebug(1, "\nProblem getting the latest version number in a column directory");
return -1;
}
@ -604,19 +611,23 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
new_column = NULL;
// TODO check that informations are not NULL/invalid
// TODO check that informations are not NULL/invalid?
// Get the column directory structure associated to the column
column_directory = obi_column_directory(dms, column_name);
if (column_directory == NULL)
{
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
obidebug(1, "\nError opening a column directory structure");
return NULL;
}
// 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);
obi_close_column_directory(column_directory);
obidebug(1, "\nError getting the file descriptor for a column directory");
return NULL;
}
@ -629,8 +640,6 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
version_number = obi_get_new_version_number(column_directory, true);
if (version_number < 0)
{
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
return NULL;
}
@ -638,8 +647,6 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
column_file_name = build_column_file_name(column_name, version_number);
if (column_file_name == NULL)
{
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
return NULL;
}
@ -648,8 +655,6 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (column_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
free(column_file_name);
return NULL;
}
@ -658,8 +663,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (ftruncate(column_file_descriptor, file_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError truncating a column file to the right size");
close(column_file_descriptor);
free(column_file_name);
return NULL;
@ -670,8 +674,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (new_column == NULL)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError allocating the memory for the column structure");
close(column_file_descriptor);
free(column_file_name);
return NULL;
@ -691,8 +694,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (new_column->header == MAP_FAILED)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError mmapping the header of a column");
close(column_file_descriptor);
free(column_file_name);
free(new_column);
@ -709,10 +711,9 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (new_column->data == MAP_FAILED)
{
munmap(new_column->header, header_size);
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError mmapping the data of a column");
munmap(new_column->header, header_size);
close(column_file_descriptor);
free(column_file_name);
free(new_column);
@ -759,7 +760,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
column_directory = obi_open_column_directory(dms, column_name);
if (column_directory == NULL)
{
obidebug(1, "\nProblem opening column directory");
obidebug(1, "\nError opening a column directory structure");
return NULL;
}
@ -767,9 +768,8 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
column_dir_file_descriptor = dirfd(column_directory->directory);
if (column_dir_file_descriptor < 0)
{
obidebug(1, "\nProblem opening column directory");
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
obidebug(1, "\nError getting the file descriptor for a column directory");
return NULL;
}
@ -782,9 +782,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
version_number = obi_get_latest_version_number(column_directory);
if (version_number < 0)
{
obidebug(1, "\nProblem getting the latest version number");
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError getting the latest version number in a column directory");
return NULL;
}
}
@ -793,9 +791,6 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
column_file_name = build_column_file_name(column_name, version_number);
if (column_file_name == NULL)
{
obidebug(1, "Problem building column file name");
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
return NULL;
}
@ -803,10 +798,8 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
column_file_descriptor = openat(column_dir_file_descriptor, column_file_name, O_RDONLY);
if (column_file_descriptor < 0)
{
obidebug(1, "\nCan't open column file");
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError opening column file");
free(column_file_name);
return NULL;
}
@ -816,8 +809,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
if (column == NULL)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError allocating the memory for a column structure");
close(column_file_descriptor);
free(column_file_name);
return NULL;
@ -837,8 +829,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
if (column->header == MAP_FAILED)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError mmapping the header of a column");
close(column_file_descriptor);
free(column_file_name);
free(column);
@ -860,10 +851,9 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
if (column->data == MAP_FAILED)
{
munmap(column->header, header_size);
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError mmapping the data of a column");
munmap(column->header, header_size);
close(column_file_descriptor);
free(column_file_name);
free(column);
@ -881,7 +871,7 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms, const char* column_name, obiversio
int obi_close_column(OBIDMS_column_p column)
{
//munmap?
//munmap? TODO
free(column);
return 0;
}
@ -920,7 +910,7 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
column_directory = obi_open_column_directory(dms, column_name);
if (column_directory == NULL)
{
obidebug(1, "\nProblem opening column directory");
obidebug(1, "\nError opening a column directory structure");
return -1;
}
@ -928,8 +918,8 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
column_dir_file_descriptor = dirfd(column_directory->directory);
if (column_dir_file_descriptor < 0)
{
obidebug(1, "\nProblem opening column directory");
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;
}
@ -941,9 +931,7 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
version_number = obi_get_latest_version_number(column_directory);
if (version_number < 0)
{
obidebug(1, "\nProblem getting the latest version number");
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError getting the latest version number in a column directory");
return -1;
}
@ -951,9 +939,6 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
column_file_name = build_column_file_name(column_name, version_number);
if (column_file_name == NULL)
{
obidebug(1, "Problem building column file name");
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
return -1;
}
@ -961,10 +946,8 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
column_file_descriptor = openat(column_dir_file_descriptor, column_file_name, O_RDONLY);
if (column_file_descriptor < 0)
{
obidebug(1, "\nCan't open column file");
obidebug(1, "\nError opening a column file");
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
free(column_file_name);
return -1;
}
@ -981,11 +964,9 @@ OBIType_t obi_column_get_data_type_from_name(OBIDMS_p dms, const char* column_na
if (header == MAP_FAILED)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
obidebug(1, "\nError mmapping the header of a column");
close(column_file_descriptor);
free(column_file_name);
free(header);
return -1;
}
@ -1041,7 +1022,7 @@ size_t obi_column_get_element_index_from_name(OBIDMS_column_p column, const char
element_index++;
}
obidebug(1, "\nCan't find element name");
obidebug(1, "\nCan't find an element name");
free(elements_names);
return -1;
}