From f9b56fc3ec50f6b187627bafd91010b073ca4ebc Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Tue, 25 Nov 2014 17:56:34 +0100 Subject: [PATCH] Added some more debug traces --- .../core/behaviour/UeBehaviourFileDownload.java | 1 + .../uecontrol/core/behaviour/UeBehaviourFtp.java | 12 ++++++++++-- .../core/behaviour/UeBehaviourFtpDownload.java | 5 +++-- .../core/behaviour/UeBehaviourFtpUpload.java | 5 ++++- .../core/behaviour/UeBehaviourReceiveCall.java | 2 ++ .../uecontrol/core/behaviour/UeBehaviourSleep.java | 4 ++++ .../uecontrol/core/behaviour/UeBehaviourSurfing.java | 3 ++- .../core/behaviour/UeBehaviourVideoStreaming.java | 7 ++++++- 8 files changed, 32 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFileDownload.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFileDownload.java index 9cfb9f3..fb4e43a 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFileDownload.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFileDownload.java @@ -44,6 +44,7 @@ public class UeBehaviourFileDownload extends UeBehaviour { } estimatedDataLength = progress; + log.debug("Total download size: "+ estimatedDataLength +" bytes"); in.close(); } diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtp.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtp.java index c598ee8..53d40da 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtp.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtp.java @@ -24,11 +24,19 @@ public abstract class UeBehaviourFtp extends UeBehaviour { if (getHost().contains(":")) { String tmpHost = getHost().substring(0, getHost().indexOf(':')); int tmpPort = Integer.parseInt(getHost().substring(getHost().indexOf(':'))); + log.debug("Connecting to host: "+tmpHost+" port: "+tmpPort); ftp.connect(tmpHost, tmpPort); - } else ftp.connect(getHost()); - if(getUsername() != null && !getUsername().isEmpty()) + } else { + log.debug("Connecting to host: "+getHost()); + ftp.connect(getHost()); + } + if (getUsername() != null && !getUsername().isEmpty()) { + log.debug("Login with user: " + getUsername()); ftp.login(getUsername(), getPassword()); + } + log.debug("Setting binary mode"); ftp.setFileType(FTP.BINARY_FILE_TYPE); + log.debug("Setting passive mode"); ftp.enterLocalPassiveMode(); executeFtp(ftp); diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtpDownload.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtpDownload.java index 48712f0..132e217 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtpDownload.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtpDownload.java @@ -29,21 +29,22 @@ public class UeBehaviourFtpDownload extends UeBehaviourFtp { @Override protected void executeFtp(FTPClient ftp) throws IOException { - // Download data + log.debug("Downloading FTP file: " + getFtpUrl(filePath)); InputStream inStream = ftp.retrieveFileStream(filePath); if (inStream != null) { InputStream in = new BufferedInputStream(inStream); + // Download data long progress = 0; long read = 0; byte[] data = new byte[BUFFER_SIZE]; - while((read = in.read(data)) != -1 && !stopExecution()){ progress += read; super.setProgress((float)progress/estimatedDataLength); } estimatedDataLength = progress; + log.debug("Total download size: "+ estimatedDataLength +" bytes"); in.close(); if(!ftp.completePendingCommand()) { throw new IOException("FTP reply: "+ftp.getReplyString()); diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtpUpload.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtpUpload.java index 9a4515c..8f0d82b 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtpUpload.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourFtpUpload.java @@ -39,10 +39,12 @@ public class UeBehaviourFtpUpload extends UeBehaviourFtp { @Override protected void executeFtp(FTPClient ftp) throws IOException { - // Upload data + log.debug("Uploading to FTP file: " + getFtpUrl(filePath)); OutputStream outStream = ftp.storeFileStream(filePath); if (outStream != null) { OutputStream out = new BufferedOutputStream(outStream); + + // Upload data int total = 0; byte[] data = new byte[BUFFER_SIZE]; while (total < size && !stopExecution()) { @@ -52,6 +54,7 @@ public class UeBehaviourFtpUpload extends UeBehaviourFtp { total += writeLength; super.setProgress((float) total / size); } + out.close(); if(!ftp.completePendingCommand()) { throw new IOException("FTP reply: "+ftp.getReplyString()); diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourReceiveCall.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourReceiveCall.java index 7471c4c..1eaac45 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourReceiveCall.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourReceiveCall.java @@ -26,6 +26,7 @@ public class UeBehaviourReceiveCall extends UeBehaviour{ TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); // Wait to receive Call + log.debug("Waiting for call..."); while(tm.getCallState() != TelephonyManager.CALL_STATE_RINGING ){ if(super.stopExecution()) return; @@ -37,6 +38,7 @@ public class UeBehaviourReceiveCall extends UeBehaviour{ CallUtil.answerCall(); // Wait for call to end + log.debug("Waiting for call to end..."); while(tm.getCallState() != TelephonyManager.CALL_STATE_IDLE){ if(super.stopExecution()) return; diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSleep.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSleep.java index e60ac1b..852c7f2 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSleep.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSleep.java @@ -1,7 +1,9 @@ package com.ericsson.uecontrol.core.behaviour; +import android.util.Log; import com.ericsson.uecontrol.core.UeBehaviour; import com.ericsson.uecontrol.gui.util.Configurator.Configurable; +import org.apache.log4j.Logger; /** * This behaviour simulates an idle period for the device. @@ -9,6 +11,7 @@ import com.ericsson.uecontrol.gui.util.Configurator.Configurable; * Created by ezivkoc on 2014-07-15. */ public class UeBehaviourSleep extends UeBehaviour{ + private static final Logger log = Logger.getLogger(UeBehaviourSleep.class); public static final int SLEEP_PERIOD = 100; @Configurable("Sleep(millisec)") @@ -23,6 +26,7 @@ public class UeBehaviourSleep extends UeBehaviour{ @Override protected void execute() throws InterruptedException { + log.debug(toString()); int elapsedTime = 0; while(elapsedTime < time){ super.setProgress((float)elapsedTime/time); diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSurfing.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSurfing.java index 84cc3e7..76696ca 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSurfing.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSurfing.java @@ -73,7 +73,8 @@ public class UeBehaviourSurfing extends UeBehaviour { for(int i=0; i