sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improves harvesting time stats for call info frame. Updates Ice4j to r343: Improves harvesting time stats: 1) number of harvests and 2) total harvesting time for each harvesters.

Browse Source
cusax-fix
Vincent Lucas 13 years ago
parent 927108af5d
commit 22ffe0448b
9 changed files with 217 additions and 34 deletions
Show Stats Download Patch File Download Diff File

BIN
lib/installer-exclude/ice4j.jar
View File

Binary file not shown.

16
resources/languages/resources.properties
Unescape View File

@ -569,19 +569,21 @@ service.gui.callinfo.MEDIA_STREAM_RTP=RTP
service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Key exchange protocol
service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE candidate extended type
service.gui.callinfo.ICE_STATE=ICE Processing State:
service.gui.callinfo.ICE_STATE=ICE Processing State
service.gui.callinfo.ICE_STATE.WAITING=Gather candidates
service.gui.callinfo.ICE_STATE.RUNNING=Connectivity checks
service.gui.callinfo.ICE_STATE.COMPLETED=Completed
service.gui.callinfo.ICE_STATE.FAILED=Failed
service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Local host IP / Port:
service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Local reflexive IP / Port:
service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Local relayed IP / Port:
service.gui.callinfo.ICE_REMOTE_HOST_ADDRESS=Remote host IP / Port:
service.gui.callinfo.ICE_REMOTE_REFLEXIVE_ADDRESS=Remote reflexive IP / Port:
service.gui.callinfo.ICE_REMOTE_RELAYED_ADDRESS=Remote relayed IP / Port:
service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Local host IP / Port
service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Local reflexive IP / Port
service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Local relayed IP / Port
service.gui.callinfo.ICE_REMOTE_HOST_ADDRESS=Remote host IP / Port
service.gui.callinfo.ICE_REMOTE_REFLEXIVE_ADDRESS=Remote reflexive IP / Port
service.gui.callinfo.ICE_REMOTE_RELAYED_ADDRESS=Remote relayed IP / Port
service.gui.callinfo.TOTAL_HARVESTING_TIME=Total harvesting time
service.gui.callinfo.HARVESTING_TIME=Harvesting time
service.gui.callinfo.HARVESTING_MS_FOR=ms (for
service.gui.callinfo.HARVESTS=harvests)
service.gui.ALWAYS_TRUST=Always trust this certificate
service.gui.CERT_DIALOG_TITLE=Verify Certificate

31
src/net/java/sip/communicator/impl/gui/main/call/CallInfoFrame.java
Unescape View File

@ -335,13 +335,20 @@ private void constructPeerInfo(CallPeer callPeer, StringBuffer stringBuffer)
// Total harvesting time.
long harvestingTime
= callPeerMediaHandler.getTotalHarvestingTime();
if(harvestingTime != -1)
if(harvestingTime != 0)
{
stringBuffer.append(getLineString(resources.getI18NString(
"service.gui.callinfo.TOTAL_HARVESTING_TIME"
)
+ ":",
harvestingTime + " ms"));
),
harvestingTime
+ " "
+ resources.getI18NString(
"service.gui.callinfo.HARVESTING_MS_FOR")
+ " "
+ callPeerMediaHandler.getNbHarvesting()
+ " "
+ resources.getI18NString(
"service.gui.callinfo.HARVESTS")));
}
// Current harvester time if ICE agent is harvesting.
@ -359,13 +366,23 @@ private void constructPeerInfo(CallPeer callPeer, StringBuffer stringBuffer)
{
harvestingTime = callPeerMediaHandler.getHarvestingTime(
harvesterNames[i]);
if(harvestingTime != -1)
if(harvestingTime != 0)
{
stringBuffer.append(getLineString(
resources.getI18NString(
"service.gui.callinfo.HARVESTING_TIME")
+ " " + harvesterNames[i] + ":",
harvestingTime + " ms"));
+ " " + harvesterNames[i],
harvestingTime
+ " "
+ resources.getI18NString(
"service.gui.callinfo.HARVESTING_MS_FOR"
)
+ " "
+ callPeerMediaHandler.getNbHarvesting(
harvesterNames[i])
+ " "
+ resources.getI18NString(
"service.gui.callinfo.HARVESTS")));
}
}
}

40
src/net/java/sip/communicator/impl/protocol/jabber/IceUdpTransportManager.java
Unescape View File

