diff options
author | Ingo Huerner <ingo.huerner@xse.de> | 2015-01-27 16:18:37 +0100 |
---|---|---|
committer | Ingo Huerner <ingo.huerner@xse.de> | 2015-01-27 16:18:37 +0100 |
commit | d6a46c9081969523256423f69c81e6d398238817 (patch) | |
tree | f3487d8510bdd40c1aa5d8232a0ef1cb036ba7ed | |
parent | 66e2d647c5df4fda121f460f6b086a7bc57cbec4 (diff) | |
download | persistence-client-library-d6a46c9081969523256423f69c81e6d398238817.tar.gz |
Changed DLT log level (info to debug)
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | config/pclCustomLibConfigFile.cfg | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | include/persistence_client_library_file.h | 13 | ||||
-rw-r--r-- | include/persistence_client_library_key.h | 5 | ||||
-rw-r--r-- | src/persistence_client_library.c | 24 | ||||
-rw-r--r-- | src/persistence_client_library_backup_filelist.c | 8 | ||||
-rw-r--r-- | src/persistence_client_library_custom_loader.c | 38 | ||||
-rw-r--r-- | src/persistence_client_library_data_organization.c | 10 | ||||
-rw-r--r-- | src/persistence_client_library_data_organization.h | 19 | ||||
-rw-r--r-- | src/persistence_client_library_db_access.c | 24 | ||||
-rw-r--r-- | src/persistence_client_library_dbus_cmd.c | 6 | ||||
-rw-r--r-- | src/persistence_client_library_dbus_service.c | 16 | ||||
-rw-r--r-- | src/persistence_client_library_file.c | 30 | ||||
-rw-r--r-- | src/persistence_client_library_key.c | 4 | ||||
-rw-r--r-- | src/persistence_client_library_lc_interface.c | 2 | ||||
-rw-r--r-- | src/persistence_client_library_pas_interface.c | 6 | ||||
-rw-r--r-- | src/persistence_client_library_prct_access.c | 2 |
18 files changed, 121 insertions, 95 deletions
diff --git a/Makefile.am b/Makefile.am index 6435d05..879898d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ -SUBDIRS=src persclient_tool +SUBDIRS=src +#SUBDIRS=src persclient_tool if WANT_TESTS SUBDIRS+=test diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg index cd1f893..c9667d1 100644 --- a/config/pclCustomLibConfigFile.cfg +++ b/config/pclCustomLibConfigFile.cfg @@ -1,7 +1,7 @@ hwinfo /usr/lib/libhwinfoperscustom.so init async secure /usr/lib/libsecureperscustom.so init sync custom3 /usr/lib/libcustom3perscustom.so od sync -default /usr/lib/libpers_common.so init sync +default /usr/lib/libpers_common.so.1 init sync emergency /usr/lib/libemergencyperscustom.so od async early /usr/lib/libearlyperscustom.so od sync custom2 /usr/lib/libcustom2perscustom.so init sync diff --git a/configure.ac b/configure.ac index 91c9668..7a64f52 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ m4_define([pers_client_library_tag_version_micro], [0]) m4_define([pers_client_library_tag_version], [pers_client_library_tag_version_major().pers_client_library_tag_version_minor().pers_client_library_tag_version_micro()]) -AC_INIT([Persistence Client Library], [pers_client_library_tag_version], [not-valid@xse.de]) +AC_INIT([Persistence Client Library], [pers_client_library_tag_version], [genivi-persistence@lists.genivi.org]) AC_COPYRIGHT([Copyright (c) 2014 XS Embedded GmbH]) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -30,7 +30,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # Overwrite the build in defaults -CFLAGS="-Wall -O2 -Wextra -Werror" +CFLAGS="-Wall -Os -Wextra -Werror -fPIC -ffunction-sections" # Checks for programs. AC_PROG_CC diff --git a/include/persistence_client_library_file.h b/include/persistence_client_library_file.h index e116dd6..76a0b95 100644 --- a/include/persistence_client_library_file.h +++ b/include/persistence_client_library_file.h @@ -196,10 +196,15 @@ int pclFileWriteData(int fd, const void * buffer, int buffer_size); * * @note the allocated memory for the path string will be freed in pclFileReleasePath * - * @return positive value (0 or greater) on success, which must be used when pclFileReleasePath will be called - * On error a negative value will be returned with th following error codes: - * ::EPERS_LOCKFS or ::EPERS_COMMON - * If ::EPERS_COMMON will be returned errno will be set. + * @return positive value (0 or greater) on success a path to a file corresponding to the storage resource addressed + * by the given ldbid/resource_id/user_no/seat_no. + * This function can be used to a legacy program or other program that needs direct file storage (e.g. sqlite) + * while still giving that program the benefit from the persistence layer and cause the program to use the + * storage settings that have been configured for the given resource_id. + * This way of access should only be used as a last resort if using the given key-value or file API is not feasible. + * On error a negative value will be returned with th following error codes: + * ::EPERS_LOCKFS or ::EPERS_COMMON + * If ::EPERS_COMMON will be returned errno will be set. */ int pclFileCreatePath(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, char** path, unsigned int* size); diff --git a/include/persistence_client_library_key.h b/include/persistence_client_library_key.h index 04f5a68..37de33e 100644 --- a/include/persistence_client_library_key.h +++ b/include/persistence_client_library_key.h @@ -247,7 +247,7 @@ int pclKeyReadData(unsigned int ldbid, const char* resource_id, unsigned int use /** - * @brief register a change notification for persistent data + * @brief register for a change notification for persistent data * * @warning It is only possible to register one callback at the time, not multiple ones. * If you need to change the callback, call ::pclKeyUnRegisterNotifyOnChange @@ -257,7 +257,8 @@ int pclKeyReadData(unsigned int ldbid, const char* resource_id, unsigned int use * @param resource_id the resource ID * @param user_no the user ID; user_no=0 can not be used as user-ID because ‘0’ is defined as System/node * @param seat_no the seat number - * @param callback notification callback + * @param callback notification callback: after the content of the given resource_id has been changed, + * the passed function callback will be called. * * @return positive value (0 or greater): registration OK; * On error a negative value will be returned with the following error codes: diff --git a/src/persistence_client_library.c b/src/persistence_client_library.c index c7d59b0..7c3f178 100644 --- a/src/persistence_client_library.c +++ b/src/persistence_client_library.c @@ -80,12 +80,12 @@ void doInitAppcheck(const char* appName) if(access(rctFilename, F_OK) == 0) { gAppCheckFlag = 1; // "trusted" application - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("initLibrary - app check: "), DLT_STRING(appName), DLT_STRING("trusted app")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("initLibrary - app check: "), DLT_STRING(appName), DLT_STRING("trusted app")); } else { gAppCheckFlag = 0; // currently not a "trusted" application - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("initLibrary - app check: "), DLT_STRING(appName), DLT_STRING("NOT trusted app")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("initLibrary - app check: "), DLT_STRING(appName), DLT_STRING("NOT trusted app")); } #else (void)appName; @@ -127,14 +127,14 @@ int pclInitLibrary(const char* appName, int shutdownMode) { DLT_REGISTER_CONTEXT(gPclDLTContext,"PCL","Context for persistence client library logging"); DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_DEBUG, DLT_TRACE_STATUS_OFF); - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclInitLibrary => INIT PCL - "), DLT_STRING(appName), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclInitLibrary => INIT PCL - "), DLT_STRING(appName), DLT_STRING("- init counter: "), DLT_INT(gPclInitCounter) ); rval = private_pclInitLibrary(appName, shutdownMode); } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclInitLibrary - INIT PCL - "), DLT_STRING(gAppId), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclInitLibrary - INIT PCL - "), DLT_STRING(gAppId), DLT_STRING("- ONLY INCREMENT init counter: "), DLT_INT(gPclInitCounter) ); } @@ -154,7 +154,7 @@ static int private_pclInitLibrary(const char* appName, int shutdownMode) doInitAppcheck(appName); // check if we have a trusted application #if USE_FILECACHE - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("Using the filecache!!!")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("Using the filecache!!!")); pfcInitCache(appName); #endif @@ -185,7 +185,7 @@ static int private_pclInitLibrary(const char* appName, int shutdownMode) } } #if USE_PASINTERFACE - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("PAS interface is enabled!!")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("PAS interface is enabled!!")); if(register_pers_admin_service() == -1) { DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("initLibrary - Failed reg to PAS dbus interface")); @@ -194,7 +194,7 @@ static int private_pclInitLibrary(const char* appName, int shutdownMode) } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("initLibrary - Successfully established IPC protocol for PCL.")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("initLibrary - Successfully established IPC protocol for PCL.")); } #else DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("PAS interface not enabled, enable with \"./configure --enable-pasinterface\"")); @@ -225,7 +225,7 @@ int pclDeinitLibrary(void) if(gPclInitCounter == 1) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclDeinitLibrary - DEINIT client lib - "), DLT_STRING(gAppId), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclDeinitLibrary - DEINIT client lib - "), DLT_STRING(gAppId), DLT_STRING("- init counter: "), DLT_INT(gPclInitCounter)); rval = private_pclDeinitLibrary(); @@ -234,7 +234,7 @@ int pclDeinitLibrary(void) } else if(gPclInitCounter > 1) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclDeinitLibrary - DEINIT client lib - "), DLT_STRING(gAppId), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclDeinitLibrary - DEINIT client lib - "), DLT_STRING(gAppId), DLT_STRING("- ONLY DECREMENT init counter: "), DLT_INT(gPclInitCounter)); gPclInitCounter--; // decrement init counter } @@ -272,7 +272,7 @@ static int private_pclDeinitLibrary(void) } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclDeinitLibrary - Succ de-initialized IPC protocol for PCL.")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclDeinitLibrary - Succ de-initialized IPC protocol for PCL.")); } #endif @@ -301,13 +301,13 @@ int pclLifecycleSet(int shutdown) { if(shutdown == PCL_SHUTDOWN) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("lifecycleSet - PCL_SHUTDOWN -"), DLT_STRING(gAppId)); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("lifecycleSet - PCL_SHUTDOWN -"), DLT_STRING(gAppId)); process_prepare_shutdown(Shutdown_Partial); gCancelCounter++; } else if(shutdown == PCL_SHUTDOWN_CANCEL) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("lifecycleSet - PCL_SHUTDOWN_CANCEL -"), DLT_STRING(gAppId), DLT_STRING(" Cancel Counter - "), DLT_INT(gCancelCounter)); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("lifecycleSet - PCL_SHUTDOWN_CANCEL -"), DLT_STRING(gAppId), DLT_STRING(" Cancel Counter - "), DLT_INT(gCancelCounter)); if(gCancelCounter < Shutdown_MaxCount) { pers_unlock_access(); diff --git a/src/persistence_client_library_backup_filelist.c b/src/persistence_client_library_backup_filelist.c index 353033e..f59e3fa 100644 --- a/src/persistence_client_library_backup_filelist.c +++ b/src/persistence_client_library_backup_filelist.c @@ -38,7 +38,7 @@ static char* gpTokenArray[TOKENARRAYSIZE] = {0}; // local function prototypes static int need_backup_key(unsigned int key); -int pclRecoverFromBackup(int backupFd, const char* original); +static int pclRecoverFromBackup(int backupFd, const char* original); static void fillFileBackupCharTokenArray(unsigned int customConfigFileSize, char* fileMap) @@ -304,7 +304,7 @@ int pclVerifyConsistency(const char* origPath, const char* backupPath, const cha // ************************************************* if((backupAvail == 0) && (csumAvail == 0) ) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("verifyConsist- there is a backup file AND csum")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("verifyConsist- there is a backup file AND csum")); fdBackup = open(backupPath, O_RDONLY); // calculate checksum form backup file if(fdBackup != -1) @@ -360,7 +360,7 @@ int pclVerifyConsistency(const char* origPath, const char* backupPath, const cha // ************************************************* else if(csumAvail == 0) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("verifyConsist - there is ONLY a csum file")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("verifyConsist - there is ONLY a csum file")); fdCsum = open(csumPath, O_RDONLY); if(fdCsum != -1) @@ -401,7 +401,7 @@ int pclVerifyConsistency(const char* origPath, const char* backupPath, const cha // ************************************************* else if(backupAvail == 0) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("verifyConsist - there is ONLY a backup file")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("verifyConsist - there is ONLY a backup file")); fdBackup = open(backupPath, O_RDONLY); // calculate checksum form backup file if(fdBackup != -1) diff --git a/src/persistence_client_library_custom_loader.c b/src/persistence_client_library_custom_loader.c index c0bb85e..98368bd 100644 --- a/src/persistence_client_library_custom_loader.c +++ b/src/persistence_client_library_custom_loader.c @@ -128,35 +128,35 @@ PersistenceCustomLibs_e custom_client_name_to_id(const char* lib_name, int subst if(substring == 0) { - if (0 == strncmp(lib_name, "default", PersCustomPathSize) ) + if (0 == strncmp(lib_name, gPluginTypeDefault, PersCustomPathSize) ) { libId = PersCustomLib_default; } - else if(0 == strncmp(lib_name, "early", PersCustomPathSize) ) + else if(0 == strncmp(lib_name, gPluginTypeEarly, PersCustomPathSize) ) { libId = PersCustomLib_early; } - else if (0 == strncmp(lib_name, "secure", PersCustomPathSize) ) + else if (0 == strncmp(lib_name, gPluginTypeSecure, PersCustomPathSize) ) { libId = PersCustomLib_secure; } - else if (0 == strncmp(lib_name, "emergency", PersCustomPathSize) ) + else if (0 == strncmp(lib_name, gPluginTypeEmergency, PersCustomPathSize) ) { libId = PersCustomLib_emergency; } - else if (0 == strncmp(lib_name, "hwinfo", PersCustomPathSize) ) + else if (0 == strncmp(lib_name, gPluginTypeHwInfo, PersCustomPathSize) ) { libId = PersCustomLib_HWinfo; } - else if (0 == strncmp(lib_name, "custom1", PersCustomPathSize) ) + else if (0 == strncmp(lib_name, gPluginTypeCustom1, PersCustomPathSize) ) { libId = PersCustomLib_Custom1; } - else if (0 == strncmp(lib_name, "custom2", PersCustomPathSize) ) + else if (0 == strncmp(lib_name, gPluginTypeCustom2, PersCustomPathSize) ) { libId = PersCustomLib_Custom2; } - else if (0 == strncmp(lib_name, "custom3", PersCustomPathSize) ) + else if (0 == strncmp(lib_name, gPluginTypeCustom3, PersCustomPathSize) ) { libId = PersCustomLib_Custom3; } @@ -167,35 +167,35 @@ PersistenceCustomLibs_e custom_client_name_to_id(const char* lib_name, int subst } else { - if(NULL != strstr(lib_name, "default") ) + if(NULL != strstr(lib_name, gPluginTypeDefault) ) { libId = PersCustomLib_default; } - else if(NULL != strstr(lib_name, "early") ) + else if(NULL != strstr(lib_name, gPluginTypeEarly) ) { libId = PersCustomLib_early; } - else if (NULL != strstr(lib_name, "secure") ) + else if (NULL != strstr(lib_name, gPluginTypeSecure) ) { libId = PersCustomLib_secure; } - else if (NULL != strstr(lib_name, "emergency") ) + else if (NULL != strstr(lib_name, gPluginTypeEmergency) ) { libId = PersCustomLib_emergency; } - else if (NULL != strstr(lib_name, "hwinfo") ) + else if (NULL != strstr(lib_name, gPluginTypeHwInfo) ) { libId = PersCustomLib_HWinfo; } - else if (NULL != strstr(lib_name, "custom1") ) + else if (NULL != strstr(lib_name, gPluginTypeCustom1) ) { libId = PersCustomLib_Custom1; } - else if (NULL != strstr(lib_name, "custom2") ) + else if (NULL != strstr(lib_name, gPluginTypeCustom2) ) { libId = PersCustomLib_Custom2; } - else if (NULL != strstr(lib_name, "custom3") ) + else if (NULL != strstr(lib_name, gPluginTypeCustom3) ) { libId = PersCustomLib_Custom3; } @@ -235,7 +235,7 @@ int get_custom_libraries() int i = 0; int fd = open(filename, O_RDONLY); - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("load custom library config file ==> "), DLT_STRING(filename)); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("load custom library config file ==> "), DLT_STRING(filename)); if (fd == -1) { @@ -536,7 +536,7 @@ int load_custom_library(PersistenceCustomLibs_e customLib, Pers_custom_functs_s { if( (gPersCustomFuncs[customLib].custom_plugin_init) != NULL) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("load_custom_library => (sync) : "), DLT_STRING(get_custom_client_lib_name(customLib))); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("load_custom_library => (sync) : "), DLT_STRING(get_custom_client_lib_name(customLib))); gPersCustomFuncs[customLib].custom_plugin_init(); } else @@ -550,7 +550,7 @@ int load_custom_library(PersistenceCustomLibs_e customLib, Pers_custom_functs_s { if( (gPersCustomFuncs[customLib].custom_plugin_init_async) != NULL) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("load_custom_library => (async) : "), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("load_custom_library => (async) : "), DLT_STRING(get_custom_client_lib_name(customLib))); gPersCustomFuncs[customLib].custom_plugin_init_async(gPlugin_callback_async_t); diff --git a/src/persistence_client_library_data_organization.c b/src/persistence_client_library_data_organization.c index 78b7069..71a7455 100644 --- a/src/persistence_client_library_data_organization.c +++ b/src/persistence_client_library_data_organization.c @@ -98,3 +98,13 @@ const char gCharLookup[] = }; +const char* gPluginTypeDefault = "default"; +const char* gPluginTypeEarly = "early"; +const char* gPluginTypeSecure = "secure"; +const char* gPluginTypeEmergency = "emergency"; +const char* gPluginTypeHwInfo = "hwinfo"; +const char* gPluginTypeCustom1 = "custom1"; +const char* gPluginTypeCustom2 = "custom2"; +const char* gPluginTypeCustom3 = "custom3"; + + diff --git a/src/persistence_client_library_data_organization.h b/src/persistence_client_library_data_organization.h index e8cc692..4000e47 100644 --- a/src/persistence_client_library_data_organization.h +++ b/src/persistence_client_library_data_organization.h @@ -263,9 +263,26 @@ extern const char* gCreateSignal; // dbus timeout (5 seconds) extern int gTimeoutMs; -// dbus pending return value +/// dbus pending return value extern int gDbusPendingRvalue; +/// string to identify default plugin +extern const char* gPluginTypeDefault; +/// string to identify early plugin +extern const char* gPluginTypeEarly; +/// string to identify secure plugin +extern const char* gPluginTypeSecure; +/// string to identify emergency plugin +extern const char* gPluginTypeEmergency; +/// string to identify hwinfo plugin +extern const char* gPluginTypeHwInfo; +/// string to identify custom2 plugin +extern const char* gPluginTypeCustom1; +/// string to identify custom2 plugin +extern const char* gPluginTypeCustom2; +/// string to identify custom3 plugin +extern const char* gPluginTypeCustom3; + /** * @brief definition of change callback function diff --git a/src/persistence_client_library_db_access.c b/src/persistence_client_library_db_access.c index 4137282..2dcd7ec 100644 --- a/src/persistence_client_library_db_access.c +++ b/src/persistence_client_library_db_access.c @@ -33,10 +33,6 @@ static int gHandlesDB[DbTableSize][PersistenceDB_LastEntry]; static int gHandlesDBCreated[DbTableSize][PersistenceDB_LastEntry] = { {0} }; -// function prototype -int pers_send_Notification_Signal(const char* key, PersistenceDbContext_s* context, unsigned int reason); - - static int database_get(PersistenceInfo_s* info, const char* dbPath, int dbType) { int arrayIdx = 0, handleDB = -1; @@ -144,7 +140,7 @@ int pers_get_defaults(char* dbPath, char* key, PersistenceInfo_s* info, unsigned { snprintf(dltMessage, DbPathMaxLen, "%s%s", dbPath, plugin_gLocalFactoryDefault); } - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("getDefaults - default data will be used for Key"), DLT_STRING(key), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("getDefaults - default data will be used for Key"), DLT_STRING(key), DLT_STRING("from"), DLT_STRING(dltMessage)); break; } @@ -153,7 +149,7 @@ int pers_get_defaults(char* dbPath, char* key, PersistenceInfo_s* info, unsigned if (read_size < 0) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("getDefaults - default data not available for Key"), DLT_STRING(key), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("getDefaults - default data not available for Key"), DLT_STRING(key), DLT_STRING("Path:"), DLT_STRING(dbPath)); } @@ -237,7 +233,7 @@ int persistence_get_data(char* dbPath, char* key, const char* resourceID, Persis } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("getData - Plugin not avail, unknown loading type: "), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("getData - Plugin not avail, unknown loading type: "), DLT_INT(getCustomLoadingType(idx))); read_size = EPERS_COMMON; } @@ -277,7 +273,7 @@ int persistence_get_data(char* dbPath, char* key, const char* resourceID, Persis (void)get_db_path_and_key(info, key, NULL, dbPath); - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("getData - Plugin data not available - get default data of key:"), DLT_STRING(key)); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("getData - Plugin data not available - get default data of key:"), DLT_STRING(key)); ret_defaults = pers_get_defaults(dbPath, (char*)resourceID, info, buffer, buffer_size, PersGetDefault_Data); if (0 < ret_defaults) { @@ -364,7 +360,7 @@ int persistence_set_data(char* dbPath, char* key, const char* resource_id, Persi } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("setData - Plugin not avail, unknown loading type: "), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("setData - Plugin not avail, unknown loading type: "), DLT_INT(getCustomLoadingType(idx))); write_size = EPERS_COMMON; } @@ -386,7 +382,6 @@ int persistence_set_data(char* dbPath, char* key, const char* resource_id, Persi snprintf(pathKeyString, 128, "0x%08X/%s", info->context.ldbid, info->configKey.customID); } write_size = gPersCustomFuncs[idx].custom_plugin_set_data(pathKeyString, (char*)buffer, buffer_size); - //write_size = persComDbWriteKey(handleDB, key, (char*)buffer, buffer_size) ; if ((0 < write_size) && ((unsigned int)write_size == buffer_size)) /* Check return value and send notification if OK */ { @@ -460,7 +455,7 @@ int persistence_get_data_size(char* dbPath, char* key, const char* resourceID, P } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("getDataSize - Plugin not avail, unknown loading type: "), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("getDataSize - Plugin not avail, unknown loading type: "), DLT_INT(getCustomLoadingType(idx))); read_size = EPERS_COMMON; } @@ -498,7 +493,7 @@ int persistence_get_data_size(char* dbPath, char* key, const char* resourceID, P info->configKey.policy = PersistencePolicy_wc; /* Set the policy */ info->configKey.type = PersistenceResourceType_key; /* Set the type */ (void)get_db_path_and_key(info, key, NULL, dbPath); - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("getDataSize - Plugin data not avail, get size of default data for key:"), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("getDataSize - Plugin data not avail, get size of default data for key:"), DLT_STRING(key)); ret_defaults = pers_get_defaults(dbPath, (char*)resourceID, info, NULL, 0, PersGetDefault_Size); if (0 < ret_defaults) @@ -574,7 +569,7 @@ int persistence_delete_data(char* dbPath, char* key, const char* resource_id, Pe } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("deleteData - Plugin not available, unknown loading type: "), + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("deleteData - Plugin not available, unknown loading type: "), DLT_INT(getCustomLoadingType(idx))); ret = EPERS_COMMON; } @@ -659,9 +654,6 @@ int persistence_notify_on_change(const char* key, unsigned int ldbid, unsigned i - - - int pers_send_Notification_Signal(const char* key, PersistenceDbContext_s* context, pclNotifyStatus_e reason) { int rval = 1; diff --git a/src/persistence_client_library_dbus_cmd.c b/src/persistence_client_library_dbus_cmd.c index 66c6d2c..06c5a6d 100644 --- a/src/persistence_client_library_dbus_cmd.c +++ b/src/persistence_client_library_dbus_cmd.c @@ -41,7 +41,7 @@ #include <dlfcn.h> // function prototype -void msg_pending_func(DBusPendingCall *call, void *data); +static void msg_pending_func(DBusPendingCall *call, void *data); @@ -180,7 +180,7 @@ void process_prepare_shutdown(int complete) { int i = 0, rval = 0; - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("prepShtdwn - writing all changed data / closing all handles")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("prepShtdwn - writing all changed data / closing all handles")); // block write pers_lock_access(); @@ -454,7 +454,7 @@ void msg_pending_func(DBusPendingCall *call, void *data) } else { - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("msg_pending_func ==> UNlock mutex") ); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("msg_pending_func ==> UNlock mutex") ); dbus_message_get_args(message, &err, DBUS_TYPE_INT32, &replyArg, DBUS_TYPE_INVALID); } diff --git a/src/persistence_client_library_dbus_service.c b/src/persistence_client_library_dbus_service.c index 8081758..76abc18 100644 --- a/src/persistence_client_library_dbus_service.c +++ b/src/persistence_client_library_dbus_service.c @@ -96,7 +96,7 @@ static void unregisterMessageHandler(DBusConnection *connection, void *user_data { (void)connection; (void)user_data; - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("unregisterObjectPath\n")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("unregisterObjectPath\n")); } @@ -239,7 +239,7 @@ static void unregisterObjectPathFallback(DBusConnection *connection, void *user { (void)connection; (void)user_data; - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("unregObjPathFback")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("unregObjPathFback")); } @@ -286,7 +286,7 @@ static void removeWatch(DBusWatch *watch, void *data) (void)data; - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("removeWatch called "), DLT_INT( (int)watch) ); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("removeWatch called "), DLT_INT( (int)watch) ); if(w_data) free(w_data); @@ -299,7 +299,7 @@ static void removeWatch(DBusWatch *watch, void *data) static void watchToggled(DBusWatch *watch, void *data) { (void)data; - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("watchToggled called "), DLT_INT( (int)watch) ); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("watchToggled called "), DLT_INT( (int)watch) ); if(dbus_watch_get_enabled(watch)) addWatch(watch, data); @@ -389,7 +389,7 @@ static void timeoutToggled(DBusTimeout *timeout, void *data) (void)data; while ((0<i--)&&(timeout!=gPollInfo.objects[i].timeout)); - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("timeoutToggled") ); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("timeoutToggled") ); if (0<i) { const int interval = (TRUE==dbus_timeout_get_enabled(timeout))?dbus_timeout_get_interval(timeout):0; @@ -414,7 +414,7 @@ int setup_dbus_mainloop(void) if(pAddress != NULL) // Connect to the bus and check for errors { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("setupMainLoop - specific dbus address:"), DLT_STRING(pAddress) ); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("setupMainLoop - specific dbus address:"), DLT_STRING(pAddress) ); conn = dbus_connection_open_private(pAddress, &err); @@ -436,7 +436,7 @@ int setup_dbus_mainloop(void) } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("setupMainLoop - Use def bus (DBUS_BUS_SYSTEM)")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("setupMainLoop - Use def bus (DBUS_BUS_SYSTEM)")); conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err); } @@ -531,7 +531,7 @@ int dispatchInternalCommand(DBusConnection* conn, MainLoopData_u* readData, int* { int rval = 1; - //DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("mainLoop - receive cmd:"), DLT_INT(readData.message.cmd)); + //DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("mainLoop - receive cmd:"), DLT_INT(readData.message.cmd)); switch (readData->message.cmd) { case CMD_PAS_BLOCK_AND_WRITE_BACK: diff --git a/src/persistence_client_library_file.c b/src/persistence_client_library_file.c index 5765e09..b6312a4 100644 --- a/src/persistence_client_library_file.c +++ b/src/persistence_client_library_file.c @@ -40,7 +40,7 @@ static int pclFileGetDefaultData(int handle, const char* resource_id, int policy); static int pclFileOpenDefaultData(PersistenceInfo_s* dbContext, const char* resource_id); static int pclFileOpenRegular(PersistenceInfo_s* dbContext, const char* resource_id, - char* dbKey, char* dbPath, int shared_DB, unsigned int user_no, unsigned int seat_no); + char* dbKey, char* dbPath, int shared_DB, unsigned int user_no, unsigned int seat_no); extern int doAppcheck(void); @@ -72,7 +72,7 @@ int pclFileClose(int fd) { int rval = EPERS_NOT_INITIALIZED; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileClose fd: "), DLT_INT(fd)); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileClose fd: "), DLT_INT(fd)); if(__sync_add_and_fetch(&gPclInitCounter, 0) > 0) { @@ -178,7 +178,7 @@ void* pclFileMapData(void* addr, long size, long offset, int fd) (void)fd; DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("fileMapData not supported when using file cache")); #else - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileMapData fd: "), DLT_INT(fd)); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileMapData fd: "), DLT_INT(fd)); if(__sync_add_and_fetch(&gPclInitCounter, 0) > 0) { @@ -241,9 +241,9 @@ int pclFileOpenRegular(PersistenceInfo_s* dbContext, const char* resource_id, ch else { if(dbContext->configKey.permission == PersistencePermission_ReadOnly) - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("fileOpen: NoBackup - file RONLY!"), DLT_STRING(dbKey)); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("fileOpen: NoBackup - file RONLY!"), DLT_STRING(dbKey)); else - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("fileOpen: NoBackup - file in blacklist!"), DLT_STRING(dbKey)); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("fileOpen: NoBackup - file in blacklist!"), DLT_STRING(dbKey)); } #if USE_FILECACHE @@ -390,7 +390,7 @@ int pclFileOpen(unsigned int ldbid, const char* resource_id, unsigned int user_n char dbKey[DbKeyMaxLen] = {0}; // database key char dbPath[DbPathMaxLen] = {0}; // database location - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileOpen: "), DLT_INT(ldbid), DLT_STRING(resource_id) ); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileOpen: "), DLT_INT(ldbid), DLT_STRING(resource_id) ); dbContext.context.ldbid = ldbid; dbContext.context.seat_no = seat_no; @@ -427,7 +427,7 @@ int pclFileReadData(int fd, void * buffer, int buffer_size) { int readSize = EPERS_NOT_INITIALIZED; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileReadData fd: "), DLT_INT(fd)); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileReadData fd: "), DLT_INT(fd)); if(__sync_add_and_fetch(&gPclInitCounter, 0) > 0) { #if USE_FILECACHE @@ -452,7 +452,7 @@ int pclFileRemove(unsigned int ldbid, const char* resource_id, unsigned int user { int rval = EPERS_NOT_INITIALIZED; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileReadData "), DLT_INT(ldbid), DLT_STRING(resource_id)); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileReadData "), DLT_INT(ldbid), DLT_STRING(resource_id)); if(__sync_add_and_fetch(&gPclInitCounter, 0) > 0) { @@ -500,7 +500,7 @@ int pclFileSeek(int fd, long int offset, int whence) { int rval = EPERS_NOT_INITIALIZED; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileSeek fd:"), DLT_INT(fd)); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileSeek fd:"), DLT_INT(fd)); if(__sync_add_and_fetch(&gPclInitCounter, 0) > 0) { @@ -533,7 +533,7 @@ int pclFileUnmapData(void* address, long size) { int rval = EPERS_NOT_INITIALIZED; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileUnmapData")); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileUnmapData")); if(__sync_add_and_fetch(&gPclInitCounter, 0) > 0) { @@ -555,7 +555,7 @@ int pclFileWriteData(int fd, const void * buffer, int buffer_size) { int size = EPERS_NOT_INITIALIZED; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileWriteData fd:"), DLT_INT(fd)); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileWriteData fd:"), DLT_INT(fd)); if(__sync_add_and_fetch(&gPclInitCounter, 0) > 0) { @@ -601,7 +601,7 @@ int pclFileWriteData(int fd, const void * buffer, int buffer_size) } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("fileWriteData - Failed write ==> read only file!"), DLT_STRING(get_file_backup_path(fd))); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("fileWriteData - Failed write ==> read only file!"), DLT_STRING(get_file_backup_path(fd))); size = EPERS_RESOURCE_READ_ONLY; } } @@ -634,7 +634,7 @@ int pclFileCreatePath(unsigned int ldbid, const char* resource_id, unsigned int char backupPath[DbPathMaxLen] = {0}; // backup file char csumPath[DbPathMaxLen] = {0}; // checksum file - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileOpen: "), DLT_INT(ldbid), DLT_STRING(resource_id) ); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileOpen: "), DLT_INT(ldbid), DLT_STRING(resource_id) ); dbContext.context.ldbid = ldbid; dbContext.context.seat_no = seat_no; @@ -668,7 +668,7 @@ int pclFileCreatePath(unsigned int ldbid, const char* resource_id, unsigned int } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("fileCreatePath - No Backup, read only OR in blacklist!"), DLT_STRING(dbKey)); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("fileCreatePath - No Backup, read only OR in blacklist!"), DLT_STRING(dbKey)); } handle = get_persistence_handle_idx(); @@ -772,7 +772,7 @@ int pclFileReleasePath(int pathHandle) { int rval = EPERS_NOT_INITIALIZED; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileClose fd: "), DLT_INT(fd)); + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclFileClose fd: "), DLT_INT(fd)); if(__sync_add_and_fetch(&gPclInitCounter, 0) > 0) { diff --git a/src/persistence_client_library_key.c b/src/persistence_client_library_key.c index bd766f6..5a30519 100644 --- a/src/persistence_client_library_key.c +++ b/src/persistence_client_library_key.c @@ -205,7 +205,7 @@ int pclKeyHandleReadData(int key_handle, unsigned char* buffer, int buffer_size) int pclKeyHandleRegisterNotifyOnChange(int key_handle, pclChangeNotifyCallback_t callback) { int rval = EPERS_COMMON; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclKeyHandleRegisterNotifyOnChange: "), + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclKeyHandleRegisterNotifyOnChange: "), // DLT_INT(gKeyHandleArray[key_handle].info.context.ldbid), DLT_STRING(gKeyHandleArray[key_handle].resourceID) ); if((gChangeNotifyCallback == callback) || (gChangeNotifyCallback == NULL)) { @@ -544,7 +544,7 @@ int pclKeyUnRegisterNotifyOnChange( unsigned int ldbid, const char * resource_ int pclKeyRegisterNotifyOnChange(unsigned int ldbid, const char* resource_id, unsigned int user_no, unsigned int seat_no, pclChangeNotifyCallback_t callback) { int rval = EPERS_COMMON; - //DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("pclKeyRegisterNotifyOnChange: "), + //DLT_LOG(gDLTContext, DLT_LOG_DEBUG, DLT_STRING("pclKeyRegisterNotifyOnChange: "), // DLT_INT(ldbid), DLT_STRING(resource_id) ); if((gChangeNotifyCallback == callback) || (gChangeNotifyCallback == NULL)) { diff --git a/src/persistence_client_library_lc_interface.c b/src/persistence_client_library_lc_interface.c index c81a44d..19942f2 100644 --- a/src/persistence_client_library_lc_interface.c +++ b/src/persistence_client_library_lc_interface.c @@ -122,7 +122,7 @@ DBusHandlerResult checkLifecycleMsg(DBusConnection * connection, DBusMessage * m if((0==strncmp(gDbusLcConsterface, dbus_message_get_interface(message), 46))) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("chLcMsg - Received dbus msg: "), DLT_STRING(dbus_message_get_member(message))); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("chLcMsg - Received dbus msg: "), DLT_STRING(dbus_message_get_member(message))); if((0==strncmp(gDbusLcConsMsg, dbus_message_get_member(message), 16))) { result = msg_lifecycleRequest(connection, message); diff --git a/src/persistence_client_library_pas_interface.c b/src/persistence_client_library_pas_interface.c index 284346d..b60418b 100644 --- a/src/persistence_client_library_pas_interface.c +++ b/src/persistence_client_library_pas_interface.c @@ -60,7 +60,7 @@ int check_pas_request(unsigned int request, unsigned int requestID) data.message.params[1] = requestID; data.message.string[0] = '\0'; // no string parameter, set to 0 - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("chkPasReq - case PasMsg_Block o. PasMsg_WriteBack")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("chkPasReq - case PasMsg_Block o. PasMsg_WriteBack")); if(-1 == deliverToMainloop_NM(&data)) { DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("write failed w/ errno "), DLT_INT(errno), DLT_STRING(strerror(errno))); @@ -74,7 +74,7 @@ int check_pas_request(unsigned int request, unsigned int requestID) } case PasMsg_Unblock: { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("chkPasReq - case PasMsg_Unblock")); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("chkPasReq - case PasMsg_Unblock")); pers_unlock_access(); rval = PasErrorStatus_OK; break; @@ -206,7 +206,7 @@ DBusHandlerResult checkPersAdminMsg(DBusConnection * connection, DBusMessage * m if((0==strcmp(gDbusPersAdminConsInterface, dbus_message_get_interface(message)))) { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("checkPasMsg - Received dbus msg: "), DLT_STRING(dbus_message_get_member(message))); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("checkPasMsg - Received dbus msg: "), DLT_STRING(dbus_message_get_member(message))); if((0==strcmp(gDbusPersAdminConsMsg, dbus_message_get_member(message)))) { diff --git a/src/persistence_client_library_prct_access.c b/src/persistence_client_library_prct_access.c index ebf2305..44c9a8d 100644 --- a/src/persistence_client_library_prct_access.c +++ b/src/persistence_client_library_prct_access.c @@ -207,7 +207,7 @@ int get_db_context(PersistenceInfo_s* dbContext, const char* resource_id, unsign memcpy(dbContext->configKey.reponsible, "default", strlen("default")); memcpy(dbContext->configKey.custom_name, "default", strlen("default")); - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("gDBCtx - create res not in PRCT => key:"), DLT_STRING(resource_id) ); + DLT_LOG(gPclDLTContext, DLT_LOG_DEBUG, DLT_STRING("gDBCtx - create res not in PRCT => key:"), DLT_STRING(resource_id) ); rval = get_db_path_and_key(dbContext, resource_id, dbKey, dbPath); } |