diff options
Diffstat (limited to 'src/lib')
-rwxr-xr-x | src/lib/dlt_client_cfg.h | 4 | ||||
-rw-r--r-- | src/lib/dlt_filetransfer.c | 56 | ||||
-rw-r--r-- | src/lib/dlt_user.c | 52 | ||||
-rwxr-xr-x | src/lib/dlt_user_cfg.h | 8 |
4 files changed, 60 insertions, 60 deletions
diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h index b611681..c2592e6 100755 --- a/src/lib/dlt_client_cfg.h +++ b/src/lib/dlt_client_cfg.h @@ -80,10 +80,10 @@ #define DLT_CLIENT_DUMMY_CON_ID "CC1" /* Size of buffer */ -#define DLT_CLIENT_TEXTBUFSIZE 512 +#define DLT_CLIENT_TEXTBUFSIZE 512 /* Size of receive buffer */ -#define DLT_CLIENT_RCVBUFSIZE 10024 +#define DLT_CLIENT_RCVBUFSIZE 10024 /* Initial baudrate */ #if !defined (__WIN32__) && !defined(_MSC_VER) diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c index 9b1996f..8dc6e8f 100644 --- a/src/lib/dlt_filetransfer.c +++ b/src/lib/dlt_filetransfer.c @@ -180,7 +180,7 @@ char* getFileCreationDate2(const char* file,int *ok){ */ int isFile (const char* file) { - struct stat st; + struct stat st; return (stat (file, &st) == 0); } @@ -216,7 +216,7 @@ int checkUserBufferForFreeSpace() * @return If the file is successfully deleted, a zero value is returned.If the file can not be deleted a nonzero value is returned. */ int doRemoveFile(const char*filename){ - return remove( filename); + return remove( filename); } void dlt_user_log_file_errorMessage(DltContext *fileContext, const char *filename, int errorCode){ @@ -247,7 +247,7 @@ void dlt_user_log_file_errorMessage(DltContext *fileContext, const char *filenam DLT_INT(package_count), DLT_UINT(BUFFER_SIZE), DLT_STRING("FLER") - ); + ); } else { DLT_LOG(*fileContext,DLT_LOG_ERROR, DLT_STRING("FLER"), @@ -268,7 +268,7 @@ void dlt_user_log_file_errorMessage(DltContext *fileContext, const char *filenam * @return Returns 0 if everything was okey.If there was a failure a value < 0 will be returned. */ int dlt_user_log_file_infoAbout(DltContext *fileContext, const char *filename){ - + if(isFile(filename)) { int ok; @@ -307,7 +307,7 @@ int dlt_user_log_file_infoAbout(DltContext *fileContext, const char *filename){ * In the next step some generic informations about the file will be logged to dlt. * Now the header will be logged to dlt. See the method dlt_user_log_file_header for more informations. * Then the method dlt_user_log_data will be called with the parameter to log all packages in a loop with some timeout. - * At last dlt_user_log_end is called to signal that the complete file transfer was okey. This is important for the plugin of the dlt viewer. + * At last dlt_user_log_end is called to signal that the complete file transfer was okey. This is important for the plugin of the dlt viewer. * @param fileContext Specific context to log the file to dlt * @param filename Absolute file path * @param deleteFlag Flag if the file will be deleted after transfer. 1->delete, 0->notDelete @@ -315,28 +315,28 @@ int dlt_user_log_file_infoAbout(DltContext *fileContext, const char *filename){ * @return Returns 0 if everything was okey. If there was a failure a value < 0 will be returned. */ int dlt_user_log_file_complete(DltContext *fileContext, const char *filename, int deleteFlag, int timeout) -{ +{ if(!isFile(filename)) { dlt_user_log_file_errorMessage(fileContext,filename, DLT_FILETRANSFER_ERROR_FILE_COMPLETE); return DLT_FILETRANSFER_ERROR_FILE_COMPLETE; } - + if(dlt_user_log_file_header(fileContext,filename) != 0) { return DLT_FILETRANSFER_ERROR_FILE_COMPLETE1; } - + if(dlt_user_log_file_data(fileContext, filename,DLT_FILETRANSFER_TRANSFER_ALL_PACKAGES,timeout) != 0) { return DLT_FILETRANSFER_ERROR_FILE_COMPLETE2; } - + if(dlt_user_log_file_end(fileContext,filename, deleteFlag) != 0) { return DLT_FILETRANSFER_ERROR_FILE_COMPLETE3; - } - + } + return 0; } @@ -352,7 +352,7 @@ int dlt_user_log_file_complete(DltContext *fileContext, const char *filename, in int dlt_user_log_file_packagesCount(DltContext *fileContext, const char *filename){ int packages; long filesize; - + if(isFile(filename)) { packages = 1; @@ -363,15 +363,15 @@ int dlt_user_log_file_packagesCount(DltContext *fileContext, const char *filenam return -1; } if(filesize < BUFFER_SIZE) - { + { return packages; - } - else + } + else { packages = filesize/BUFFER_SIZE; - + if(filesize%BUFFER_SIZE == 0) - { + { return packages; } else @@ -473,7 +473,7 @@ int dlt_user_log_file_header(DltContext *fileContext,const char *filename){ DLT_STRING(fcreationdate); DLT_UINT(dlt_user_log_file_packagesCount(fileContext,filename)), DLT_UINT(BUFFER_SIZE), - DLT_STRING("FLST") + DLT_STRING("FLST") ); return 0; @@ -497,17 +497,17 @@ int dlt_user_log_file_data(DltContext *fileContext,const char *filename, int pac FILE *file; int pkgNumber; long readBytes; - + if(isFile(filename)) { - + file = fopen (filename,"rb"); if (file == NULL) { dlt_user_log_file_errorMessage(fileContext,filename,DLT_FILETRANSFER_ERROR_FILE_DATA); return DLT_FILETRANSFER_ERROR_FILE_DATA; } - + if( (packageToTransfer != DLT_FILETRANSFER_TRANSFER_ALL_PACKAGES && packageToTransfer > dlt_user_log_file_packagesCount(fileContext,filename)) || packageToTransfer <= 0) { DLT_LOG(*fileContext,DLT_LOG_ERROR, @@ -524,7 +524,7 @@ int dlt_user_log_file_data(DltContext *fileContext,const char *filename, int pac } readBytes = 0; - + if(packageToTransfer != DLT_FILETRANSFER_TRANSFER_ALL_PACKAGES) { // If a single package should be transferred. The user has to check that the free space in the user buffer > 50% @@ -598,16 +598,16 @@ int dlt_user_log_file_data(DltContext *fileContext,const char *filename, int pac doTimeout(timeout); } } - + fclose(file); - + return 0; - + } else { dlt_user_log_file_errorMessage(fileContext,filename,DLT_FILETRANSFER_ERROR_FILE_DATA); return DLT_FILETRANSFER_ERROR_FILE_DATA; } - + } //!Transfer the end of the file as a dlt logs. /**The end of the file must be logged to dlt because the end contains inforamtion about the file serial number. @@ -638,14 +638,14 @@ int dlt_user_log_file_end(DltContext *fileContext,const char *filename,int delet DLT_UINT(fserial), DLT_STRING("FLFI") ); - + if(deleteFlag){ if( doRemoveFile(filename) != 0 ){ dlt_user_log_file_errorMessage(fileContext,filename,DLT_FILETRANSFER_ERROR_FILE_END); return -1; } } - + return 0; }else{ dlt_user_log_file_errorMessage(fileContext,filename,DLT_FILETRANSFER_ERROR_FILE_END); diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 1a8f274..28c7381 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -185,10 +185,10 @@ int dlt_init(void) /* create and open DLT user FIFO */ snprintf(filename,DLT_USER_MAX_FILENAME_LENGTH,"%s/dlt%d",DLT_USER_DIR,getpid()); - + /* Try to delete existing pipe, ignore result of unlink */ unlink(filename); - + ret=mkfifo(filename, S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP ); if (ret==-1) { @@ -219,8 +219,8 @@ int dlt_init(void) dlt_user.dlt_log_handle = open(DLT_USER_FIFO, O_WRONLY | O_NONBLOCK | O_CLOEXEC ); if (dlt_user.dlt_log_handle==-1) { - /* This is a normal usecase. It is OK that the daemon (and thus the FIFO /tmp/dlt) - starts later and some DLT users have already been started before. + /* This is a normal usecase. It is OK that the daemon (and thus the FIFO /tmp/dlt) + starts later and some DLT users have already been started before. Thus it is OK if the FIFO can't be opened. */ snprintf(str,DLT_USER_BUFFER_LENGTH,"FIFO %s cannot be opened. Retrying later...\n",DLT_USER_FIFO); dlt_log(LOG_INFO, str); @@ -232,16 +232,16 @@ int dlt_init(void) /* init shared memory */ if (dlt_shm_init_client(&(dlt_user.dlt_shm),DLT_SHM_KEY) < 0) { - /* This is a normal usecase. It is OK that the daemon (and thus the FIFO /tmp/dlt) - starts later and some DLT users have already been started before. + /* This is a normal usecase. It is OK that the daemon (and thus the FIFO /tmp/dlt) + starts later and some DLT users have already been started before. Thus it is OK if the FIFO can't be opened. */ snprintf(str,DLT_USER_BUFFER_LENGTH,"Shared memory %d cannot be created. Retrying later...\n",DLT_SHM_KEY); dlt_log(LOG_INFO, str); - //return 0; - } + //return 0; + } #endif } - + if (dlt_receiver_init(&(dlt_user.receiver),dlt_user.dlt_user_handle, DLT_USER_RCVBUF_MAX_SIZE)==-1) { @@ -509,7 +509,7 @@ int dlt_user_atexit_blow_out_user_buffer(void){ DLT_SEM_LOCK(); count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); DLT_SEM_FREE(); - + if (count > 0) { while(dlt_uptime() < exitTime ) @@ -528,8 +528,8 @@ int dlt_user_atexit_blow_out_user_buffer(void){ dlt_user.overflow_counter=0; } } - } - + } + if (dlt_user.dlt_log_handle != -1) { ret = dlt_user_log_resend_buffer(); @@ -1212,7 +1212,7 @@ int dlt_forward_msg(void *msgdata,size_t size) { snprintf(str,DLT_USER_BUFFER_LENGTH,"Buffer full! %u messages discarded!\n",dlt_user.overflow_counter); dlt_log(LOG_WARNING, str); - dlt_user.overflow_counter=0; + dlt_user.overflow_counter=0; } } @@ -2698,7 +2698,7 @@ int dlt_user_trace_network_segmented(DltContext *handle, DltNetworkTraceType nw_ } free(thread_data->header); free(thread_data->payload); - free(thread_data); + free(thread_data); char str[256]; snprintf(str,255,"NWTSegmented: Could not write into queue: %s \n",strerror(errno)); dlt_log(LOG_WARNING, str); @@ -3440,7 +3440,7 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, int mtype) #ifdef DLT_SHM_ENABLE if(dlt_user.dlt_log_handle!=-1) dlt_shm_push(&dlt_user.dlt_shm,msg.headerbuffer+sizeof(DltStorageHeader), msg.headersize-sizeof(DltStorageHeader), - log->buffer, log->size,0,0); + log->buffer, log->size,0,0); /* log to FIFO */ ret = dlt_user_log_out3(dlt_user.dlt_log_handle, @@ -3463,10 +3463,10 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, int mtype) ret = dlt_user_log_out3(dlt_user.dlt_log_handle, &(userheader), sizeof(DltUserHeader), msg.headerbuffer+sizeof(DltStorageHeader), msg.headersize-sizeof(DltStorageHeader), - log->buffer, log->size); -#endif + log->buffer, log->size); +#endif } - + /* store message in ringbuffer, if an error has occured */ if (ret!=DLT_RETURN_OK) { @@ -4146,7 +4146,7 @@ int dlt_user_log_resend_buffer(void) int num,count; int size; DltReturnValue ret; - + /* Send content of ringbuffer */ DLT_SEM_LOCK(); count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); @@ -4160,7 +4160,7 @@ int dlt_user_log_resend_buffer(void) if (size>0) { -#ifdef DLT_SHM_ENABLE +#ifdef DLT_SHM_ENABLE dlt_shm_push(&dlt_user.dlt_shm,dlt_user.resend_buffer+sizeof(DltUserHeader),size-sizeof(DltUserHeader),0,0,0,0); /* log to FIFO */ @@ -4170,21 +4170,21 @@ int dlt_user_log_resend_buffer(void) ret = dlt_user_log_out3(dlt_user.dlt_log_handle, dlt_user.resend_buffer,size,0,0,0,0); #endif - /* in case of error, keep message in ringbuffer */ + /* in case of error, keep message in ringbuffer */ if (ret==DLT_RETURN_OK) { dlt_buffer_remove(&(dlt_user.startup_buffer)); } else { - /* keep message in ringbuffer */ + /* keep message in ringbuffer */ DLT_SEM_FREE(); return -1; } } DLT_SEM_FREE(); } - + return 0; } @@ -4214,8 +4214,8 @@ void dlt_user_log_reattach_to_daemon(void) { snprintf(str,DLT_USER_BUFFER_LENGTH,"Loging disabled, Shared memory %d cannot be created!\n",DLT_SHM_KEY); dlt_log(LOG_WARNING, str); - //return 0; - } + //return 0; + } #endif dlt_log(LOG_NOTICE, "Logging (re-)enabled!\n"); @@ -4306,7 +4306,7 @@ int dlt_user_check_buffer(int *total_size, int *used_size) *total_size = dlt_buffer_get_total_size(&(dlt_user.startup_buffer)); *used_size = dlt_buffer_get_used_size(&(dlt_user.startup_buffer)); #endif - + return 0; /* ok */ } diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h index 850429e..a8f9d8d 100755 --- a/src/lib/dlt_user_cfg.h +++ b/src/lib/dlt_user_cfg.h @@ -73,9 +73,9 @@ /*************/ /* Size of receive buffer */ -#define DLT_USER_RCVBUF_MAX_SIZE 10024 +#define DLT_USER_RCVBUF_MAX_SIZE 10024 -/* Size of ring buffer */ +/* Size of ring buffer */ #define DLT_USER_RINGBUFFER_MIN_SIZE 50000 #define DLT_USER_RINGBUFFER_MAX_SIZE 500000 #define DLT_USER_RINGBUFFER_STEP_SIZE 50000 @@ -83,7 +83,7 @@ /* Temporary buffer length */ #define DLT_USER_BUFFER_LENGTH 255 -/* Number of context entries, which will be allocated, +/* Number of context entries, which will be allocated, if no more context entries are available */ #define DLT_USER_CONTEXT_ALLOC_SIZE 500 @@ -124,7 +124,7 @@ #define DLT_USER_DEFAULT_MSGID 0xffff /* delay in receiver routine in usec (100000 usec = 100ms) */ -#define DLT_USER_RECEIVE_DELAY 100000 +#define DLT_USER_RECEIVE_DELAY 100000 /* Name of environment variable for local print mode */ #define DLT_USER_ENV_LOCAL_PRINT_MODE "DLT_LOCAL_PRINT_MODE" |