userlibandfileserver/fileserver/shostmassstorage/server/src/cusbhostmssession.cpp
--- a/userlibandfileserver/fileserver/shostmassstorage/server/src/cusbhostmssession.cpp Tue Oct 26 11:12:58 2010 +0100
+++ b/userlibandfileserver/fileserver/shostmassstorage/server/src/cusbhostmssession.cpp Tue Oct 26 12:49:20 2010 +0100
@@ -20,6 +20,11 @@
#include <e32base.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cusbhostmssessionTraces.h"
+#endif
+
#include "msctypes.h"
#include "shared.h"
#include "msgservice.h"
@@ -29,91 +34,86 @@
#include "usbmshostpanic.h"
#include "cusbhostmsdevicethread.h"
#include "cusbhostmssession.h"
-#include "msdebug.h"
-#include "debug.h"
+
/** Construct a Symbian OS session object.
- param aServer Service the session will be a member of
- param aMessage The message from the client.
- return A new CUsbHostMsSession object
+ param aServer Service the session will be a member of
+ param aMessage The message from the client.
+ return A new CUsbHostMsSession object
*/
CUsbHostMsSession* CUsbHostMsSession::NewL(CUsbHostMsServer& aServer)
- {
- __MSFNSLOG
- CUsbHostMsSession* r = new (ELeave) CUsbHostMsSession(aServer);
- CleanupStack::PushL(r);
- r->ConstructL();
- CleanupStack::Pop();
- return r;
- }
+ {
+ CUsbHostMsSession* r = new (ELeave) CUsbHostMsSession(aServer);
+ CleanupStack::PushL(r);
+ r->ConstructL();
+ CleanupStack::Pop();
+ return r;
+ }
/**
Constructor.
- param aServer Service the session will be a member of
+ param aServer Service the session will be a member of
*/
CUsbHostMsSession::CUsbHostMsSession(CUsbHostMsServer& aServer)
- : iUsbHostMsServer(aServer)
- {
- __MSFNLOG
- }
+ : iUsbHostMsServer(aServer)
+ {
+ }
/**
2nd Phase Construction.
*/
void CUsbHostMsSession::ConstructL()
- {
- __MSFNLOG
- iUsbHostMsServer.IncrementSessionCount();
- __HOSTPRINT1(_L("\tiSessionCount: %d\n"), iUsbHostMsServer.SessionCount());
- }
+ {
+ iUsbHostMsServer.IncrementSessionCount();
+ OstTrace1(TRACE_SHOSTMASSSTORAGE_HOST, CUSBHOSTMSSESSION_10,
+ "iSessionCount: %d", iUsbHostMsServer.SessionCount());
+ }
/**
Destructor.
*/
CUsbHostMsSession::~CUsbHostMsSession()
- {
- __MSFNLOG
-
- iUsbHostMsServer.DecrementSessionCount();
- iThread.Close();
- __HOSTPRINT1(_L("\tClosed a session -> iSessionCount: %d\n"), iUsbHostMsServer.SessionCount());
- }
+ {
+ iUsbHostMsServer.DecrementSessionCount();
+ iThread.Close();
+ OstTrace1(TRACE_SHOSTMASSSTORAGE_HOST, CUSBHOSTMSSESSION_11,
+ "Closed a session -> iSessionCount: %d",
+ iUsbHostMsServer.SessionCount());
+ }
/**
Called when a message is received from the client.
- param aMessage Message received from the client
+ param aMessage Message received from the client
*/
void CUsbHostMsSession::ServiceL(const RMessage2& aMessage)
- {
- __MSFNLOG
- DispatchMessageL(aMessage);
- }
+ {
+ DispatchMessageL(aMessage);
+ }
/**
Handles the request (in the form of a message) received from the client
- param aMessage The received message
+ param aMessage The received message
*/
void CUsbHostMsSession::DispatchMessageL(const RMessage2& aMessage)
- {
- __MSFNLOG
- TInt r = KErrNone;
- switch (aMessage.Function())
- {
- case EUsbHostMsRegisterInterface:
- TRAP(r, CreateDeviceThreadL(aMessage));
- if(r != KErrNone)
- {
- aMessage.Complete(r);
- return;
- }
- break;
+ {
+ TInt r = KErrNone;
+ switch (aMessage.Function())
+ {
+ case EUsbHostMsRegisterInterface:
+ TRAP(r, CreateDeviceThreadL(aMessage));
+ if(r != KErrNone)
+ {
+ aMessage.Complete(r);
+ return;
+ }
+ break;
case EUsbHostMsUnRegisterInterface:
if(iCleanupInProgress)
{
@@ -124,88 +124,88 @@
{
iCleanupInProgress = ETrue;
}
- break;
- /* If it is a cleanup then we need to delete the iDeviceThread */
- case EUsbHostMsFinalCleanup:
- delete iDeviceThread;
- iDeviceThread = NULL;
- iThread.Kill(KErrNone);
- aMessage.Complete(KErrNone);
- return;
- default:
- break;
- }
+ break;
+ /* If it is a cleanup then we need to delete the iDeviceThread */
+ case EUsbHostMsFinalCleanup:
+ delete iDeviceThread;
+ iDeviceThread = NULL;
+ iThread.Kill(KErrNone);
+ aMessage.Complete(KErrNone);
+ return;
+ default:
+ break;
+ }
- if (iDeviceThread == NULL)
- {
- aMessage.Complete(KErrBadHandle);
- return;
- }
+ if (iDeviceThread == NULL)
+ {
+ aMessage.Complete(KErrBadHandle);
+ return;
+ }
- if (iCleanupInProgress && aMessage.Function() != EUsbHostMsUnRegisterInterface)
+ if (iCleanupInProgress && aMessage.Function() != EUsbHostMsUnRegisterInterface)
{
aMessage.Complete(KErrBadHandle);
return;
}
- r = iDeviceThread->QueueMsg(aMessage);
- if (r != KErrNone)
- {
- aMessage.Complete(r);
- return;
- }
+ r = iDeviceThread->QueueMsg(aMessage);
+ if (r != KErrNone)
+ {
+ aMessage.Complete(r);
+ return;
+ }
- if (iClientStatus && *iClientStatus == KRequestPending)
- {
- __HOSTPRINT(_L("Signaling device thread to handle message"));
- iThread.RequestComplete(iClientStatus, KErrNone);
- }
- }
+ if (iClientStatus && *iClientStatus == KRequestPending)
+ {
+ OstTrace0(TRACE_SHOSTMASSSTORAGE_HOST, CUSBHOSTMSSESSION_20,
+ "Signaling device thread to handle message");
+ iThread.RequestComplete(iClientStatus, KErrNone);
+ }
+ }
void CUsbHostMsSession::CreateDeviceThreadL(const RMessage2& aMessage)
- {
- __MSFNLOG
- THostMassStorageConfig msDeviceConfig;
- TPtr8 ptr((TUint8*)&msDeviceConfig,sizeof(THostMassStorageConfig));
+ {
+ THostMassStorageConfig msDeviceConfig;
+ TPtr8 ptr((TUint8*)&msDeviceConfig,sizeof(THostMassStorageConfig));
- aMessage.ReadL(0, ptr);
- __HOSTPRINT1(_L("EUsbHostMsRegisterInterface Token=%d "), msDeviceConfig.iInterfaceToken);
+ aMessage.ReadL(0, ptr);
+ OstTrace1(TRACE_SHOSTMASSSTORAGE_HOST, CUSBHOSTMSSESSION_21,
+ "EUsbHostMsRegisterInterface Token=%d ", msDeviceConfig.iInterfaceToken);
TBuf<32> nameBuf;
- nameBuf.Format(_L("Host Ms Thread%8x"), msDeviceConfig.iInterfaceToken);
- iDeviceThread = CUsbHostMsDeviceThread::NewL(*this, msDeviceConfig.iInterfaceToken);
+ nameBuf.Format(_L("Host Ms Thread%8x"), msDeviceConfig.iInterfaceToken);
+ iDeviceThread = CUsbHostMsDeviceThread::NewL(*this, msDeviceConfig.iInterfaceToken);
- RHeap* h = (RHeap*)&User::Allocator();
- TInt maxsize = h->MaxLength(); // loader heap max size = file server heap max size
- const TUint KHeapMinSize = 2048;
+ RHeap* h = (RHeap*)&User::Allocator();
+ TInt maxsize = h->MaxLength(); // loader heap max size = file server heap max size
+ const TUint KHeapMinSize = 2048;
- TInt r = iThread.Create(nameBuf, CUsbHostMsDeviceThread::Entry, KDefaultStackSize, KHeapMinSize, maxsize, iDeviceThread);
- if(r != KErrNone)
- {
- delete iDeviceThread;
+ TInt r = iThread.Create(nameBuf, CUsbHostMsDeviceThread::Entry, KDefaultStackSize, KHeapMinSize, maxsize, iDeviceThread);
+ if(r != KErrNone)
+ {
+ delete iDeviceThread;
iDeviceThread = NULL;
- User::Leave(r);
- }
- iThread.SetPriority(EPriorityAbsoluteForeground);
- TRequestStatus status;
- iThread.Rendezvous(status);
- iThread.Resume();
- User::WaitForRequest(status);
- if(status != KErrNone)
- {
- delete iDeviceThread;
+ User::Leave(r);
+ }
+ iThread.SetPriority(EPriorityAbsoluteForeground);
+ TRequestStatus status;
+ iThread.Rendezvous(status);
+ iThread.Resume();
+ User::WaitForRequest(status);
+ if(status != KErrNone)
+ {
+ delete iDeviceThread;
iDeviceThread = NULL;
- iThread.Kill(KErrNone);
- User::Leave(status.Int());
- }
- }
+ iThread.Kill(KErrNone);
+ User::Leave(status.Int());
+ }
+ }
void CUsbHostMsSession::MessageRequest(TRequestStatus& aStatus)
{
- __MSFNLOG
iClientStatus = &aStatus;
*iClientStatus = KRequestPending;
}