diff options
Diffstat (limited to 'src/shared')
-rwxr-xr-x | src/shared/dlt_common.c | 58 | ||||
-rwxr-xr-x | src/shared/dlt_common_cfg.h | 2 | ||||
-rw-r--r-- | src/shared/dlt_offline_trace.c | 38 | ||||
-rw-r--r-- | src/shared/dlt_shm.c | 22 |
4 files changed, 60 insertions, 60 deletions
diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 1fa2766..98852fd 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -89,7 +89,7 @@ int dlt_buffer_reset(DltBuffer *buf); int dlt_buffer_increase_size(DltBuffer *buf); int dlt_buffer_minimize_size(DltBuffer *buf); void dlt_buffer_write_block(DltBuffer *buf,int *write, const unsigned char *data,unsigned int size); -void dlt_buffer_read_block(DltBuffer *buf,int *read,unsigned char *data,unsigned int size); +void dlt_buffer_read_block(DltBuffer *buf,int *read,unsigned char *data,unsigned int size); void dlt_print_hex(uint8_t *ptr,int size) { @@ -561,7 +561,7 @@ int dlt_filter_find(DltFilter *filter,const char *apid,const char *ctid, int ver /* apid matches, now check for ctid */ if (ctid==0) { - /* check if empty ctid matches */ + /* check if empty ctid matches */ //if (memcmp(filter->ctid[num],"",DLT_ID_SIZE)==0)//coverity complains here about Out-of-bounds access. char empty_ctid[DLT_ID_SIZE]=""; if (memcmp(filter->ctid[num],empty_ctid,DLT_ID_SIZE)==0) @@ -1986,7 +1986,7 @@ void dlt_log_set_filename(const char *filename) void dlt_log_init(int mode) { logging_mode = mode; - + if(logging_mode == DLT_LOG_TO_FILE) { /* internal logging to file */ @@ -2278,7 +2278,7 @@ int dlt_buffer_init_static_server(DltBuffer *buf, const unsigned char *ptr, uint buf->min_size = size; buf->max_size = size; buf->step_size = 0; - + // Init pointers head = (DltBufferHead*)buf->shm; head->read = 0; @@ -2289,7 +2289,7 @@ int dlt_buffer_init_static_server(DltBuffer *buf, const unsigned char *ptr, uint // clear memory memset(buf->mem,0,buf->size); - + snprintf(str,sizeof(str),"Buffer: Size %d\n",buf->size); dlt_log(LOG_DEBUG, str); @@ -2305,7 +2305,7 @@ int dlt_buffer_init_static_client(DltBuffer *buf, const unsigned char *ptr, uint buf->min_size = size; buf->max_size = size; buf->step_size = 0; - + // Init pointers buf->mem = (unsigned char *)(buf->shm + sizeof(DltBufferHead)); buf->size = buf->min_size - sizeof(DltBufferHead); @@ -2341,7 +2341,7 @@ int dlt_buffer_init_dynamic(DltBuffer *buf, uint32_t min_size, uint32_t max_size dlt_log(LOG_EMERG, str); return -1; } - + // Init pointers head = (DltBufferHead*)buf->shm; head->read = 0; @@ -2352,7 +2352,7 @@ int dlt_buffer_init_dynamic(DltBuffer *buf, uint32_t min_size, uint32_t max_size // clear memory memset(buf->mem,0,buf->size); - + //snprintf(str,sizeof(str),"Buffer: Size %d bytes\n",buf->size); //dlt_log(LOG_INFO, str); @@ -2509,14 +2509,14 @@ int dlt_buffer_minimize_size(DltBuffer *buf) /* free old data */ free(buf->shm); - + /* update data */ buf->shm = new_ptr; buf->mem = new_ptr+sizeof(DltBufferHead); buf->size = buf->min_size - sizeof(DltBufferHead); - /* reset pointers and counters */ - ((int*)(buf->shm))[0] = 0; // pointer to write memory + /* reset pointers and counters */ + ((int*)(buf->shm))[0] = 0; // pointer to write memory ((int*)(buf->shm))[1] = 0; // pointer to read memory ((int*)(buf->shm))[2] = 0; // number of packets @@ -2537,7 +2537,7 @@ int dlt_buffer_reset(DltBuffer *buf) dlt_log(LOG_WARNING,"Buffer: Buffer reset triggered.\n"); /* reset pointers and counters */ - ((int*)(buf->shm))[0] = 0; // pointer to write memory + ((int*)(buf->shm))[0] = 0; // pointer to write memory ((int*)(buf->shm))[1] = 0; // pointer to read memory ((int*)(buf->shm))[2] = 0; // number of packets @@ -2578,17 +2578,17 @@ int dlt_buffer_push3(DltBuffer *buf,const unsigned char *data1,unsigned int size { dlt_log(LOG_ERR,"Buffer: Pointer out of range\n"); dlt_buffer_reset(buf); - return -1; // ERROR + return -1; // ERROR } // calculate free size if(read>write) free_size = read - write; else if(count && (write == read)) - free_size = 0; + free_size = 0; else free_size = buf->size - write + read; - + // check size if(free_size < (int)(sizeof(DltBufferBlockHead)+size1+size2+size3)) { // try to increase size if possible @@ -2649,7 +2649,7 @@ int dlt_buffer_get(DltBuffer *buf,unsigned char *data, int max_size,int delete) { dlt_log(LOG_ERR,"Buffer: Pointer out of range\n"); dlt_buffer_reset(buf); - return -1; // ERROR + return -1; // ERROR } // check if data is in there @@ -2659,13 +2659,13 @@ int dlt_buffer_get(DltBuffer *buf,unsigned char *data, int max_size,int delete) dlt_log(LOG_ERR,"Buffer: SHM should be empty, but is not\n"); dlt_buffer_reset(buf); } - return -1; // ERROR + return -1; // ERROR } // calculate used size if(write>read) used_size = write - read; - else + else used_size = buf->size - read + write; // first check size @@ -2713,29 +2713,29 @@ int dlt_buffer_get(DltBuffer *buf,unsigned char *data, int max_size,int delete) if(delete) { // update buffer pointers - ((int*)(buf->shm))[1] = read; // set new read pointer + ((int*)(buf->shm))[1] = read; // set new read pointer } } else { if(delete) { if( (read+head.size) <= buf->size) - ((int*)(buf->shm))[1] = read+head.size; // set new read pointer + ((int*)(buf->shm))[1] = read+head.size; // set new read pointer else - ((int*)(buf->shm))[1] = read+head.size-buf->size; // set new read pointer + ((int*)(buf->shm))[1] = read+head.size-buf->size; // set new read pointer } } if(delete) { ((int*)(buf->shm))[2] -= 1; // decrease counter - + if(((int*)(buf->shm))[2] == 0) { // try to minimize size dlt_buffer_minimize_size(buf); } } - - return head.size; // OK + + return head.size; // OK } int dlt_buffer_pull(DltBuffer *buf,unsigned char *data, int max_size) @@ -2767,7 +2767,7 @@ void dlt_buffer_info(DltBuffer *buf) dlt_log(LOG_DEBUG, str); snprintf(str,sizeof(str),"Buffer: Buffer start address: %lX\n",(unsigned long)buf->mem); dlt_log(LOG_DEBUG, str); - + } void dlt_buffer_status(DltBuffer *buf) @@ -2822,11 +2822,11 @@ int dlt_buffer_get_used_size(DltBuffer *buf) if(count == 0) return 0; - + if(write>read) return (write - read); - - return (buf->size - read + write); + + return (buf->size - read + write); } int dlt_buffer_get_message_count(DltBuffer *buf) @@ -3119,7 +3119,7 @@ uint32_t dlt_uptime(void) struct timespec ts; if (clock_gettime(CLOCK_MONOTONIC,&ts)==0) - { + { return ( (uint32_t)ts.tv_sec*10000 + (uint32_t)ts.tv_nsec/100000 );// in 0.1 ms = 100 us } else diff --git a/src/shared/dlt_common_cfg.h b/src/shared/dlt_common_cfg.h index 7a34850..2278049 100755 --- a/src/shared/dlt_common_cfg.h +++ b/src/shared/dlt_common_cfg.h @@ -88,7 +88,7 @@ /* Number of indices to be allocated at one, if no more indeces are left */ #define DLT_COMMON_INDEX_ALLOC 1000 -/* If limited output is called, +/* If limited output is called, this is the maximum number of characters to be printed out */ #define DLT_COMMON_ASCII_LIMIT_MAX_CHARS 20 diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c index 404b4f1..9925a7a 100644 --- a/src/shared/dlt_offline_trace.c +++ b/src/shared/dlt_offline_trace.c @@ -62,7 +62,7 @@ #include <fcntl.h> #include <unistd.h> #include <dirent.h> - + #include <dlt_offline_trace.h> int dlt_offline_trace_create_new_file(DltOfflineTrace *trace) { @@ -90,7 +90,7 @@ int dlt_offline_trace_create_new_file(DltOfflineTrace *trace) { return -1; } /* if */ - return 0; /* OK */ + return 0; /* OK */ } unsigned long dlt_offline_trace_get_total_size(DltOfflineTrace *trace) { @@ -125,9 +125,9 @@ unsigned long dlt_offline_trace_get_total_size(DltOfflineTrace *trace) { } closedir(dir); - + /* return size */ - return size; + return size; } int dlt_offline_trace_delete_oldest_file(DltOfflineTrace *trace) { @@ -164,9 +164,9 @@ int dlt_offline_trace_delete_oldest_file(DltOfflineTrace *trace) { printf("Old offline trace file %s cannot be stat-ed",filename); } } - } + } closedir(dir); - + /* delete file */ if(filename_oldest[0]) { if(remove(filename_oldest)) { @@ -178,13 +178,13 @@ int dlt_offline_trace_delete_oldest_file(DltOfflineTrace *trace) { printf("No file to be removed!\n"); return -1; /* ERROR */ } - + /* return size of deleted file*/ - return size_oldest; + return size_oldest; } int dlt_offline_trace_check_size(DltOfflineTrace *trace) { - + /* check size of complete offline trace */ while((int)dlt_offline_trace_get_total_size(trace) > (trace->maxSize-trace->fileSize)) { @@ -193,10 +193,10 @@ int dlt_offline_trace_check_size(DltOfflineTrace *trace) { return -1; } } - - return 0; /* OK */ + + return 0; /* OK */ } - + int dlt_offline_trace_init(DltOfflineTrace *trace,const char *directory,int fileSize,int maxSize) { /* init parameters */ @@ -222,31 +222,31 @@ int dlt_offline_trace_write(DltOfflineTrace *trace,unsigned char *data1,int size /* close old file */ close(trace->ohandle); trace->ohandle = -1; - + /* check complete offline trace size, remove old logs if needed */ dlt_offline_trace_check_size(trace); - + /* create new file */ dlt_offline_trace_create_new_file(trace); } - + /* write data into log file */ if(data1 && (trace->ohandle >= 0)) { if(write(trace->ohandle,data1,size1)!=size1) { printf("Offline trace write failed!\n"); - return -1; + return -1; } } if(data2 && (trace->ohandle >= 0)) { if(write(trace->ohandle,data2,size2)!=size2) { printf("Offline trace write failed!\n"); - return -1; + return -1; } } if(data3 && (trace->ohandle >= 0)) { if(write(trace->ohandle,data3,size3)!=size3) { printf("Offline trace write failed!\n"); - return -1; + return -1; } } @@ -257,7 +257,7 @@ int dlt_offline_trace_free(DltOfflineTrace *trace) { if(trace->ohandle <= 0) return -1; - + /* close last used log file */ close(trace->ohandle); diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c index 3286057..d188e2d 100644 --- a/src/shared/dlt_shm.c +++ b/src/shared/dlt_shm.c @@ -87,10 +87,10 @@ void dlt_shm_print_hex(char *ptr,int size) void dlt_shm_pv(int id,int operation) { static struct sembuf semaphor; - + semaphor.sem_op = operation; semaphor.sem_flg = SEM_UNDO; - + if(semop(id, &semaphor,1) == -1) { dlt_log(LOG_WARNING,"SHM: semop() failed"); } @@ -115,14 +115,14 @@ int dlt_shm_init_server(DltShm *buf,int key,int size) { { dlt_log(LOG_WARNING,"SHM: shmctl() failed"); return -1; /* ERROR */ - } + } // Now we attach the segment to our data space. if ((ptr = shmat(buf->shmid, NULL, 0)) == (unsigned char *) -1) { dlt_log(LOG_WARNING,"SHM: shmat() failed"); return -1; /* ERROR */ } - + // Init semaphore if( (buf->semid = semget(DLT_SHM_SEM,1,S_IRWXU|S_IRWXG|S_IRWXO|IPC_CREAT|IPC_EXCL)) == -1 ) { if( (buf->semid = semget(DLT_SHM_SEM,1,S_IRWXU|S_IRWXG|S_IRWXO|IPC_EXCL)) == -1 ) { @@ -134,7 +134,7 @@ int dlt_shm_init_server(DltShm *buf,int key,int size) { dlt_log(LOG_WARNING,"SHM: semctl() failed"); return -1; /* ERROR */ } - + // init buffer dlt_buffer_init_static_server(&(buf->buffer),ptr,shm_buf.shm_segsz); @@ -160,14 +160,14 @@ int dlt_shm_init_client(DltShm *buf,int key) { { dlt_log(LOG_WARNING,"SHM: shmctl() failed"); return -1; /* ERROR */ - } + } // Now we attach the segment to our data space. if ((ptr = shmat(buf->shmid, NULL, 0)) == (unsigned char *) -1) { dlt_log(LOG_WARNING,"shmat() failed"); return -1; /* ERROR */ } - + // Init semaphore if( (buf->semid = semget(DLT_SHM_SEM,0,0)) == -1 ) { dlt_log(LOG_WARNING,"SHM: semget() failed"); @@ -176,7 +176,7 @@ int dlt_shm_init_client(DltShm *buf,int key) { // init buffer dlt_buffer_init_static_client(&(buf->buffer),ptr,shm_buf.shm_segsz); - + return 0; /* OK */ } @@ -276,7 +276,7 @@ int dlt_shm_remove(DltShm *buf) } int dlt_shm_free_server(DltShm *buf) { - + if(shmdt(buf->buffer.shm)) { dlt_log(LOG_WARNING,"SHM: shmdt() failed"); return -1; /* ERROR */ @@ -297,7 +297,7 @@ int dlt_shm_free_server(DltShm *buf) { buf->semid = 0; return dlt_buffer_free_static(&(buf->buffer)); - + } int dlt_shm_free_client(DltShm *buf) { @@ -310,6 +310,6 @@ int dlt_shm_free_client(DltShm *buf) { // Reset parameters buf->shmid = 0; buf->semid = 0; - + return dlt_buffer_free_static(&(buf->buffer)); } |