Skip to content
Snippets Groups Projects
Commit f86c85f8 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

silent option produces newlines [Bug #8538]

parent 6dd9f96c
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,10 @@
* Using CDI library version 1.9.5
* Version 1.9.5 release
2018-06-26 Uwe Schulzweida
* silent option produces newlines [Bug #8538]
2018-06-22 Uwe Schulzweida
* Exprf: added call to vlistDefNtsteps() [Bug #8531]
......
......@@ -557,7 +557,7 @@ ProcessType::printBenchmarks(cdoTimes p_times, char *p_memstring)
#ifdef HAVE_SYS_TIMES_H
if (m_ID == 0)
{
if (!Options::silentMode) fprintf(stderr, " [%.2fs%s]\n", p_times.c_cputime, p_memstring);
fprintf(stderr, " [%.2fs%s]\n", p_times.c_cputime, p_memstring);
}
else
{
......
......@@ -417,7 +417,7 @@ extern "C"
}
static void
printEndTimes(char *p_memstring, size_t memstringLen)
getEndTimes(char *p_memstring, size_t memstringLen)
{
size_t memmax = getPeakRSS();
if (memmax)
......@@ -472,10 +472,9 @@ cdoFinish(void)
NumProcessActive--;
char memstring[32] = { "" };
if (process.m_ID == 0) getEndTimes(memstring, sizeof(memstring));
if (process.m_ID == 0) printEndTimes(memstring, sizeof(memstring));
process.printBenchmarks(times, memstring);
if (!Options::silentMode) process.printBenchmarks(times, memstring);
}
int
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment