diff options
Diffstat (limited to 'src/persistence_client_library_file.c')
| -rw-r--r-- | src/persistence_client_library_file.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/persistence_client_library_file.c b/src/persistence_client_library_file.c index c2c1417..8a74a85 100644 --- a/src/persistence_client_library_file.c +++ b/src/persistence_client_library_file.c @@ -173,7 +173,7 @@ void* pclFileMapData(void* addr, long size, long offset, int fd) void* ptr = 0; #if USE_FILECACHE - DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("pclFileMapData not supported when using file cache")); + 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)); @@ -235,16 +235,16 @@ int pclFileOpenRegular(PersistenceInfo_s* dbContext, const char* resource_id, ch wantBackup = 0; if((handle = pclVerifyConsistency(dbPath, backupPath, csumPath, flags)) == -1) { - DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("pclFileOpen - file inconsistent, recovery N O T possible!")); + DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("fileOpen - file inconsist, recov N O T possible!")); return -1; } } else { if(dbContext->configKey.permission == PersistencePermission_ReadOnly) - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileOpen: No Backup - file is READ ONLY!"), DLT_STRING(dbKey)); + DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("fileOpen: NoBackup - file RONLY!"), DLT_STRING(dbKey)); else - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileOpen: No Backup - file is in backup blacklist!"), DLT_STRING(dbKey)); + DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("fileOpen: NoBackup - file in blacklist!"), DLT_STRING(dbKey)); } #if USE_FILECACHE @@ -287,13 +287,13 @@ int pclFileOpenRegular(PersistenceInfo_s* dbContext, const char* resource_id, ch { if((handle = pclCreateFile(dbPath, cacheStatus)) == -1) { - DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("pclFileOpen - failed to create file: "), DLT_STRING(dbPath)); + DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("fileOpen - failed create file: "), DLT_STRING(dbPath)); } else { if(pclFileGetDefaultData(handle, resource_id, dbContext->configKey.policy) == -1) // try to get default data { - DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("pclFileOpen - no default data available: "), DLT_STRING(resource_id)); + DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("fileOpen - no def data avail: "), DLT_STRING(resource_id)); } } @@ -377,8 +377,6 @@ int pclFileOpenDefaultData(PersistenceInfo_s* dbContext, const char* resource_id // first check for c o n f i g u r a b l e default data snprintf(defaultPath, DbPathMaxLen, "%s%s/%s", pathPrefix, PERS_ORG_CONFIG_DEFAULT_DATA_FOLDER_NAME_, resource_id); - printf("The conf default path: %s\n", defaultPath); - return open(defaultPath, flags); } @@ -486,13 +484,13 @@ int pclFileRemove(unsigned int ldbid, const char* resource_id, unsigned int user rval = remove(dbPath); if(rval == -1) { - DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("pclFileRemove - remove()"), DLT_STRING(strerror(errno)) ); + DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("fileRemove - remove()"), DLT_STRING(strerror(errno)) ); } } else { rval = shared_DB; - DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("pclFileRemove - no valid database context or resource not a file")); + DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("fileRemove - no valid db context or res not a file")); } } else @@ -602,20 +600,20 @@ int pclFileWriteData(int fd, const void * buffer, int buffer_size) size = write(fd, buffer, buffer_size); if(fsync(fd) == -1) - DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("pclFileWriteData: Failed to fsync ==>!"), DLT_STRING(strerror(errno))); + DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("fileWriteData: Failed fsync ==>!"), DLT_STRING(strerror(errno))); } #else size = write(fd, buffer, buffer_size); if(get_file_cache_status(fd) == 1) { if(fsync(fd) == -1) - DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("pclFileWriteData - Failed to fsync ==>!"), DLT_STRING(strerror(errno))); + DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("fileWriteData - Failed fsync ==>!"), DLT_STRING(strerror(errno))); } #endif } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileWriteData - Failed to write ==> read only file!"), DLT_STRING(get_file_backup_path(fd))); + DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("fileWriteData - Failed write ==> read only file!"), DLT_STRING(get_file_backup_path(fd))); size = EPERS_RESOURCE_READ_ONLY; } } @@ -672,7 +670,7 @@ int pclFileCreatePath(unsigned int ldbid, const char* resource_id, unsigned int if((handle = pclVerifyConsistency(dbPath, backupPath, csumPath, flags)) == -1) { - DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("pclFileCreatePath - file inconsistent, recovery N O T possible!")); + DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("fileCreatePath - file inconsistent, recovery NOT possible!")); return -1; } // we don't need the file handle here @@ -682,7 +680,7 @@ int pclFileCreatePath(unsigned int ldbid, const char* resource_id, unsigned int } else { - DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("pclFileCreatePath - No Backup, read only OR in blacklist!"), DLT_STRING(dbKey)); + DLT_LOG(gPclDLTContext, DLT_LOG_INFO, DLT_STRING("fileCreatePath - No Backup, read only OR in blacklist!"), DLT_STRING(dbKey)); } handle = get_persistence_handle_idx(); @@ -717,13 +715,13 @@ int pclFileCreatePath(unsigned int ldbid, const char* resource_id, unsigned int if(handle == -1) { - DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("pclFileCreatePath - failed to create file: "), DLT_STRING(*path)); + DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("fileCreatePath - Err create file: "), DLT_STRING(*path)); } else { if(pclFileGetDefaultData(handle, resource_id, dbContext.configKey.policy) == -1) // try to get default data { - DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("pclFileCreatePath - no default data available: "), DLT_STRING(resource_id)); + DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("fileCreatePath - no def data avail: "), DLT_STRING(resource_id)); } close(handle); // don't need the open file } @@ -735,8 +733,8 @@ int pclFileCreatePath(unsigned int ldbid, const char* resource_id, unsigned int else { handle = EPERS_DESER_ALLOCMEM; - DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("pclFileCreatePath: malloc() failed for path:"), - DLT_STRING(dbPath), DLT_STRING("With the size:"), DLT_UINT(*size)); + DLT_LOG(gPclDLTContext, DLT_LOG_ERROR, DLT_STRING("fileCreatePath: malloc() failed for path:"), + DLT_STRING(dbPath), DLT_STRING("With size:"), DLT_UINT(*size)); } } else @@ -868,7 +866,7 @@ int pclFileGetDefaultData(int handle, const char* resource_id, int policy) } else { - DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("pclFileGetDefaultData - failed to copy file "), DLT_STRING(strerror(errno))); + DLT_LOG(gPclDLTContext, DLT_LOG_WARN, DLT_STRING("fileGetDefaultData - Err copy file "), DLT_STRING(strerror(errno))); } close(defaultHandle); |