From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: liming.gao@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Sun, 08 Sep 2019 20:41:43 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Sep 2019 20:41:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,483,1559545200"; d="scan'208";a="174859004" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga007.jf.intel.com with ESMTP; 08 Sep 2019 20:41:43 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 8 Sep 2019 20:41:43 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 8 Sep 2019 20:41:42 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.32]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.195]) with mapi id 14.03.0439.000; Mon, 9 Sep 2019 11:41:40 +0800 From: "Liming Gao" To: "Feng, Bob C" , "devel@edk2.groups.io" CC: "Shi, Steven" Subject: Re: [Patch 1/1] BaseTools: Fixed build clean regression issue Thread-Topic: [Patch 1/1] BaseTools: Fixed build clean regression issue Thread-Index: AQHVZqvwkyq0tNuChEmA+JA2OSg6Bacinr8g Date: Mon, 9 Sep 2019 03:41:40 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4F46C4@SHSMSX104.ccr.corp.intel.com> References: <20190909011427.30808-1-bob.c.feng@intel.com> In-Reply-To: <20190909011427.30808-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGY0ZmJlODctYzMyNC00ZDZjLWI0NDAtYWU0MjZjN2MxMmI5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiSkozR0VWVmpIYjgyeUlvMlFjU0JUYkg0M3Y3dEdSNjJ5MFI5azk2a1NwWVp2MjQ5R0owT2o5U2ZBbkdjRUZweiJ9 x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Feng, Bob C > Sent: Monday, September 9, 2019 9:14 AM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Shi, Steven ; Feng, Bob C > Subject: [Patch 1/1] BaseTools: Fixed build clean regression issue >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2166 >=20 > file_lock and cache_lock are used as global data, > so move file_lock and cache_lock initialization in Build > object __init__ function. >=20 > Cc: Liming Gao > Cc: Steven Shi > Signed-off-by: Bob Feng > --- > BaseTools/Source/Python/build/build.py | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Py= thon/build/build.py > index 0406ac314b65..cf82c29b7eb9 100755 > --- a/BaseTools/Source/Python/build/build.py > +++ b/BaseTools/Source/Python/build/build.py > @@ -810,27 +810,25 @@ class Build(): > self.AutoGenMgr =3D None > EdkLogger.info("") > os.chdir(self.WorkspaceDir) > GlobalData.gCacheIR =3D Manager().dict() > self.log_q =3D log_q > + GlobalData.file_lock =3D mp.Lock() > + GlobalData.cache_lock =3D mp.Lock() > def StartAutoGen(self,mqueue, DataPipe,SkipAutoGen,PcdMaList,share_d= ata): > try: > if SkipAutoGen: > return True,0 > feedback_q =3D mp.Queue() > - file_lock =3D mp.Lock() > error_event =3D mp.Event() > - GlobalData.file_lock =3D file_lock > - cache_lock =3D mp.Lock() > - GlobalData.cache_lock =3D cache_lock > FfsCmd =3D DataPipe.Get("FfsCommand") > if FfsCmd is None: > FfsCmd =3D {} > GlobalData.FfsCmd =3D FfsCmd > GlobalData.libConstPcd =3D DataPipe.Get("LibConstPcd") > GlobalData.Refes =3D DataPipe.Get("REFS") > - auto_workers =3D > [AutoGenWorkerInProcess(mqueue,DataPipe.dump_file,feedback_q,file_lock,ca= che_lock,share_data,self.log_q,error_event) for _ in > range(self.ThreadNumber)] > + auto_workers =3D > [AutoGenWorkerInProcess(mqueue,DataPipe.dump_file,feedback_q,GlobalData.f= ile_lock,GlobalData.cache_lock,share_data,self.log_q,error > _event) for _ in range(self.ThreadNumber)] > self.AutoGenMgr =3D AutoGenManager(auto_workers,feedback_q,e= rror_event) > self.AutoGenMgr.start() > for w in auto_workers: > w.start() > if PcdMaList is not None: > -- > 2.20.1.windows.1