From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id A83633857829 for ; Tue, 23 Mar 2021 20:43:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A83633857829 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-158-1PEdLFkGP8yeX1GjRGtMbQ-1; Tue, 23 Mar 2021 16:43:21 -0400 X-MC-Unique: 1PEdLFkGP8yeX1GjRGtMbQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3C24593A0; Tue, 23 Mar 2021 20:43:20 +0000 (UTC) Received: from rhel8.vm.delorie.com (ovpn-112-40.rdu2.redhat.com [10.10.112.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F20460877; Tue, 23 Mar 2021 20:43:20 +0000 (UTC) Received: from rhel8.vm.redhat.com (localhost [127.0.0.1]) by rhel8.vm.delorie.com (8.15.2/8.15.2) with ESMTP id 12NKhJT5047882; Tue, 23 Mar 2021 16:43:19 -0400 From: DJ Delorie To: Szabolcs Nagy Cc: libc-alpha@sourceware.org Subject: Re: [PATCH 4/6] malloc: Rename chunk2rawmem In-Reply-To: <39adedfcc466045b1087f037f35ca437991e1c17.1616155129.git.szabolcs.nagy@arm.com> (message from Szabolcs Nagy on Fri, 19 Mar 2021 13:27:10 +0000) Date: Tue, 23 Mar 2021 16:43:19 -0400 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2021 20:43:26 -0000 Szabolcs Nagy writes: > Replaced tag_at (chunk2rawmem (x)) with chunk2mem_tag (x). > Renamed chunk2rawmem to chunk2mem. LGTM. Reviewed-by: DJ Delorie > - (void)tag_region (chunk2rawmem (p), memsize (p)); > + (void)tag_region (chunk2mem (p), memsize (p)); Ok. > - newmem = tag_at (chunk2rawmem (newp)); > + newmem = chunk2mem_tag (newp); Ok. > -#define chunk2rawmem(p) ((void*)((char*)(p) + CHUNK_HDR_SZ)) > +#define chunk2mem(p) ((void*)((char*)(p) + CHUNK_HDR_SZ)) Ok. > -/* Convert between user mem pointers and chunk pointers, updating any > - memory tags on the pointer to respect the tag value at that > - location. */ > -#define chunk2mem(p) ((void *)tag_at (((char*)(p) + CHUNK_HDR_SZ))) > +/* Convert a chunk address to a user mem pointer and extract the right tag. */ > +#define chunk2mem_tag(p) ((void*)tag_at ((char*)(p) + CHUNK_HDR_SZ)) > + > +/* Convert a user mem pointer to a chunk address and extract the right tag. */ > #define mem2chunk(mem) ((mchunkptr)tag_at (((char*)(mem) - CHUNK_HDR_SZ))) Ok. > #define misaligned_chunk(p) \ > - ((uintptr_t)(MALLOC_ALIGNMENT == CHUNK_HDR_SZ ? (p) : chunk2rawmem (p)) \ > + ((uintptr_t)(MALLOC_ALIGNMENT == CHUNK_HDR_SZ ? (p) : chunk2mem (p)) \ > & MALLOC_ALIGN_MASK) Ok. > - assert (aligned_OK (chunk2rawmem (p))); > + assert (aligned_OK (chunk2mem (p))); Ok. > - assert (aligned_OK (chunk2rawmem (p))); > + assert (aligned_OK (chunk2mem (p))); Ok. > - assert (aligned_OK (chunk2rawmem (p))); > + assert (aligned_OK (chunk2mem (p))); Ok. > - /* For glibc, chunk2rawmem increases the address by > + /* For glibc, chunk2mem increases the address by Ok. > - assert (((INTERNAL_SIZE_T) chunk2rawmem (mm) & MALLOC_ALIGN_MASK) == 0); > + assert (((INTERNAL_SIZE_T) chunk2mem (mm) & MALLOC_ALIGN_MASK) == 0); Ok. > - front_misalign = (INTERNAL_SIZE_T) chunk2rawmem (mm) & MALLOC_ALIGN_MASK; > + front_misalign = (INTERNAL_SIZE_T) chunk2mem (mm) & MALLOC_ALIGN_MASK; Ok. > - return chunk2rawmem (p); > + return chunk2mem (p); Ok. > - front_misalign = (INTERNAL_SIZE_T) chunk2rawmem (brk) & MALLOC_ALIGN_MASK; > + front_misalign = (INTERNAL_SIZE_T) chunk2mem (brk) & MALLOC_ALIGN_MASK; Ok. > - assert (((unsigned long) chunk2rawmem (brk) & MALLOC_ALIGN_MASK) == 0); > + assert (((unsigned long) chunk2mem (brk) & MALLOC_ALIGN_MASK) == 0); Ok. > - front_misalign = (INTERNAL_SIZE_T) chunk2rawmem (brk) & MALLOC_ALIGN_MASK; > + front_misalign = (INTERNAL_SIZE_T) chunk2mem (brk) & MALLOC_ALIGN_MASK; Ok. > - return chunk2rawmem (p); > + return chunk2mem (p); Ok. > - uintptr_t mem = (uintptr_t) chunk2rawmem (p); > + uintptr_t mem = (uintptr_t) chunk2mem (p); Ok. > - uintptr_t mem = (uintptr_t) chunk2rawmem(p); > + uintptr_t mem = (uintptr_t) chunk2mem(p); Ok. > - assert (aligned_OK (chunk2rawmem (p))); > + assert (aligned_OK (chunk2mem (p))); Ok. > - tcache_entry *e = (tcache_entry *) chunk2rawmem (chunk); > + tcache_entry *e = (tcache_entry *) chunk2mem (chunk); Ok. > - (void)tag_region (chunk2rawmem (p), memsize (p)); > + (void)tag_region (chunk2mem (p), memsize (p)); Ok. > - void *newmem = tag_at (chunk2rawmem (newp)); > + void *newmem = chunk2mem_tag (newp); Ok. > - (void) tag_region (chunk2rawmem (oldp), sz); > + (void) tag_region (chunk2mem (oldp), sz); Ok. > - void *p = chunk2rawmem (victim); > + void *p = chunk2mem (victim); Ok. > - void *p = chunk2rawmem (victim); > + void *p = chunk2mem (victim); Ok. > - void *p = chunk2rawmem (victim); > + void *p = chunk2mem (victim); Ok. > - void *p = chunk2rawmem (victim); > + void *p = chunk2mem (victim); Ok. > - void *p = chunk2rawmem (victim); > + void *p = chunk2mem (victim); Ok. > - void *p = chunk2rawmem (victim); > + void *p = chunk2mem (victim); Ok. > - void *p = chunk2rawmem (victim); > + void *p = chunk2mem (victim); Ok. > - tcache_entry *e = (tcache_entry *) chunk2rawmem (p); > + tcache_entry *e = (tcache_entry *) chunk2mem (p); Ok. > - free_perturb (chunk2rawmem(p), size - CHUNK_HDR_SZ); > + free_perturb (chunk2mem(p), size - CHUNK_HDR_SZ); Ok. > - free_perturb (chunk2rawmem(p), size - CHUNK_HDR_SZ); > + free_perturb (chunk2mem(p), size - CHUNK_HDR_SZ); Ok. > - return tag_new_usable (chunk2rawmem (oldp)); > + return tag_new_usable (chunk2mem (oldp)); Ok. > - void *oldmem = chunk2rawmem (oldp); > + void *oldmem = chunk2mem (oldp); Ok. > - return tag_new_usable (chunk2rawmem (newp)); > + return tag_new_usable (chunk2mem (newp)); Ok. > - return chunk2rawmem (newp); > + return chunk2mem (newp); Ok. > - (((unsigned long) (chunk2rawmem (p))) % alignment) == 0); > + (((unsigned long) (chunk2mem (p))) % alignment) == 0); Ok. > - return chunk2rawmem (p); > + return chunk2mem (p); Ok. > - assert ((char *) chunk2rawmem (p) + 2 * CHUNK_HDR_SZ > + assert ((char *) chunk2mem (p) + 2 * CHUNK_HDR_SZ Ok.