From fcaa81bfdcca4eb607622175d185dc721d37d2a5 Mon Sep 17 00:00:00 2001 From: Ingo Huerner Date: Wed, 11 Jun 2014 16:03:55 +0200 Subject: Corrected memset call; reduced number of open handles (MaxPersHandle) form 256 to 128; fixed a problem when closing RCT db --- src/persistence_client_library.c | 2 +- src/persistence_client_library_data_organization.h | 2 +- src/persistence_client_library_db_access.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/persistence_client_library.c b/src/persistence_client_library.c index f2226c9..94b1169 100644 --- a/src/persistence_client_library.c +++ b/src/persistence_client_library.c @@ -170,7 +170,7 @@ int pclInitLibrary(const char* appName, int shutdownMode) } // initialize keyHandle array - memset(gKeyHandleArray, 0, sizeof(gKeyHandleArray)); + memset(gKeyHandleArray, 0, MaxPersHandle * sizeof(PersistenceKeyHandle_s)); pers_unlock_access(); diff --git a/src/persistence_client_library_data_organization.h b/src/persistence_client_library_data_organization.h index 50d57a9..19393b6 100644 --- a/src/persistence_client_library_data_organization.h +++ b/src/persistence_client_library_data_organization.h @@ -138,7 +138,7 @@ enum _PersistenceConstantDef DbResIDMaxLen = PERS_DB_MAX_LENGTH_KEY_NAME, /// max database key length DbPathMaxLen = PERS_ORG_MAX_LENGTH_PATH_FILENAME, /// max database path length MaxAppNameLen = PERS_RCT_MAX_LENGTH_RESPONSIBLE, /// max application name - MaxPersHandle = 256, /// max number of parallel open persistence handles + MaxPersHandle = 128, /// max number of parallel open persistence handles MaxConfKeyLengthResp = 32, /// length of the config key responsible name MaxConfKeyLengthCusName = 32, /// length of the config key custom name diff --git a/src/persistence_client_library_db_access.c b/src/persistence_client_library_db_access.c index 2c0bf03..75c804d 100644 --- a/src/persistence_client_library_db_access.c +++ b/src/persistence_client_library_db_access.c @@ -625,7 +625,7 @@ void pers_rct_close_all() { if(gResource_table[i] != -1) { - if(persComRctClose(i) != 0) + if(persComRctClose(gResource_table[i]) != 0) { DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("process_prepare_shutdown => failed to close db => index:"), DLT_INT(i)); } -- cgit v1.2.1