From owner-svn-src-head@freebsd.org Wed Oct 2 12:59:09 2019 Return-Path: Delivered-To: svn-src-head@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 60AF412E58C for ; Wed, 2 Oct 2019 12:59:09 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46jx6P215Nz4NHt for ; Wed, 2 Oct 2019 12:59:09 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 189F8AE10 for ; Wed, 2 Oct 2019 12:59:09 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f171.google.com with SMTP id r5so26211442qtd.0 for ; Wed, 02 Oct 2019 05:59:09 -0700 (PDT) X-Gm-Message-State: APjAAAVbE9IgRvwCKWMd2z7ezihzUHnnEYudE3i7uVxBJyi97J1SOQ0c e7N3Nan59vUMZlr/qAPAZr8wWA0IR8nA2W/qofo= X-Received: by 2002:a0c:e20c:: with SMTP id q12mt2499418qvl.214.1570021148476; Wed, 02 Oct 2019 05:59:08 -0700 (PDT) MIME-Version: 1.0 References: <201809141341.w8EDfbtO070815@repo.freebsd.org> In-Reply-To: From: Kyle Evans Date: Wed, 2 Oct 2019 07:58:57 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r338679 - head/lib/libusb Cc: Hans Petter Selasky , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2019 12:59:09 -0000 On Wed, Oct 2, 2019 at 7:55 AM Kyle Evans wrote: > > On Fri, Sep 14, 2018 at 8:41 AM Hans Petter Selasky > wrote: > > > > Author: hselasky > > Date: Fri Sep 14 13:41:37 2018 > > New Revision: 338679 > > URL: https://svnweb.freebsd.org/changeset/base/338679 > > > > Log: > > Improve LibUSB debugging by simultaneously allowing both function > > and transfer prints. Make sure the debug level comes from the > > correct USB context. > > > > Found by: Ludovic Rousseau > > PR: 231264 > > MFC after: 1 week > > Approved by: re (kib) > > Sponsored by: Mellanox Technologies > > > > Modified: > > head/lib/libusb/libusb10.h > > head/lib/libusb/libusb10_io.c > > > > Modified: head/lib/libusb/libusb10.h > > ============================================================================== > > --- head/lib/libusb/libusb10.h Fri Sep 14 01:52:34 2018 (r338678) > > +++ head/lib/libusb/libusb10.h Fri Sep 14 13:41:37 2018 (r338679) > > @@ -41,22 +41,24 @@ > > #define HOTPLUG_LOCK(ctx) pthread_mutex_lock(&(ctx)->hotplug_lock) > > #define HOTPLUG_UNLOCK(ctx) pthread_mutex_unlock(&(ctx)->hotplug_lock) > > > > -#define DPRINTF(ctx, dbg, format, args...) do { \ > > - if ((ctx)->debug == dbg) { \ > > - switch (dbg) { \ > > - case LIBUSB_DEBUG_FUNCTION: \ > > - printf("LIBUSB_FUNCTION: " \ > > - format "\n", ## args); \ > > - break; \ > > - case LIBUSB_DEBUG_TRANSFER: \ > > - printf("LIBUSB_TRANSFER: " \ > > - format "\n", ## args); \ > > - break; \ > > - default: \ > > - break; \ > > - } \ > > - } \ > > -} while(0) > > +#define DPRINTF(ctx, dbg, format, ...) do { \ > > + switch (dbg) { \ > > + case LIBUSB_DEBUG_FUNCTION: \ > > + if ((ctx)->debug & LIBUSB_DEBUG_FUNCTION) { \ > > + printf("LIBUSB_FUNCTION: " \ > > + format "\n", ## __VA_ARGS__); \ > > + } \ > > + break; \ > > + case LIBUSB_DEBUG_TRANSFER: \ > > + if ((ctx)->debug & LIBUSB_DEBUG_TRANSFER) { \ > > + printf("LIBUSB_TRANSFER: " \ > > + format "\n", ## __VA_ARGS__); \ > > + } \ > > + break; \ > > + default: \ > > + break; \ > > + } \ > > +} while (0) > > > > /* internal structures */ > > > > Hi, > > How are people/users of libusb supposed to disable these messages > after this? The only thing stopping them was the debug level in the > context, I guess, because DPRINTF is always compiled to this and the > users of DPRINTF are just invoking it all willy-nilly. > Sorry, I missed that the (ctx)->debug checks just moved a little further in... debugging a little better, because LIBUSB_DEBUG=0 doesn't seem to do the trick for this person.