From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.1 To: devel@lists.altlinux.org References: <20191206131606.83061-1-darktemplar@altlinux.org> <20191208225047.GA30742@altlinux.org> From: Aleksei Nikiforov Message-ID: <736ed459-fc98-d770-cfb3-8c4bf7477532@altlinux.org> Date: Mon, 9 Dec 2019 09:58:55 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20191208225047.GA30742@altlinux.org> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Language: ru Content-Transfer-Encoding: 8bit Subject: Re: [devel] [PATCH for apt 1/2] Add option for debugging DynamicMMap::Allocate X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2019 07:00:08 -0000 Archived-At: List-Archive: List-Post: 09.12.2019 1:50, Dmitry V. Levin пишет: > On Fri, Dec 06, 2019 at 04:16:05PM +0300, Aleksei Nikiforov wrote: >> --- >> apt/apt-pkg/contrib/mmap.cc | 15 +++++++++++++++ >> apt/doc/apt.conf.5.sgml | 2 +- >> 2 files changed, 16 insertions(+), 1 deletion(-) > > I suggest adding the name of the new option to the commit message > so it would be git-grep'able, for example: > > Add Debug::DynamicMMap::Allocate option > > Add a new option for debugging DynamicMMap::Allocate. > But option name is already in commit message. See the email subject which is also a part of commit message. Why is it needed to duplicate it? I'll update option name in subject to completely match full option name. >> diff --git a/apt/apt-pkg/contrib/mmap.cc b/apt/apt-pkg/contrib/mmap.cc >> index a3b06cc..cf01be9 100644 >> --- a/apt/apt-pkg/contrib/mmap.cc >> +++ b/apt/apt-pkg/contrib/mmap.cc >> @@ -265,6 +265,21 @@ std::experimental::optional DynamicMMap::Allocate(unsigned long Item >> // No pool is allocated, use an unallocated one >> if (I == Pools + PoolCount) >> { >> + static const bool debug_grow = _config->FindB("Debug::DynamicMMap::Allocate", false); >> + >> + if (debug_grow) >> + { >> + Pool *pool_iter = Pools; >> + size_t pool_idx = 0; >> + >> + _error->Warning(_("DynamicMMap::Allocate: allocating item of size %lu"), ItemSize); >> + >> + for (; pool_idx < PoolCount; ++pool_iter, ++pool_idx) >> + { >> + _error->Warning(_("DynamicMMap::Allocate: Pool %zu, item size: %lu, start: %lu, count: %lu"), pool_idx, pool_iter->ItemSize, pool_iter->Start, pool_iter->Count); >> + } >> + } > > Nitpicking: > - this is debugging, there is no need to optimize, so there is no need for > pool_iter; > - let's use "for" loop initial declarations, they are widely used in apt > already; > - the type of iterator should be the same as the type of PoolCount; > - lines are too long. > > Consider something like this (untested): > > if (debug_grow) { > _error->Warning(_("DynamicMMap::Allocate: allocating item of size %lu"), > ItemSize); > > for (unsigned int i = 0; i < PoolCount; ++i) { > _error->Warning(_("DynamicMMap::Allocate: Pool %u, item size: %lu" > ", start: %lu, count: %lu"), > i, Pools[i].ItemSize, > Pools[i].Start, Pools[i].Count); > } > } > >> // Woops, we ran out, the calling code should allocate more. >> if (Empty == 0) >> { >> diff --git a/apt/doc/apt.conf.5.sgml b/apt/doc/apt.conf.5.sgml >> index 0a72e45..72fc0c3 100644 >> --- a/apt/doc/apt.conf.5.sgml >> +++ b/apt/doc/apt.conf.5.sgml >> @@ -526,7 +526,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; >> disable the inclusion of statfs data in CDROM IDs. >> >> To debug issues related to dynamic memory allocation, an option >> - > + > As we've got two options now, I suggest s/an option/options/ . > > Thanks, I'll update this text. > > _______________________________________________ > Devel mailing list > Devel@lists.altlinux.org > https://lists.altlinux.org/mailman/listinfo/devel >