diff -r f92a4f87e424 -r 012cc2ee6408 usbmgmt/usbmgr/usbman/server/SRC/CUsbServer.cpp --- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbServer.cpp Tue Aug 31 17:01:47 2010 +0300 +++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbServer.cpp Wed Sep 01 12:35:00 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -21,26 +21,25 @@ */ #include -#include #include "UsbSettings.h" #include "CUsbServer.h" #include "CUsbSession.h" #include "CUsbDevice.h" #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV -#include //Publish & Subscribe header #include "CUsbOtg.h" #include "cusbhost.h" +#include //Publish & Subscribe header #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV +#include #include "UsbmanServerSecurityPolicy.h" -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "CUsbServerTraces.h" +#include + +#ifdef __FLOG_ACTIVE +_LIT8(KLogComponent, "USBSVR"); #endif - - /** * The CUsbServer::NewL method * @@ -52,13 +51,12 @@ */ CUsbServer* CUsbServer::NewLC() { - OstTraceFunctionEntry0( CUSBSERVER_NEWLC_ENTRY ); + LOG_STATIC_FUNC_ENTRY CUsbServer* self = new(ELeave) CUsbServer; CleanupStack::PushL(self); self->StartL(KUsbServerName); self->ConstructL(); - OstTraceFunctionExit0( CUSBSERVER_NEWLC_EXIT ); return self; } @@ -72,7 +70,7 @@ */ CUsbServer::~CUsbServer() { - OstTraceFunctionEntry0( CUSBSERVER_CUSBSERVER_DES_ENTRY ); + LOG_FUNC delete iShutdownTimer; delete iUsbDevice; @@ -82,21 +80,21 @@ #ifndef __OVER_DUMMYUSBDI__ // Check that this is A-Device - OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER, "CUsbServer::~CUsbServer; Checking Id-Pin state..." ); + LOGTEXT(_L8("Checking Id-Pin state...")); TInt value = 0; TInt err = RProperty::Get(KUidUsbManCategory, KUsbOtgIdPinPresentProperty,value); if (err == 0 && value == 1) { // Ensure VBus is dropped when Usb server exits - OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP1, "CUsbServer::~CUsbServer; Checking VBus state..." ); + LOGTEXT(_L8("Checking VBus state...")); err = RProperty::Get(KUidUsbManCategory, KUsbOtgVBusPoweredProperty,value); if ( err == KErrNone && value != 0 ) { if ( iUsbOtg ) { err = iUsbOtg->BusDrop(); - OstTrace1( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP2, "CUsbServer::~CUsbServer;BusDrop() returned err = %d", err ); - OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP3, "CUsbServer::~CUsbServer; USBMAN will wait until VBus is actually dropped" ); + LOGTEXT2(_L8("BusDrop() returned err = %d"),err); + LOGTEXT(_L8("USBMAN will wait until VBus is actually dropped")); // Wait 1 second for Hub driver to perform VBus drop RTimer timer; err = timer.CreateLocal(); @@ -109,29 +107,31 @@ } else { - OstTrace1( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP4, "CUsbServer::~CUsbServer;Failed to create local timer: err = %d", err ); + LOGTEXT2(_L8("Failed to create local timer: err = %d"),err); } } else { - OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP5, "CUsbServer::~CUsbServer; Unexpected: OTG object is NULL" ); + LOGTEXT(_L8("Unexpected: OTG object is NULL")); } } else { - OstTraceExt2( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP6, "CUsbServer::~CUsbServer;VBus is already dropped or an error occured: err = %d, value =%d", err, value ); + LOGTEXT3(_L8("VBus is already dropped or an error occured: err = %d, value =%d"),err,value); } } else { - OstTraceExt2( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP7, "CUsbServer::~CUsbServer;No Id-Pin is found or an error occured: err = %d, value = %d", err, value ); + LOGTEXT3(_L8("No Id-Pin is found or an error occured: err = %d, value = %d"), err, value); } delete iUsbOtg; #endif #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV - OstTraceFunctionExit0( CUSBSERVER_CUSBSERVER_DES_EXIT ); +#ifdef __FLOG_ACTIVE + CUsbLog::Close(); +#endif } @@ -156,7 +156,12 @@ */ void CUsbServer::ConstructL() { - +#ifdef __FLOG_ACTIVE + // Set the logger up so that everything in this thread that logs using it + // will do so 'connectedly' (i.e. quickly). If this fails, we don't care- + // logging will still work, just 'statically' (i.e. slowly). + static_cast(CUsbLog::Connect()); +#endif iShutdownTimer = new(ELeave) CShutdownTimer; iShutdownTimer->ConstructL(); @@ -169,7 +174,7 @@ #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV iUsbDevice = CUsbDevice::NewL(*this); - OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL, "CUsbServer::ConstructL; About to load USB classes" ); + LOGTEXT(_L8("About to load USB classes")); iUsbDevice->EnumerateClassControllersL(); #ifndef USE_DUMMY_CLASS_CONTROLLER @@ -183,11 +188,11 @@ } else { - OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL_DUP1, "CUsbServer::ConstructL;Personalities unconfigured, so using fallback CCs" ); + LOGTEXT(_L8("Personalities unconfigured, so using fallback CCs")); iUsbDevice->LoadFallbackClassControllersL(); } #else // USE_DUMMY_CLASS_CONTROLLER - OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL_DUP2, "CUsbServer::ConstructL; Using Dummy Class Controller, so using fallback CCs" ); + LOGTEXT(_L8("Using Dummy Class Controller, so using fallback CCs")); iUsbDevice->LoadFallbackClassControllersL(); #endif // USE_DUMMY_CLASS_CONTROLLER @@ -199,7 +204,7 @@ iUsbHost->StartL(); #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV - OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL_DUP3, "CUsbServer::ConstructL; CUsbServer constructed" ); + LOGTEXT(_L8("CUsbServer constructed")); } @@ -216,24 +221,23 @@ */ CSession2* CUsbServer::NewSessionL(const TVersion &aVersion, const RMessage2& aMessage) const { - OstTraceFunctionEntry0( CUSBSERVER_NEWSESSIONL_ENTRY ); + LOG_LINE + LOG_FUNC (void)aMessage;//Remove compiler warning TVersion v(KUsbSrvMajorVersionNumber,KUsbSrvMinorVersionNumber,KUsbSrvBuildVersionNumber); - OstTrace0( TRACE_NORMAL, CUSBSERVER_NEWSESSIONL, "CUsbServer::NewSessionL; CUsbServer::NewSessionL - creating new session..." ); + LOGTEXT(_L8("CUsbServer::NewSessionL - creating new session...")); if (!User::QueryVersionSupported(v, aVersion)) { - OstTrace1( TRACE_NORMAL, CUSBSERVER_NEWSESSIONL_DUP1, "CUsbServer::NewSessionL;leave reason=%d", KErrNotSupported ); - User::Leave(KErrNotSupported); + LEAVEL(KErrNotSupported); } CUsbServer* ncThis = const_cast(this); CUsbSession* sess = CUsbSession::NewL(ncThis); - OstTraceFunctionExit0( CUSBSERVER_NEWSESSIONL_EXIT ); return sess; } @@ -245,7 +249,7 @@ */ void CUsbServer::Error(TInt aError) { - OstTrace1( TRACE_NORMAL, CUSBSERVER_ERROR, "CUsbServer::Error;aError=%d", aError ); + LOGTEXT2(_L8("CUsbServer::Error [aError=%d]"), aError); Message().Complete(aError); ReStart(); @@ -258,18 +262,13 @@ */ void CUsbServer::IncrementSessionCount() { - OstTraceFunctionEntry0( CUSBSERVER_INCREMENTSESSIONCOUNT_ENTRY ); - OstTrace1( TRACE_NORMAL, CUSBSERVER_INCREMENTSESSIONCOUNT, "CUsbServer::IncrementSessionCount;iSessionCount=%d", iSessionCount ); - if(iSessionCount < 0) - { - OstTrace1( TRACE_FATAL, CUSBSERVER_INCREMENTSESSIONCOUNT_DUP1, "CUsbServer::IncrementSessionCount;panic code=%d", EICSInvalidCount ); - __ASSERT_DEBUG(EFalse, User::Panic(KUsbSvrPncCat, EICSInvalidCount)); - } + LOGTEXT2(_L8(">CUsbServer::IncrementSessionCount %d"), iSessionCount); + __ASSERT_DEBUG(iSessionCount >= 0, _USB_PANIC(KUsbSvrPncCat, EICSInvalidCount)); ++iSessionCount; iShutdownTimer->Cancel(); - OstTraceFunctionExit0( CUSBSERVER_INCREMENTSESSIONCOUNT_EXIT ); + LOGTEXT(_L8(" 0, _USB_PANIC(KUsbSvrPncCat, EDCSInvalidCount)); --iSessionCount; @@ -305,17 +300,11 @@ */ void CUsbServer::LaunchShutdownTimerIfNoSessions() { - OstTraceFunctionEntry0( CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS_ENTRY ); -#ifdef _DEBUG - if(Device().ServiceState() != EUsbServiceIdle) - { - OstTrace1( TRACE_FATAL, CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS, "CUsbServer::LaunchShutdownTimerIfNoSessions;panic code=%d", ELSTNSNotIdle ); - User::Panic(KUsbSvrPncCat, ELSTNSNotIdle); - } -#endif + LOGTEXT(_L8("CUsbServer::LaunchShutdownTimerIfNoSessions")); + __ASSERT_DEBUG(Device().ServiceState() == EUsbServiceIdle, _USB_PANIC(KUsbSvrPncCat, ELSTNSNotIdle)); + if (iSessionCount == 0) iShutdownTimer->After(KShutdownDelay); - OstTraceFunctionExit0( CUSBSERVER_LAUNCHSHUTDOWNTIMERIFNOSESSIONS_EXIT ); } /**