From patchwork Tue Oct 13 14:55:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Colomar X-Patchwork-Id: 40714 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D66E33840C0A; Tue, 13 Oct 2020 14:56:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D66E33840C0A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1602600989; bh=uIzPA/SEhhSIGnkxC+T9EXOJ8Qf68HXrtAH4ZohUfUY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=A2Ngx0GNypZVa0On7ZCoy7j50OG1b4Ynsah/EekdqPCWupgfo61b+C/ASqySWjAPr SvRs7GVQAwaLYGLNTzY/S4l725LEfcr/PfKPSNgz+H98R9XJGkUUcvMESrw4ZswKyt 3gkhtSj7qNncLJ2bcWJ24d62Fyi7/rUIq1XIYMkE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by sourceware.org (Postfix) with ESMTPS id A15053851C15 for ; Tue, 13 Oct 2020 14:56:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A15053851C15 Received: by mail-wm1-x344.google.com with SMTP id q5so270853wmq.0 for ; Tue, 13 Oct 2020 07:56:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uIzPA/SEhhSIGnkxC+T9EXOJ8Qf68HXrtAH4ZohUfUY=; b=iOeBejU4pWnucGJxdhXOqMysCs6HEP6Yq7l3Tfmgn0DlVmvTa1DA3Y7T4TsCipRVU/ h6G9N5UvXzpBeTweeGMJK8vPC+9Unux72paEP7o/uA7MB0zTnOACtMp7uiytJNBClEYW hUUaDkSzZ0RsGSuPK7VKwUmeCo4AJMA9rIES+8xbyubFgcUZ82+q8CgQ9XAg0mSUZ613 N9MVwrY/DOKy8v8mdtfUImU4Est6VJ3nUOIIp+eZhL1xTOPDE94OOHMCvPDg03dTf93c wSN3F5XIw7eIqsgB8TKKRL760HMNFK4u8IMuc2wSDzjNTxf1QTapGrT70I1Zb0GnN+wL kELA== X-Gm-Message-State: AOAM531czNCy4x63sH9L8drNSpRUkRdSBkcse9JJ+lJmBsMCKAxDwpzf E8smQCFXNXiR/84gjS6f9GU= X-Google-Smtp-Source: ABdhPJxrPsgcvYVLyT1ldTf+kaiqdgVqYhm4hqd3kV3MhDbbK02g0qLvmdIbHvgfAIWWmbTieMlH2g== X-Received: by 2002:a05:600c:4147:: with SMTP id h7mr221054wmm.45.1602600986603; Tue, 13 Oct 2020 07:56:26 -0700 (PDT) Received: from localhost.localdomain ([170.253.60.68]) by smtp.googlemail.com with ESMTPSA id y66sm11744wmd.14.2020.10.13.07.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 07:56:25 -0700 (PDT) To: mtk.manpages@gmail.com Subject: [PATCH] queue.3: circleq: Complete example Date: Tue, 13 Oct 2020 16:55:49 +0200 Message-Id: <20201013145548.14387-1-colomar.6.4.3@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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-Patchwork-Original-From: Alejandro Colomar via Libc-alpha From: Alejandro Colomar Reply-To: Alejandro Colomar Cc: Alejandro Colomar , linux-man@vger.kernel.org, libc-alpha@sourceware.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Signed-off-by: Alejandro Colomar --- Hola Michael, I'm a little busy this week as last week, so I'll send less/simpler patches than in the previous weeks :-) Un abrazo, Alex man3/queue.3 | 105 +++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/man3/queue.3 b/man3/queue.3 index 95bc7d5bc..fed8d126f 100644 --- a/man3/queue.3 +++ b/man3/queue.3 @@ -1318,55 +1318,6 @@ The macro removes the element .Fa elm from the circular queue. -.Ss Circular queue example -.Bd -literal -CIRCLEQ_HEAD(circleq, entry) head = - CIRCLEQ_HEAD_INITIALIZER(head); -struct circleq *headp; /* Circular queue head. */ -struct entry { - ... - CIRCLEQ_ENTRY(entry) entries; /* Circular queue. */ - ... -} *n1, *n2, *n3, *np; - -CIRCLEQ_INIT(&head); /* Initialize the queue. */ - -n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ -CIRCLEQ_INSERT_HEAD(&head, n1, entries); - -n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ -CIRCLEQ_INSERT_TAIL(&head, n1, entries); - -n2 = malloc(sizeof(struct entry)); /* Insert after. */ -CIRCLEQ_INSERT_AFTER(&head, n1, n2, entries); - -n3 = malloc(sizeof(struct entry)); /* Insert before. */ -CIRCLEQ_INSERT_BEFORE(&head, n2, n3, entries); - -CIRCLEQ_REMOVE(&head, n2, entries); /* Deletion. */ -free(n2); - /* Forward traversal. */ -CIRCLEQ_FOREACH(np, &head, entries) - np\-> ... - /* Reverse traversal. */ -CIRCLEQ_FOREACH_REVERSE(np, &head, entries) - np\-> ... - /* CircleQ Deletion. */ -while (!CIRCLEQ_EMPTY(&head)) { - n1 = CIRCLEQ_FIRST(&head); - CIRCLEQ_REMOVE(&head, n1, entries); - free(n1); -} - /* Faster CircleQ Deletion. */ -n1 = CIRCLEQ_FIRST(&head); -while (n1 != (void *)&head) { - n2 = CIRCLEQ_NEXT(n1, entries); - free(n1); - n1 = n2; -} - -CIRCLEQ_INIT(&head); -.Ed .Sh EXAMPLES .Ss Singly-linked list example .Bd -literal @@ -1481,6 +1432,62 @@ main(void) exit(EXIT_SUCCESS); } .Ed +.Ss Circular queue example +.Bd -literal +#include +#include +#include +#include + +struct entry { + int data; + CIRCLEQ_ENTRY(entry) entries; /* Queue. */ +}; + +CIRCLEQ_HEAD(circlehead, entry); + +int +main(void) +{ + struct entry *n1, *n2, *n3, *np; + struct circlehead head; /* Queue head. */ + int i; + + CIRCLEQ_INIT(&head); /* Initialize the queue. */ + + n1 = malloc(sizeof(struct entry)); /* Insert at the head. */ + CIRCLEQ_INSERT_HEAD(&head, n1, entries); + + n1 = malloc(sizeof(struct entry)); /* Insert at the tail. */ + CIRCLEQ_INSERT_TAIL(&head, n1, entries); + + n2 = malloc(sizeof(struct entry)); /* Insert after. */ + CIRCLEQ_INSERT_AFTER(&head, n1, n2, entries); + + n3 = malloc(sizeof(struct entry)); /* Insert before. */ + CIRCLEQ_INSERT_BEFORE(&head, n2, n3, entries); + + CIRCLEQ_REMOVE(&head, n2, entries); /* Deletion. */ + free(n2); + /* Forward traversal. */ + i = 0; + CIRCLEQ_FOREACH(np, &head, entries) + np->data = i++; + /* Reverse traversal. */ + CIRCLEQ_FOREACH_REVERSE(np, &head, entries) + printf("%i\en", np->data); + /* Queue deletion. */ + n1 = CIRCLEQ_FIRST(&head); + while (n1 != (void *)&head) { + n2 = CIRCLEQ_NEXT(n1, entries); + free(n1); + n1 = n2; + } + CIRCLEQ_INIT(&head); + + exit(EXIT_SUCCESS); +} +.Ed .Sh CONFORMING TO Not in POSIX.1, POSIX.1-2001 or POSIX.1-2008. Present on the BSDs.