Commit 21eb6780 authored by Anne Heimes's avatar Anne Heimes

bugfixes: probleme mit logger noch offen

parent ea17bf32
...@@ -100,8 +100,8 @@ void CITANetAudioMessage::WriteMessage() ...@@ -100,8 +100,8 @@ void CITANetAudioMessage::WriteMessage()
#endif #endif
m_pConnection->WaitForSendFinish(); m_pConnection->WaitForSendFinish();
if( nRet != m_oOutgoing.GetBufferSize() ) //if( nRet != m_oOutgoing.GetBufferSize() )
VISTA_THROW( "ITANetAudioMessage: could not send all data from output buffer via network connection", 255 ); //VISTA_THROW( "ITANetAudioMessage: could not send all data from output buffer via network connection", 255 );
} }
catch (VistaExceptionBase& ex) catch (VistaExceptionBase& ex)
{ {
......
...@@ -63,6 +63,7 @@ CITANetAudioStreamingClient::CITANetAudioStreamingClient( CITANetAudioStream* pP ...@@ -63,6 +63,7 @@ CITANetAudioStreamingClient::CITANetAudioStreamingClient( CITANetAudioStream* pP
m_pClientLogger->setOutputFile(paras); m_pClientLogger->setOutputFile(paras);
iStreamingBlockId = 0; iStreamingBlockId = 0;
m_pMessage = new CITANetAudioMessage( VistaSerializingToolset::SWAPS_MULTIBYTE_VALUES ); m_pMessage = new CITANetAudioMessage( VistaSerializingToolset::SWAPS_MULTIBYTE_VALUES );
m_sfReceivingBuffer.init(m_oParams.iChannels, m_oParams.iRingBufferSize, false);
} }
CITANetAudioStreamingClient::~CITANetAudioStreamingClient() CITANetAudioStreamingClient::~CITANetAudioStreamingClient()
......
...@@ -5,30 +5,31 @@ BlockSize = '32'; ...@@ -5,30 +5,31 @@ BlockSize = '32';
NetAudioLogServer = dir(['NetAudioLogServer_BS' BlockSize '*.txt']); NetAudioLogServer = dir(['NetAudioLogServer_BS' BlockSize '*.txt']);
NetAudioLogServer = {NetAudioLogServer.name}; NetAudioLogServer = {NetAudioLogServer.name};
NetAudioLogServerTab = readtable(NetAudioLogServer{1}, 'FileType', 'text', 'Delimiter', '\t'); NetAudioLogServerTab = readtable(NetAudioLogServer{1}, 'FileType', 'text', 'Delimiter', '\t');
minTime = NetAudioLogServerTab.WorldTimeStamp(1); minTimeServer = NetAudioLogServerTab.WorldTimeStamp(1);
maxTime = NetAudioLogServerTab.WorldTimeStamp(end); maxTimeServer = NetAudioLogServerTab.WorldTimeStamp(end);
channel = NetAudioLogServer{1}(28:end-4); channel = NetAudioLogServer{1}(28:end-4);
for k=2:numel(NetAudioLogServer) for k=2:numel(NetAudioLogServer)
temp = readtable(NetAudioLogServer{k}, 'FileType', 'text', 'Delimiter', '\t'); temp = readtable(NetAudioLogServer{k}, 'FileType', 'text', 'Delimiter', '\t');
NetAudioLogServerTab = [NetAudioLogServerTab; temp]; NetAudioLogServerTab = [NetAudioLogServerTab; temp];
minTime = min(minTime, temp.WorldTimeStamp(1)); minTimeServer = min(minTime, temp.WorldTimeStamp(1));
maxTime = max(maxTime, temp.WorldTimeStamp(end)); maxTimeServer = max(maxTime, temp.WorldTimeStamp(end));
channel = [channel; NetAudioLogServer{k}(28:end-4)]; channel = [channel; NetAudioLogServer{k}(28:end-4)];
end end
NetAudioLogServerTab.WorldTimeStamp = NetAudioLogServerTab.WorldTimeStamp - minTime;
NetAudioLogClient = dir(['NetAudioLogClient_BS' BlockSize '*.txt']); NetAudioLogClient = dir(['NetAudioLogClient_BS' BlockSize '*.txt']);
NetAudioLogClient = {NetAudioLogClient.name}; NetAudioLogClient = {NetAudioLogClient.name};
NetAudioLogClientTab = readtable(NetAudioLogClient{1}, 'FileType', 'text', 'Delimiter', '\t'); NetAudioLogClientTab = readtable(NetAudioLogClient{1}, 'FileType', 'text', 'Delimiter', '\t');
minTime = NetAudioLogClientTab.WorldTimeStamp(1); minTimeClient = NetAudioLogClientTab.WorldTimeStamp(1);
maxTime = NetAudioLogClientTab.WorldTimeStamp(end); maxTimeClient = NetAudioLogClientTab.WorldTimeStamp(end);
for k=2:numel(NetAudioLogClient) for k=2:numel(NetAudioLogClient)
temp = readtable(NetAudioLogClient{k}, 'FileType', 'text', 'Delimiter', '\t'); temp = readtable(NetAudioLogClient{k}, 'FileType', 'text', 'Delimiter', '\t');
NetAudioLogClientTab = [NetAudioLogClientTab; temp]; NetAudioLogClientTab = [NetAudioLogClientTab; temp];
minTime = min(minTime, temp.WorldTimeStamp(1)); minTimeClient = min(minTime, temp.WorldTimeStamp(1));
maxTime = max(maxTime, temp.WorldTimeStamp(end)); maxTimeClient = max(maxTime, temp.WorldTimeStamp(end));
end end
NetAudioLogClientTab.WorldTimeStamp = NetAudioLogClientTab.WorldTimeStamp - minTimeClient;
NetAudioLogServerTab.WorldTimeStamp = NetAudioLogServerTab.WorldTimeStamp - minTimeServer;
%% Protocolstatus ersetzten %% Protocolstatus ersetzten
...@@ -40,6 +41,16 @@ Protocol = {'100', 'NP CLIENT OPEN';... ...@@ -40,6 +41,16 @@ Protocol = {'100', 'NP CLIENT OPEN';...
'211', 'NP SERVER GET RINGBUFFER FREE SAMPLES';... '211', 'NP SERVER GET RINGBUFFER FREE SAMPLES';...
'222', 'NP SERVER SENDING SAMPLES'}; '222', 'NP SERVER SENDING SAMPLES'};
%NumPro = zeros(size(NetAudioLogServerTab.ProtocolStatus)); %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)); Time100 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 100));
Time101 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 101)); Time101 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 101));
Time111 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 111)); Time111 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 111));
...@@ -48,21 +59,43 @@ Time201 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.Protocol ...@@ -48,21 +59,43 @@ Time201 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.Protocol
Time211 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 211)); Time211 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 211));
Time222 = NetAudioLogServerTab.WorldTimeStamp(find(NetAudioLogServerTab.ProtocolStatus == 222)); 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 Protocol
%plot(NetAudioLogServerTab.WorldTimeStamp, NetAudioLogServerTab.ProtocolStatus) %plot(NetAudioLogServerTab.WorldTimeStamp, NetAudioLogServerTab.ProtocolStatus)
hold on;
%subplot(2,2,1:4)
plot(NetAudioLogServerTab.WorldTimeStamp, NetAudioLogServerTab.FreeSamples) plot(NetAudioLogServerTab.WorldTimeStamp, NetAudioLogServerTab.FreeSamples)
legende = {}; hold on
legende{1} = 'Freie Samples'; %subplot(2,2,3:4)
%plot(NetAudioLogClientTab.WorldTimeStamp, NetAudioLogClientTab.FreeSamples)
legendeServer = {};
legendeClient = {};
legendeServer{1} = 'Freie Samples Server';
legendeClient{1} = 'Freie Samples Client';
i = 2; i = 2;
j = 2;
for k = (1:7) for k = (1:7)
if size(Time{k}, 1) ~= 0 if size(TimeServer{k}, 1) ~= 0
plot(Time{k}, k* 100 * ones(size(Time{k})),'.') %subplot(2,2,1:4)
legende{i} = Protocol{k,2}; plot(TimeServer{k}, ones(size(TimeServer{k})),'.')
legendeServer{i} = Protocol{k,2};
i = i + 1; i = i + 1;
end 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 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'); legend('show');
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment