From owner-svn-src-all@freebsd.org Sat Mar 28 23:10:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 44FBB269E7D for ; Sat, 28 Mar 2020 23:10:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qZFz4nhtz3DS3 for ; Sat, 28 Mar 2020 23:10:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x835.google.com with SMTP id e14so12028248qts.2 for ; Sat, 28 Mar 2020 16:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DYAeTEHYwQ/LaWVTloMTg3nINdJvhr1h9/bWJhOGudg=; b=dTS+0w59UaSfLP+DQBOHM/0G+EOMb7hYQJWkNiDGn9A7sgfF2qCYM/LIVXyrYXI0UI 4uZ8B0qh7gCtLNQNdtazonRXm2q9nUw7A7VrRjJpDRlR6PJb0m6ytk7gq32Qs4RSfCuw w60zE6YDSiVvHRO47sEwNUT4Yw2YGf7PIeSIp2alj60+cFQeSgdzlXwAP4R0zKcmpmWy lL9H3V5+ilQzzVgGHaJN32VpWsIy3znGvAY9gvJAaSAs4bOE7NDG42yD3H7Ej3qiKzSU JtB4GG6L0OGkUNN4blQ8NJ4Q9zzi13VG1SxnTaoTCH4eS0k2AHR7wZPDpcN0j7SamK5d kRzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DYAeTEHYwQ/LaWVTloMTg3nINdJvhr1h9/bWJhOGudg=; b=ia4iA11mCqYbxan824ix/FGmBhmvs6JYxCwKxJwEByeX3Ghuug8Hvv8PQ9YoF/wvz3 yca1Taatuml8FrWXu99nK9pvL/brto4FWxcoW+eHvS7ZtMbLGY2viApiBe2WvfxbRPW3 dj4T6tlHhRpkwI71j8dzSDiFvitVo1yyLTq/qHdBQcas3zKo5gBM0PjaRLPuImx0Fr8s ABAWqGuuI142NnYQI7gRuXDpDvZrYGKAe5eF9tpOP3OxrNjykj0ADOngnA8x+6lEFRGF kDRZu2/VdO4s4x+WeIH/18NMLDUehDdpNdzHEh1+GaZ6GvhudUvKzK3SwFq61IwCXPMg 2ARQ== X-Gm-Message-State: ANhLgQ0K9mU/E6+4BDHNXh3wvaCFjMWc2RS1VBn4aPKENDRDvLfe3dC3 fRZmbhhroQS8+CtWEgU1to/yIweIwUk0GtkfcXf1gg== X-Google-Smtp-Source: ADFU+vuvzAuZwKQHwiNTbGWWBwFZf5yodJcvNo8KH63J3OEAgzNjRZT5FMkQsZygZwrO+eyZ8q+2rsBWvwdJY5Raz0Y= X-Received: by 2002:ac8:4449:: with SMTP id m9mr5717299qtn.175.1585437039888; Sat, 28 Mar 2020 16:10:39 -0700 (PDT) MIME-Version: 1.0 References: <202003282147.02SLljCo067522@repo.freebsd.org> In-Reply-To: <202003282147.02SLljCo067522@repo.freebsd.org> From: Warner Losh Date: Sat, 28 Mar 2020 17:10:28 -0600 Message-ID: Subject: Re: svn commit: r359407 - head/stand/libsa To: Toomas Soome Cc: src-committers , svn-src-all , svn-src-head@freebsd.org X-Rspamd-Queue-Id: 48qZFz4nhtz3DS3 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=dTS+0w59; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::835) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.03 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; URI_COUNT_ODD(1.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[5.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.03)[ip: (-9.27), ipnet: 2607:f8b0::/32(-0.36), asn: 15169(-0.46), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 23:11:02 -0000 On Sat, Mar 28, 2020, 3:49 PM Toomas Soome wrote: > Author: tsoome > Date: Sat Mar 28 21:47:44 2020 > New Revision: 359407 > URL: https://svnweb.freebsd.org/changeset/base/359407 > > Log: > loader: add knob to build with user malloc > > This option is intended to aid development, to allow building with user > malloc. > The use case would be to build userboot & test with libc (or other) > malloc and > use extra malloc debug features. > > Modified: > head/stand/libsa/stand.h > > Modified: head/stand/libsa/stand.h > > ============================================================================== > --- head/stand/libsa/stand.h Sat Mar 28 20:43:15 2020 (r359406) > +++ head/stand/libsa/stand.h Sat Mar 28 21:47:44 2020 (r359407) > @@ -436,7 +436,14 @@ extern void mallocstats(void); > > const char *x86_hypervisor(void); > > -#ifdef DEBUG_MALLOC > +#ifdef USER_MALLOC > +extern void *malloc(size_t); > +extern void *memalign(size_t, size_t); > +extern void *calloc(size_t, size_t); > +extern void free(void *); > +extern void *realloc(void *, size_t); > +extern void *reallocf(void *, size_t); > +#elif DEBUG_MALLOC > This is missing a defined(). Warner > #define malloc(x) Malloc(x, __FILE__, __LINE__) > #define memalign(x, y) Memalign(x, y, __FILE__, __LINE__) > #define calloc(x, y) Calloc(x, y, __FILE__, __LINE__) >