@ -1387,7 +1387,7 @@ public InetSocketAddress getICERemoteRelayedAddress(String streamName)
/**
* Returns the total harvesting time (in ms) for all harvesters.
*
* @return The total harvesting time (in ms) for all the harvesters. -1 if
* @return The total harvesting time (in ms) for all the harvesters. 0 if
* the ICE agent is null, or if the agent has nevers harvested.
*/
public long getTotalHarvestingTime()
@ -1396,7 +1396,7 @@ public long getTotalHarvestingTime()
{
return iceAgent.getTotalHarvestingTime();
}
return -1;
return 0;
}
/**
@ -1405,7 +1405,7 @@ public long getTotalHarvestingTime()
* @param harvesterName The class name if the harvester.
*
* @return The harvesting time (in ms) for the harvester given in parameter.
* -1 if this harvester does not exists, if the ICE agent is null, or if the
* 0 if this harvester does not exists, if the ICE agent is null, or if the
* agent has never harvested with this harvester.
*/
public long getHarvestingTime(String harvesterName)
@ -1414,7 +1414,39 @@ public long getHarvestingTime(String harvesterName)
{
return iceAgent.getHarvestingTime(harvesterName);
}
return -1;
return 0;
}
/**
* Returns the number of harvesting for this agent.
*
* @return The number of harvesting for this agent.
*/
public int getNbHarvesting()
{
if(iceAgent != null)
{
return iceAgent.getNbHarvesting();
}
return 0;
}
/**
* Returns the number of harvesting time for the harvester given in
* parameter.
*
* @param harvesterName The class name if the harvester.
*
* @return The number of harvesting time for the harvester given in
* parameter.
*/
public int getNbHarvesting(String harvesterName)
{
if(iceAgent != null)
{
return iceAgent.getNbHarvesting(harvesterName);
}
return 0;
}
/**

32
src/net/java/sip/communicator/impl/protocol/jabber/RawUdpTransportManager.java
Unescape View File

@ -759,12 +759,12 @@ public InetSocketAddress getICERemoteRelayedAddress(String streamName)
/**
* Returns the total harvesting time (in ms) for all harvesters.
*
* @return The total harvesting time (in ms) for all the harvesters. -1 if
* @return The total harvesting time (in ms) for all the harvesters. 0 if
* the ICE agent is null, or if the agent has nevers harvested.
*/
public long getTotalHarvestingTime()
{
return -1;
return 0;
}
/**
@ -773,11 +773,35 @@ public long getTotalHarvestingTime()
* @param harvesterName The class name if the harvester.
*
* @return The harvesting time (in ms) for the harvester given in parameter.
* -1 if this harvester does not exists, if the ICE agent is null, or if the
* 0 if this harvester does not exists, if the ICE agent is null, or if the
* agent has never harvested with this harvester.
*/
public long getHarvestingTime(String harvesterName)
{
return -1;
return 0;
}
/**
* Returns the number of harvesting for this agent.
*
* @return The number of harvesting for this agent.
*/
public int getNbHarvesting()
{
return 0;
}
/**
* Returns the number of harvesting time for the harvester given in
* parameter.
*
* @param harvesterName The class name if the harvester.
*
* @return The number of harvesting time for the harvester given in
* parameter.
*/
public int getNbHarvesting(String harvesterName)
{
return 0;
}
}

40
src/net/java/sip/communicator/impl/protocol/jabber/TransportManagerGTalkImpl.java
Unescape View File

@ -1483,7 +1483,7 @@ public InetSocketAddress getICERemoteRelayedAddress(String streamName)
/**
* Returns the total harvesting time (in ms) for all harvesters.
*
* @return The total harvesting time (in ms) for all the harvesters. -1 if
* @return The total harvesting time (in ms) for all the harvesters. 0 if
* the ICE agent is null, or if the agent has nevers harvested.
*/
public long getTotalHarvestingTime()
@ -1492,7 +1492,7 @@ public long getTotalHarvestingTime()
{
return iceAgent.getTotalHarvestingTime();
}
return -1;
return 0;
}
/**
@ -1501,7 +1501,7 @@ public long getTotalHarvestingTime()
* @param harvesterName The class name if the harvester.
*
* @return The harvesting time (in ms) for the harvester given in parameter.
* -1 if this harvester does not exists, if the ICE agent is null, or if the
* 0 if this harvester does not exists, if the ICE agent is null, or if the
* agent has never harvested with this harvester.
*/
public long getHarvestingTime(String harvesterName)
@ -1510,7 +1510,39 @@ public long getHarvestingTime(String harvesterName)
{
return iceAgent.getHarvestingTime(harvesterName);
}
return -1;
return 0;
}
/**
* Returns the number of harvesting for this agent.
*
* @return The number of harvesting for this agent.
*/
public int getNbHarvesting()
{
if(iceAgent != null)
{
return iceAgent.getNbHarvesting();
}
return 0;
}
/**
* Returns the number of harvesting time for the harvester given in
* parameter.
*
* @param harvesterName The class name if the harvester.
*
* @return The number of harvesting time for the harvester given in
* parameter.
*/
public int getNbHarvesting(String harvesterName)
{
if(iceAgent != null)
{
return iceAgent.getNbHarvesting(harvesterName);
}
return 0;
}
/**

32
src/net/java/sip/communicator/impl/protocol/sip/TransportManagerSipImpl.java
Unescape View File

@ -158,12 +158,12 @@ public InetSocketAddress getICERemoteRelayedAddress(String streamName)
/**
* Returns the total harvesting time (in ms) for all harvesters.
*
* @return The total harvesting time (in ms) for all the harvesters. -1 if
* @return The total harvesting time (in ms) for all the harvesters. 0 if
* the ICE agent is null, or if the agent has nevers harvested.
*/
public long getTotalHarvestingTime()
{
return -1;
return 0;
}
/**
@ -172,11 +172,35 @@ public long getTotalHarvestingTime()
* @param harvesterName The class name if the harvester.
*
* @return The harvesting time (in ms) for the harvester given in parameter.
* -1 if this harvester does not exists, if the ICE agent is null, or if the
* 0 if this harvester does not exists, if the ICE agent is null, or if the
* agent has never harvested with this harvester.
*/
public long getHarvestingTime(String harvesterName)
{
return -1;
return 0;
}
/**
* Returns the number of harvesting for this agent.
*
* @return The number of harvesting for this agent.
*/
public int getNbHarvesting()
{
return 0;
}
/**
* Returns the number of harvesting time for the harvester given in
* parameter.
*
* @param harvesterName The class name if the harvester.
*
* @return The number of harvesting time for the harvester given in
* parameter.
*/
public int getNbHarvesting(String harvesterName)
{
return 0;
}
}

