--- a/telephonyprotocols/rawipnif/src/Sender.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/Sender.cpp Wed Sep 01 12:40:21 2010 +0100
@@ -19,24 +19,20 @@
@file
*/
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SenderTraces.h"
-#endif
-
#include "Sender.h"
#include "Constants.h"
#include <es_ini.h>
-CSender::CSender(CBcaIoController& aObserver, TInt aMaxPacketSise)
+CSender::CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise)
/**
* Constructor. Performs standard active object initialisation.
+ *
* @param aObserver Reference to the observer of this state machine
*/
: CActive(EPriorityUserInput),
iObserver(aObserver),
+ iTheLogger(aTheLogger),
iMaxPacketSize(aMaxPacketSise)
{
// EPriorityUserInput is higher than the default priority but lower than
@@ -46,16 +42,17 @@
CActiveScheduler::Add(this);
}
-CSender* CSender::NewL(CBcaIoController& aObserver, TInt aMaxPacketSise)
+CSender* CSender::NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise)
/**
* Two-phase constructor. Creates a new CBcaIoController object, performs
* second-phase construction, then returns it.
*
* @param aObserver The observer, to which events will be reported
+ * @param aTheLogger The logging object
* @return A newly constructed CBcaIoController object
*/
{
- CSender* self = new (ELeave) CSender(aObserver, aMaxPacketSise);
+ CSender* self = new (ELeave) CSender(aObserver, aTheLogger, aMaxPacketSise);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
@@ -67,7 +64,7 @@
* Second-phase constructor. Creates all the state objects it owns.
*/
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_CONSTRUCTL_1, "CSender::ConstructL");
+ _LOG_L1C1(_L8("CSender::ConstructL"));
iSendBuffer.CreateL(iMaxPacketSize);
}
@@ -88,27 +85,27 @@
* This method checks if any error occured in the write operation.
*/
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_1, "CSender::RunL [iStatus=%d]", iStatus.Int());
+ _LOG_L1C2(_L8("CSender::RunL [iStatus=%d]"), iStatus.Int());
if (iStatus!=KErrNone)
{
if(iStatus == KErrNoMemory)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_2, "WARNING! CSender: Write failed with KErrNoMemory");
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_3, "WARNING! CSender: Ignoring packet!!!!");
+ _LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNoMemory"));
+ _LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!"));
// Write operation failed!! Nif will ignore this packet.
iObserver.SendComplete();
}
else if (iStatus == KErrNotReady)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_4, "WARNING! CSender: Write failed with KErrNotReady");
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_5, "WARNING! CSender: Ignoring packet!!!!");
+ _LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNotReady"));
+ _LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!"));
// Write operation failed!! Nif will ignore this packet.
iObserver.SendComplete();
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_6, "ERROR! CSender: Write failed!!!!");
+ _LOG_L2C1(_L8("ERROR! CSender: Write failed!!!!"));
// Nif will shut down
iObserver.Stop(iStatus.Int());
}
@@ -118,7 +115,7 @@
else
{
// The Ip packet was sent successfuly
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_7, "***** CSender: Packet Sent.");
+ _LOG_L1C1(_L8("***** CSender: Packet Sent."));
iObserver.SendComplete();
}
}
@@ -128,7 +125,7 @@
* Cancel active request
*/
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_DOCANCEL_1, "CSender::DoCancel");
+ _LOG_L1C1(_L8("CSender::DoCancel"));
(iObserver.Bca())->CancelWrite();
}
@@ -141,7 +138,7 @@
* @return KStopSending, or KErrArgument if the packet is too large.
*/
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_SEND_1, "CSender::Send");
+ _LOG_L1C1(_L8("CSender::Send"));
// Copy the IP portion of the RMBufChain to the buffer.
iSendBuffer.SetMax();
@@ -154,5 +151,7 @@
aPdu.Free();
(iObserver.Bca())->Write(iStatus, iSendBuffer);
+
SetActive();
}
+