From 21eb678007773551c846220afc0943bf84abbbef Mon Sep 17 00:00:00 2001 From: Anne Heimes Date: Mon, 20 Feb 2017 18:13:30 +0100 Subject: [PATCH] bugfixes: probleme mit logger noch offen --- src/ITANetAudioMessage.cpp | 4 +- src/ITANetAudioStreamingClient.cpp | 1 + tests/NetAudio/NetAudioServerLog.m | 67 ++++++++++++++++++++++-------- 3 files changed, 53 insertions(+), 19 deletions(-) diff --git a/src/ITANetAudioMessage.cpp b/src/ITANetAudioMessage.cpp index 2cfc74f..0260116 100644 --- a/src/ITANetAudioMessage.cpp +++ b/src/ITANetAudioMessage.cpp @@ -100,8 +100,8 @@ void CITANetAudioMessage::WriteMessage() #endif m_pConnection->WaitForSendFinish(); - if( nRet != m_oOutgoing.GetBufferSize() ) - VISTA_THROW( "ITANetAudioMessage: could not send all data from output buffer via network connection", 255 ); + //if( nRet != m_oOutgoing.GetBufferSize() ) + //VISTA_THROW( "ITANetAudioMessage: could not send all data from output buffer via network connection", 255 ); } catch (VistaExceptionBase& ex) { diff --git a/src/ITANetAudioStreamingClient.cpp b/src/ITANetAudioStreamingClient.cpp index 7b0b828..be837f2 100644 --- a/src/ITANetAudioStreamingClient.cpp +++ b/src/ITANetAudioStreamingClient.cpp @@ -63,6 +63,7 @@ CITANetAudioStreamingClient::CITANetAudioStreamingClient( CITANetAudioStream* pP m_pClientLogger->setOutputFile(paras); iStreamingBlockId = 0; m_pMessage = new CITANetAudioMessage( VistaSerializingToolset::SWAPS_MULTIBYTE_VALUES ); + m_sfReceivingBuffer.init(m_oParams.iChannels, m_oParams.iRingBufferSize, false); } CITANetAudioStreamingClient::~CITANetAudioStreamingClient() diff --git a/tests/NetAudio/NetAudioServerLog.m b/tests/NetAudio/NetAudioServerLog.m index 4a97a25..45ac600 100644 --- a/tests/NetAudio/NetAudioServerLog.m +++ b/tests/NetAudio/NetAudioServerLog.m @@ -5,30 +5,31 @@ BlockSize = '32'; NetAudioLogServer = dir(['NetAudioLogServer_BS' BlockSize '*.txt']); NetAudioLogServer = {NetAudioLogServer.name}; NetAudioLogServerTab = readtable(NetAudioLogServer{1}, 'FileType', 'text', 'Delimiter', '\t'); -minTime = NetAudioLogServerTab.WorldTimeStamp(1); -maxTime = NetAudioLogServerTab.WorldTimeStamp(end); +minTimeServer = NetAudioLogServerTab.WorldTimeStamp(1); +maxTimeServer = NetAudioLogServerTab.WorldTimeStamp(end); channel = NetAudioLogServer{1}(28:end-4); for k=2:numel(NetAudioLogServer) temp = readtable(NetAudioLogServer{k}, 'FileType', 'text', 'Delimiter', '\t'); NetAudioLogServerTab = [NetAudioLogServerTab; temp]; - minTime = min(minTime, temp.WorldTimeStamp(1)); - maxTime = max(maxTime, temp.WorldTimeStamp(end)); + minTimeServer = min(minTime, temp.WorldTimeStamp(1)); + maxTimeServer = max(maxTime, temp.WorldTimeStamp(end)); channel = [channel; NetAudioLogServer{k}(28:end-4)]; end -NetAudioLogServerTab.WorldTimeStamp = NetAudioLogServerTab.WorldTimeStamp - minTime; NetAudioLogClient = dir(['NetAudioLogClient_BS' BlockSize '*.txt']); NetAudioLogClient = {NetAudioLogClient.name}; NetAudioLogClientTab = readtable(NetAudioLogClient{1}, 'FileType', 'text', 'Delimiter', '\t'); -minTime = NetAudioLogClientTab.WorldTimeStamp(1); -maxTime = NetAudioLogClientTab.WorldTimeStamp(end); +minTimeClient = NetAudioLogClientTab.WorldTimeStamp(1); +maxTimeClient = NetAudioLogClientTab.WorldTimeStamp(end); for k=2:numel(NetAudioLogClient) temp = readtable(NetAudioLogClient{k}, 'FileType', 'text', 'Delimiter', '\t'); NetAudioLogClientTab = [NetAudioLogClientTab; temp]; - minTime = min(minTime, temp.WorldTimeStamp(1)); - maxTime = max(maxTime, temp.WorldTimeStamp(end)); + minTimeClient = min(minTime, temp.WorldTimeStamp(1)); + maxTimeClient = max(maxTime, temp.WorldTimeStamp(end)); end +NetAudioLogClientTab.WorldTimeStamp = NetAudioLogClientTab.WorldTimeStamp - minTimeClient; +NetAudioLogServerTab.WorldTimeStamp = NetAudioLogServerTab.WorldTimeStamp - minTimeServer; %% Protocolstatus ersetzten @@ -40,6 +41,16 @@ Protocol = {'100', 'NP CLIENT OPEN';... '211', 'NP SERVER GET RINGBUFFER FREE SAMPLES';... '222', 'NP SERVER SENDING SAMPLES'}; %NumPro = zeros(size(NetAudioLogServerTab.ProtocolStatus)); +Time100 = NetAudioLogClientTab.WorldTimeStamp(find(NetAudioLogClientTab.ProtocolStatus == 100)); +Time101 = NetAudioLogClientTab.WorldTimeStamp(find(NetAudioLogClientTab.ProtocolStatus == 101)); +Time111 = NetAudioLogClientTab.WorldTimeStamp(find(NetAudioLogClientTab.ProtocolStatus == 111)); +Time200 = NetAudioLogClientTab.WorldTimeStamp(find(NetAudioLogClientTab.ProtocolStatus == 200)); +Time201 = NetAudioLogClientTab.WorldTimeStamp(find(NetAudioLogClientTab.ProtocolStatus == 201)); +Time211 = NetAudioLogClientTab.WorldTimeStamp(find(NetAudioLogClientTab.ProtocolStatus == 211)); +Time222 = NetAudioLogClientTab.WorldTimeStamp(find(NetAudioLogClientTab.ProtocolStatus == 222)); + +TimeClient = {Time100 Time101 Time111 Time200 Time201 Time211 Time222}; + Time100 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 100)); Time101 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 101)); Time111 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 111)); @@ -48,21 +59,43 @@ Time201 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.Protocol Time211 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 211)); Time222 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 222)); -Time = {Time100 Time101 Time111 Time200 Time201 Time211 Time222}; +TimeServer = {Time100 Time101 Time111 Time200 Time201 Time211 Time222}; %% Plot Protocol %plot(NetAudioLogServerTab.WorldTimeStamp, NetAudioLogServerTab.ProtocolStatus) -hold on; + +%subplot(2,2,1:4) plot(NetAudioLogServerTab.WorldTimeStamp, NetAudioLogServerTab.FreeSamples) -legende = {}; -legende{1} = 'Freie Samples'; +hold on +%subplot(2,2,3:4) +%plot(NetAudioLogClientTab.WorldTimeStamp, NetAudioLogClientTab.FreeSamples) +legendeServer = {}; +legendeClient = {}; +legendeServer{1} = 'Freie Samples Server'; +legendeClient{1} = 'Freie Samples Client'; + i = 2; +j = 2; for k = (1:7) - if size(Time{k}, 1) ~= 0 - plot(Time{k}, k* 100 * ones(size(Time{k})),'.') - legende{i} = Protocol{k,2}; + if size(TimeServer{k}, 1) ~= 0 + %subplot(2,2,1:4) + plot(TimeServer{k}, ones(size(TimeServer{k})),'.') + legendeServer{i} = Protocol{k,2}; i = i + 1; end + if size(TimeClient{k}, 1) ~= 0 + %subplot(2,2,3:4) + %plot(TimeClient{k}, ones(size(TimeClient{k})),'.') + legendeClient{i} = Protocol{k,2}; + j = j + 1; + end end -legend(legende); +%subplot(2,2,1:2) +title(['Protokolstatus Server']) +xlabel('Zeit in s') +legend(legendeServer); +%subplot(2,2,3:4) +%title(['Protokolstatus Client']) +%xlabel('Zeit in s') +%legend(legendeClient); legend('show'); \ No newline at end of file -- GitLab