From 12c67a271dfe528b268f59f35a3ce8ba9f09c341 Mon Sep 17 00:00:00 2001 From: sletz Date: Fri, 29 Jan 2010 19:31:55 +0000 Subject: [PATCH] Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3896 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 5 +++++ common/JackAudioAdapterInterface.cpp | 24 +++++++++++++++--------- common/JackEngineProfiling.cpp | 28 ++++++++++++++++++---------- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66aa7ae0..91292e25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ --------------------------- Dmitry Baikov +Gabriel M. Beddingfield Steven Chamberlain Thom Johansen Thibault LeMeur @@ -28,6 +29,10 @@ Mario Lang Jackdmp changes log --------------------------- +2010-01-29 Gabriel M. Beddingfield + + * Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF. + 2009-12-15 Stephane Letz * Shared memory manager was calling abort in case of fatal error, now return an error in caller. diff --git a/common/JackAudioAdapterInterface.cpp b/common/JackAudioAdapterInterface.cpp index dff17818..738363b6 100644 --- a/common/JackAudioAdapterInterface.cpp +++ b/common/JackAudioAdapterInterface.cpp @@ -68,8 +68,8 @@ namespace Jack fprintf(file, buffer); fprintf(file, "\n unset multiplot\n"); - fprintf(file, "set output 'AdapterTiming1.pdf\n"); - fprintf(file, "set terminal pdf\n"); + fprintf(file, "set output 'AdapterTiming1.svg\n"); + fprintf(file, "set terminal svg\n"); fprintf(file, "set multiplot\n"); fprintf(file, "set grid\n"); @@ -80,8 +80,10 @@ namespace Jack fprintf(file, "plot "); sprintf(buffer, "\"JackAudioAdapter.log\" using 2 title \"Consumer interrupt period\" with lines,"); fprintf(file, buffer); - sprintf(buffer, "\"JackAudioAdapter.log\" using 3 title \"Producer interrupt period\" with lines"); + sprintf(buffer, "\"JackAudioAdapter.log\" using 3 title \"Producer interrupt period\" with lines\n"); fprintf(file, buffer); + fprintf(file, "unset multiplot\n"); + fprintf(file, "unset output\n"); fclose(file); @@ -100,8 +102,8 @@ namespace Jack fprintf(file, buffer); fprintf(file, "\n unset multiplot\n"); - fprintf(file, "set output 'AdapterTiming2.pdf\n"); - fprintf(file, "set terminal pdf\n"); + fprintf(file, "set output 'AdapterTiming2.svg\n"); + fprintf(file, "set terminal svg\n"); fprintf(file, "set multiplot\n"); fprintf(file, "set grid\n"); @@ -112,8 +114,10 @@ namespace Jack fprintf(file, "plot "); sprintf(buffer, "\"JackAudioAdapter.log\" using 4 title \"Ratio 1\" with lines,"); fprintf(file, buffer); - sprintf(buffer, "\"JackAudioAdapter.log\" using 5 title \"Ratio 2\" with lines"); + sprintf(buffer, "\"JackAudioAdapter.log\" using 5 title \"Ratio 2\" with lines\n"); fprintf(file, buffer); + fprintf(file, "unset multiplot\n"); + fprintf(file, "unset output\n"); fclose(file); @@ -132,8 +136,8 @@ namespace Jack fprintf(file, buffer); fprintf(file, "\n unset multiplot\n"); - fprintf(file, "set output 'AdapterTiming3.pdf\n"); - fprintf(file, "set terminal pdf\n"); + fprintf(file, "set output 'AdapterTiming3.svg\n"); + fprintf(file, "set terminal svg\n"); fprintf(file, "set multiplot\n"); fprintf(file, "set grid\n"); @@ -144,8 +148,10 @@ namespace Jack fprintf(file, "plot "); sprintf(buffer, "\"JackAudioAdapter.log\" using 6 title \"Frames position in consumer ringbuffer\" with lines,"); fprintf(file, buffer); - sprintf(buffer, "\"JackAudioAdapter.log\" using 7 title \"Frames position in producer ringbuffer\" with lines"); + sprintf(buffer, "\"JackAudioAdapter.log\" using 7 title \"Frames position in producer ringbuffer\" with lines\n"); fprintf(file, buffer); + fprintf(file, "unset multiplot\n"); + fprintf(file, "unset output\n"); fclose(file); } diff --git a/common/JackEngineProfiling.cpp b/common/JackEngineProfiling.cpp index cfe5d636..5e329c0c 100644 --- a/common/JackEngineProfiling.cpp +++ b/common/JackEngineProfiling.cpp @@ -104,14 +104,15 @@ JackEngineProfiling::~JackEngineProfiling() fStream1 << "set ylabel \"usec\"\n"; fStream1 << "plot \"JackEngineProfiling.log\" using 1 title \"Audio period\" with lines \n"; - fStream1 << "set output 'Timing1.pdf\n"; - fStream1 << "set terminal pdf\n"; + fStream1 << "set output 'Timing1.svg\n"; + fStream1 << "set terminal svg\n"; fStream1 << "set grid\n"; fStream1 << "set title \"Audio driver timing\"\n"; fStream1 << "set xlabel \"audio cycles\"\n"; fStream1 << "set ylabel \"usec\"\n"; fStream1 << "plot \"JackEngineProfiling.log\" using 1 title \"Audio period\" with lines \n"; + fStream1 << "unset output\n"; } // Driver end date @@ -127,14 +128,15 @@ JackEngineProfiling::~JackEngineProfiling() fStream2 << "set ylabel \"usec\"\n"; fStream2 << "plot \"JackEngineProfiling.log\" using 2 title \"Driver end date\" with lines \n"; - fStream2 << "set output 'Timing2.pdf\n"; - fStream2 << "set terminal pdf\n"; + fStream2 << "set output 'Timing2.svg\n"; + fStream2 << "set terminal svg\n"; fStream2 << "set grid\n"; fStream2 << "set title \"Driver end date\"\n"; fStream2 << "set xlabel \"audio cycles\"\n"; fStream2 << "set ylabel \"usec\"\n"; fStream2 << "plot \"JackEngineProfiling.log\" using 2 title \"Driver end date\" with lines \n"; + fStream2 << "unset output\n"; } // Clients end date @@ -170,8 +172,8 @@ JackEngineProfiling::~JackEngineProfiling() } fStream3 << "\n unset multiplot\n"; - fStream3 << "set output 'Timing3.pdf\n"; - fStream3 << "set terminal pdf\n"; + fStream3 << "set output 'Timing3.svg\n"; + fStream3 << "set terminal svg\n"; fStream3 << "set multiplot\n"; fStream3 << "set grid\n"; @@ -196,6 +198,8 @@ JackEngineProfiling::~JackEngineProfiling() fStream3 << "\"JackEngineProfiling.log\" using " << ((i + 1) * 7) - 1 << " title \"" << fIntervalTable[i].fName << "\" with lines,"; } } + fStream3 << "\nunset multiplot\n"; + fStream3 << "unset output\n"; } } @@ -222,8 +226,8 @@ JackEngineProfiling::~JackEngineProfiling() } fStream4 << "\n unset multiplot\n"; - fStream4 << "set output 'Timing4.pdf\n"; - fStream4 << "set terminal pdf\n"; + fStream4 << "set output 'Timing4.svg\n"; + fStream4 << "set terminal svg\n"; fStream4 << "set multiplot\n"; fStream4 << "set grid\n"; @@ -238,6 +242,8 @@ JackEngineProfiling::~JackEngineProfiling() fStream4 << "\"JackEngineProfiling.log\" using " << ((i + 1) * 7) << " title \"" << fIntervalTable[i].fName << "\" with lines,"; } } + fStream4 << "\nunset multiplot\n"; + fStream4 << "unset output\n"; } } @@ -264,8 +270,8 @@ JackEngineProfiling::~JackEngineProfiling() } fStream5 << "\n unset multiplot\n"; - fStream5 << "set output 'Timing5.pdf\n"; - fStream5 << "set terminal pdf\n"; + fStream5 << "set output 'Timing5.svg\n"; + fStream5 << "set terminal svg\n"; fStream5 << "set multiplot\n"; fStream5 << "set grid\n"; @@ -280,6 +286,8 @@ JackEngineProfiling::~JackEngineProfiling() fStream5 << "\"JackEngineProfiling.log\" using " << ((i + 1) * 7) + 1 << " title \"" << fIntervalTable[i].fName << "\" with lines,"; } } + fStream5 << "\nunset multiplot\n"; + fStream5 << "unset output\n"; } } }