38
src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java
Unescape View File

@ -1579,7 +1579,7 @@ public InetSocketAddress getICERemoteRelayedAddress(String streamName)
/**
* Returns the total harvesting time (in ms) for all harvesters.
*
* @return The total harvesting time (in ms) for all the harvesters. -1 if
* @return The total harvesting time (in ms) for all the harvesters. 0 if
* the ICE agent is null, or if the agent has nevers harvested.
*/
public long getTotalHarvestingTime()
@ -1598,7 +1598,7 @@ public long getTotalHarvestingTime()
* @param harvesterName The class name if the harvester.
*
* @return The harvesting time (in ms) for the harvester given in parameter.
* -1 if this harvester does not exists, if the ICE agent is null, or if the
* 0 if this harvester does not exists, if the ICE agent is null, or if the
* agent has never harvested with this harvester.
*/
public long getHarvestingTime(String harvesterName)
@ -1611,6 +1611,40 @@ public long getHarvestingTime(String harvesterName)
: transportManager.getHarvestingTime(harvesterName);
}
/**
* Returns the number of harvesting for this agent.
*
* @return The number of harvesting for this agent.
*/
public int getNbHarvesting()
{
TransportManager<?> transportManager = getTransportManager();
return
(transportManager == null)
? null
: transportManager.getNbHarvesting();
}
/**
* Returns the number of harvesting time for the harvester given in
* parameter.
*
* @param harvesterName The class name if the harvester.
*
* @return The number of harvesting time for the harvester given in
* parameter.
*/
public int getNbHarvesting(String harvesterName)
{
TransportManager<?> transportManager = getTransportManager();
return
(transportManager == null)
? null
: transportManager.getNbHarvesting(harvesterName);
}
public MediaHandler getMediaHandler()
{
return mediaHandler;

22
src/net/java/sip/communicator/service/protocol/media/TransportManager.java
Unescape View File

@ -671,7 +671,7 @@ public abstract InetSocketAddress getICERemoteRelayedAddress(
/**
* Returns the total harvesting time (in ms) for all harvesters.
*
* @return The total harvesting time (in ms) for all the harvesters. -1 if
* @return The total harvesting time (in ms) for all the harvesters. 0 if
* the ICE agent is null, or if the agent has nevers harvested.
*/
public abstract long getTotalHarvestingTime();
@ -682,11 +682,29 @@ public abstract InetSocketAddress getICERemoteRelayedAddress(
* @param harvesterName The class name if the harvester.
*
* @return The harvesting time (in ms) for the harvester given in parameter.
* -1 if this harvester does not exists, if the ICE agent is null, or if the
* 0 if this harvester does not exists, if the ICE agent is null, or if the
* agent has never harvested with this harvester.
*/
public abstract long getHarvestingTime(String harvesterName);
/**
* Returns the number of harvesting for this agent.
*
* @return The number of harvesting for this agent.
*/
public abstract int getNbHarvesting();
/**
* Returns the number of harvesting time for the harvester given in
* parameter.
*
* @param harvesterName The class name if the harvester.
*
* @return The number of harvesting time for the harvester given in
* parameter.
*/
public abstract int getNbHarvesting(String harvesterName);
/**
* Returns the ICE candidate extended type selected by the given agent.
*

Write Preview
Loading…
Cancel
Save