MCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/sfile/sf_plugin

equal deleted inserted replaced

-:a41df078684a
+:4122176ea935
 		}
 	err = InitPlugin(*pP);
 	if(err != KErrNone)
 		{
-		pP->Close();
 		return err;
 		}
 	aPluginFactory.IncrementMounted();
 	return KErrNone;
 	}
 /**
 Dismounts a plugin
 Must be called with the plugin chain locked.
 */
 void FsPluginManager::DismountPlugin(CFsPluginFactory& aPluginFactory,TInt aPos)
 	{
 	CFsPlugin* plugin=iPluginChain[aPos];
 		// Check if there is any requests for this plugin
 		// if so, deliver them to the next supporting plugin
 		TransferRequests(plugin->iThreadP);
 		plugin->iThreadP=NULL;
+		//Remove the plugin from the chain
 		iPluginChain.Remove(aPos);
 		iPluginChain.Compress();
-		//Need this to remove it from container
+	    //Close the plugin (destructed when CPluginThread is destructed).
-		//plugin->Close() deletes plugin.
 		plugin->Close();
 		plugin=NULL;
 		}
 	else
 		{
 /**
 Transfer any outstanding requests to next/previous plugin depending on
 if it is post filter or not
+Must be called with the plugin chain locked.
+Attains plugin-thread's listlock.
 */
 void FsPluginManager::TransferRequests(CPluginThread* aPluginThread)
 	{
 	aPluginThread->iListLock.Wait();
 	return((CFsPluginFactory*)iPluginFactories->At(h));
 	}
 /**
 Find the next plugin that supports the operation
+@param aPlugin - On calling the function this may contain either NULL or the current plugin.
+If it is called with NULL, then we start to look for plugins from the beginning of the chain.
+If is is called with a plugin then we start to look after that plugin for the next one.
+On return, aPlugin shall contain either a plugin or NULL.
+@param aLock - If this is set to ETRUE, then the function shall lock the plugin chain.
+If this is set to EFALSE, then the caller of the function MUST already hold the lock.
 @param aCheckCurrentOperation - Optional, if false, will return the next plugin,
 								whether the plugin is currently registered
-								for the current function of not. (so long as mounted on the current drive)
+								for the current function or not. (so long as mounted on the current drive)
 */
 TInt FsPluginManager::NextPlugin(CFsPlugin*& aPlugin, CFsMessageRequest* aMsgRequest,TBool aLock, TBool aCheckCurrentOperation)
 	{
 	if(aMsgRequest->DirectToDrive())
 		{
 		aPlugin = NULL;
 		return KErrNotFound;
 		}
-	TInt r = KErrNone;
 	TInt start;
 	TInt function = aMsgRequest->Operation()->Function();
 	TInt drive = aMsgRequest->DriveNumber();
 	if(aLock)
 	    LockChain();
+	//the plugin chain lock must be held by this point.
 	TInt count = iPluginChain.Count();
 	if(aPlugin == NULL)
 		start=0;
 	else
 					{
 					aPlugin = iPluginChain[i];
 					if(aLock)
 					    UnlockChain();
-					return(r);
+					return KErrNone;
 					}
 				}
 			}
 		}
 	aPlugin = NULL;
 	if(aLock)
 	    UnlockChain();
-	return(KErrNotFound);
+	return KErrNotFound;
 	}
 /**
 Find the next plugin that supports the operation
+@see FsPluginManager::NextPlugin
 */
 TInt FsPluginManager::PrevPlugin(CFsPlugin*& aPlugin, CFsMessageRequest* aMsgRequest, TBool aLock)
 	{
 	if(aMsgRequest->DirectToDrive() && (aMsgRequest->CurrentOperationPtr() != NULL))
 		{
 		aPlugin = NULL;
 		return KErrNotFound;
 		}
-	TInt r = KErrNone;
 	TInt start;
 	TInt function = aMsgRequest->Operation()->Function();
 	TInt drive = aMsgRequest->DriveNumber();
 	if(aLock)
 	    LockChain();
+	//the plugin chain lock must be held by this point.
 	TInt count= iPluginChain.Count();
 	if(aPlugin == NULL)
 		start = count-1;
 	else
 					{
 					aPlugin = iPluginChain[i];
 					if(aLock)
 					    UnlockChain();
-					return(r);
+					return KErrNone;
 					}
 				}
 			}
 		}
 	aPlugin = NULL;
 	if(aLock)
 	    UnlockChain();
-	return(KErrNotFound);
+	return KErrNotFound;
 	}
 /**
 Inserts the plugin in the stack (chain)
 if aPos absolute postion, it simply inserts it
 	{
 	CFsPlugin* pP = FindByUniquePosition(aUniquePosition);
 	if(pP != NULL)
 		{
 		CFsPluginConn* pC = pP->NewPluginConnL();
+		CleanupStack::PushL(pC);
 		pC->iPluginP = pP;
 		pC->iClientId = aClientId;
 		iPluginConns->AddL(pC, ETrue);
+		CleanupStack::Pop(pC);
 		return pC;
 		}
 	User::Leave(KErrNotFound);
 	return NULL;
 		}
 	}
 void FsPluginManager::CompleteSessionRequests(CSessionFs* aSession, TInt aValue, CFsInternalRequest* aRequest)
 /**
-Complete outstanding requests for the specified session
+* Complete outstanding requests for the specified session
 */
 	{
 	__PRINT2(_L("FsPluginManager::CompleteSessionRequests(%08x, %d)"), aSession, aValue);
 	// Iterate through all plugins, cancelling outstanding session requests
 	aRequest->Set(CancelPluginOp, aSession);

changeset 2	4122176ea935
parent 0	a41df078684a
child 36	bbf8bed59bcb