rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

AndroidGCS HID: Remove more locks to try and prevent HID deadlocking

Browse Source
This commit is contained in:
James Cotton 2012-08-13 02:00:54 -05:00
parent f96b419a85
commit d5c1e3578e
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
androidgcs/src/org/openpilot/uavtalk/Telemetry.java
View File

@ -343,7 +343,7 @@ public class Telemetry {
/** /**
* Update an object based on its metadata properties * Update an object based on its metadata properties
*/ */
private synchronized void updateObject(UAVObject obj) private void updateObject(UAVObject obj)
{ {
// Get metadata // Get metadata
UAVObject.Metadata metadata = obj.getMetadata(); UAVObject.Metadata metadata = obj.getMetadata();
@ -393,7 +393,7 @@ public class Telemetry {
* Called when a transaction is successfully completed (uavtalk event) * Called when a transaction is successfully completed (uavtalk event)
* @throws IOException * @throws IOException
*/ */
private synchronized void transactionCompleted(UAVObject obj, boolean result) throws IOException private void transactionCompleted(UAVObject obj, boolean result) throws IOException
{ {
if (DEBUG) Log.d(TAG,"UAVTalk transactionCompleted"); if (DEBUG) Log.d(TAG,"UAVTalk transactionCompleted");
// Check if there is a pending transaction and the objects match // Check if there is a pending transaction and the objects match
@ -401,8 +401,11 @@ public class Telemetry {
{ {
if (DEBUG) Log.d(TAG,"Telemetry: transaction completed for " + obj.getName()); if (DEBUG) Log.d(TAG,"Telemetry: transaction completed for " + obj.getName());
// Complete transaction // Complete transaction
transTimer.cancel();
transPending = false; synchronized(transTimer) {
transTimer.cancel();
transPending = false;
}
//Send signal //Send signal
obj.transactionCompleted(result); obj.transactionCompleted(result);
@ -419,39 +422,41 @@ public class Telemetry {
* Called when a transaction is not completed within the timeout period (timer event) * Called when a transaction is not completed within the timeout period (timer event)
* @throws IOException * @throws IOException
*/ */
private synchronized void transactionTimeout() throws IOException private void transactionTimeout() throws IOException
{ {
if (DEBUG) Log.d(TAG,"Telemetry: transaction timeout."); if (DEBUG) Log.d(TAG,"Telemetry: transaction timeout.");
transTimer.cancel(); synchronized(transTimer) {
// Proceed only if there is a pending transaction transTimer.cancel();
if ( transPending ) // Proceed only if there is a pending transaction
{ if ( transPending )
// Check if more retries are pending {
if (transInfo.retriesRemaining > 0) // Check if more retries are pending
{ if (transInfo.retriesRemaining > 0)
--transInfo.retriesRemaining; {
processObjectTransaction(); --transInfo.retriesRemaining;
++txRetries; processObjectTransaction();
} ++txRetries;
else }
{ else
if (ERROR) Log.e(TAG, "Transaction failed for: " + transInfo.obj.getName()); {
if (ERROR) Log.e(TAG, "Transaction failed for: " + transInfo.obj.getName());
// Terminate transaction. This triggers UAVTalk to send a transaction // Terminate transaction. This triggers UAVTalk to send a transaction
// failed signal which will make the next queue entry be processed // failed signal which will make the next queue entry be processed
// Note this is UAVTalk listener TransactionFailed function and not the // Note this is UAVTalk listener TransactionFailed function and not the
// object specific transaction failed. // object specific transaction failed.
utalk.cancelPendingTransaction(transInfo.obj); utalk.cancelPendingTransaction(transInfo.obj);
++txErrors; ++txErrors;
} }
} }
}
} }
/** /**
* Start an object transaction with UAVTalk, all information is stored in transInfo * Start an object transaction with UAVTalk, all information is stored in transInfo
* @throws IOException * @throws IOException
*/ */
private synchronized void processObjectTransaction() throws IOException private void processObjectTransaction() throws IOException
{ {
if (transPending) if (transPending)
{ {
@ -472,8 +477,10 @@ public class Telemetry {
} }
else else
{ {
transTimer.cancel(); synchronized(transTimer) {
transPending = false; transTimer.cancel();
transPending = false;
}
} }
} else } else
{ {
@ -628,11 +635,12 @@ public class Telemetry {
* TODO: Clean-up * TODO: Clean-up
* @throws IOException * @throws IOException
*/ */
private synchronized void processPeriodicUpdates() throws IOException private void processPeriodicUpdates() throws IOException
{ {
if (DEBUG) Log.d(TAG, "processPeriodicUpdates()"); if (DEBUG) Log.d(TAG, "processPeriodicUpdates()");
// Stop timer // Stop timer
updateTimer.cancel(); updateTimer.cancel();
// Iterate through each object and update its timer, if zero then transmit object. // Iterate through each object and update its timer, if zero then transmit object.
@ -705,7 +713,7 @@ public class Telemetry {
return stats; return stats;
} }
public synchronized void resetStats() public void resetStats()
{ {
utalk.resetStats(); utalk.resetStats();
txErrors = 0; txErrors = 0;