Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
ITADataSources
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
ITADataSources
Commits
21eb6780
Commit
21eb6780
authored
Feb 20, 2017
by
Anne Heimes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfixes: probleme mit logger noch offen
parent
ea17bf32
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
19 deletions
+53
-19
src/ITANetAudioMessage.cpp
src/ITANetAudioMessage.cpp
+2
-2
src/ITANetAudioStreamingClient.cpp
src/ITANetAudioStreamingClient.cpp
+1
-0
tests/NetAudio/NetAudioServerLog.m
tests/NetAudio/NetAudioServerLog.m
+50
-17
No files found.
src/ITANetAudioMessage.cpp
View file @
21eb6780
...
...
@@ -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
)
{
...
...
src/ITANetAudioStreamingClient.cpp
View file @
21eb6780
...
...
@@ -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
()
...
...
tests/NetAudio/NetAudioServerLog.m
View file @
21eb6780
...
...
@@ -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
);
minTime
Server
=
NetAudioLogServerTab
.
WorldTimeStamp
(
1
);
maxTime
Server
=
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
));
minTime
Server
=
min
(
minTime
,
temp
.
WorldTimeStamp
(
1
));
maxTime
Server
=
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
);
minTime
Client
=
NetAudioLogClientTab
.
WorldTimeStamp
(
1
);
maxTime
Client
=
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
));
minTime
Client
=
min
(
minTime
,
temp
.
WorldTimeStamp
(
1
));
maxTime
Client
=
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
};
Time
Server
=
{
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment