From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6ECDF803A7 for ; Thu, 9 Mar 2017 22:15:21 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP; 09 Mar 2017 22:15:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,139,1486454400"; d="scan'208";a="1140369498" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by fmsmga002.fm.intel.com with ESMTP; 09 Mar 2017 22:15:19 -0800 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Star Zeng Date: Fri, 10 Mar 2017 14:15:20 +0800 Message-Id: <20170310061520.22376-1-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 Subject: [PATCH] MdeModulePkg/PlatVarCleanupLib: Add lib destructor for unclosed event X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Mar 2017 06:15:21 -0000 Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c | 33 ++++++++++++++++++-- MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf | 3 +- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c b/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c index b96f8ddd83..c5fd30e219 100644 --- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c +++ b/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c @@ -1,7 +1,7 @@ /** @file Sample platform variable cleanup library implementation. -Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -22,6 +22,8 @@ EDKII_VAR_CHECK_PROTOCOL *mVarCheck = NULL; /// BOOLEAN mEndOfDxe = FALSE; +EFI_EVENT mPlatVarCleanupLibEndOfDxeEvent = NULL; + LIST_ENTRY mUserVariableList = INITIALIZE_LIST_HEAD_VARIABLE (mUserVariableList); UINT16 mUserVariableCount = 0; UINT16 mMarkedUserVariableCount = 0; @@ -1229,7 +1231,6 @@ PlatformVarCleanupLibConstructor ( ) { EFI_STATUS Status; - EFI_EVENT Event; mLastVarErrorFlag = InternalGetVarErrorFlag (); DEBUG ((EFI_D_INFO, "mLastVarErrorFlag - 0x%02x\n", mLastVarErrorFlag)); @@ -1243,10 +1244,36 @@ PlatformVarCleanupLibConstructor ( PlatformVarCleanupEndOfDxeEvent, NULL, &gEfiEndOfDxeEventGroupGuid, - &Event + &mPlatVarCleanupLibEndOfDxeEvent ); ASSERT_EFI_ERROR (Status); return EFI_SUCCESS; } +/** + The destructor function closes the End of DXE event. + + @param ImageHandle The firmware allocated handle for the EFI image. + @param SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The destructor completed successfully. + +**/ +EFI_STATUS +EFIAPI +PlatformVarCleanupLibDestructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + // + // Close the End of DXE event. + // + Status = gBS->CloseEvent (mPlatVarCleanupLibEndOfDxeEvent); + ASSERT_EFI_ERROR (Status); + + return EFI_SUCCESS; +} diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf b/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf index a3498cca50..6e7fcb6a5c 100644 --- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf +++ b/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf @@ -1,7 +1,7 @@ ## @file # Sample platform variable cleanup library instance. # -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions @@ -23,6 +23,7 @@ VERSION_STRING = 1.0 LIBRARY_CLASS = PlatformVarCleanupLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER CONSTRUCTOR = PlatformVarCleanupLibConstructor + DESTRUCTOR = PlatformVarCleanupLibDestructor # # The following information is for reference only and not required by the build tools. -- 2.12.0.windows.1