diff options
| author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-11-10 13:42:57 +0100 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-11-10 13:42:57 +0100 |
| commit | 3fcd7400a003a3f694f1638a31e3a9fe6cf1595a (patch) | |
| tree | 48eed7f9f0387413d1bd63d7f691ae4d15e3a887 /src/system | |
| parent | d5d9ba55d97d872564e7e271f7ee6c73ec54031b (diff) | |
| download | DLT-daemon-3fcd7400a003a3f694f1638a31e3a9fe6cf1595a.tar.gz | |
Reverted old FIFO functions. Still SHM enabled by default.
Diffstat (limited to 'src/system')
| -rw-r--r-- | src/system/dlt-system-log.c | 2 | ||||
| -rwxr-xr-x | src/system/dlt-system.c | 2 | ||||
| -rw-r--r-- | src/system/dlt-system.conf | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/system/dlt-system-log.c b/src/system/dlt-system-log.c index cf2b495..6a76221 100644 --- a/src/system/dlt-system-log.c +++ b/src/system/dlt-system-log.c @@ -181,9 +181,11 @@ void dlt_system_filetransfer_run(DltSystemOptions *options,DltSystemRuntime *run printf("Error: dlt_user_log_file_data\n"); return; } +#ifdef DLT_SHM_ENABLE /* wait sending next package if more than 50% of buffer used */ dlt_user_check_buffer(&total_size, &used_size); if((total_size - used_size) < (total_size/2)) +#endif break; } if(runtime->filetransferLastSentPackage==runtime->filetransferCountPackages) { diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c index 2040aab..c2df24c 100755 --- a/src/system/dlt-system.c +++ b/src/system/dlt-system.c @@ -630,7 +630,7 @@ int main(int argc, char* argv[]) /* Wait up to one second. */ tv.tv_sec = 0; if(runtime.filetransferRunning) - tv.tv_usec = 10000; + tv.tv_usec = 20000; else tv.tv_usec = (dlt_uptime()-lasttime+10000)*100; diff --git a/src/system/dlt-system.conf b/src/system/dlt-system.conf index 1811fc3..235f00e 100644 --- a/src/system/dlt-system.conf +++ b/src/system/dlt-system.conf @@ -38,11 +38,11 @@ FiletransferContextId = FILE # Time after startup of dlt-system when first file is transfered (Default: 30) # Time in seconds -FiletransferTimeStartup = 30 +FiletransferTimeStartup = 10 # Time to wait when transfered file is deleted and next file transfer starts (Default: 10) # Time in seconds -FiletransferTimeDelay = 10 +FiletransferTimeDelay = 3 ######################################################################## # Log short files, expecially from proc filesystem |