From patchwork Tue Oct 3 03:40:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tirta Halim X-Patchwork-Id: 76998 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 F15E93858296 for ; Tue, 3 Oct 2023 03:42:00 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id F37393858D38 for ; Tue, 3 Oct 2023 03:41:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F37393858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1c3d8fb23d9so3645535ad.0 for ; Mon, 02 Oct 2023 20:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696304504; x=1696909304; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tr8dBh8VNO1EAV7bf7WZIKIeGw+p4RXUW8G2yXszUnU=; b=TyCCaZC07QqqTyZdrZQ7MmpBLh0cBQrRaQcfyJEIclbcFwd2zRVQoeWSu/8y0LKZEh HsBEUCUgTsa78p/rbXn0S7jqwbPTMmJCAg3AJxPQMG0kkEd2vcTOxrJetjTqupDuJ/xa EgkY1DvrY6/O1Xagg/Y9eTmal5NoT9k2o5d/qMebs2T8h/VIlku3lIi3wkRE0c4P2a4u cr7SSW6JV6rCGgIyYPHTTGT513bBonm5qL6kmF0d9Nbh/4O2yfkL6rdtyNTcf85qVRRl 7iUCnht5cUtQbbfW0DEZuY0Y1HT3ViYCRTqQFEVN1q69VOQDHxaLdUOd2Ks30zsVz/Ls YR4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696304504; x=1696909304; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tr8dBh8VNO1EAV7bf7WZIKIeGw+p4RXUW8G2yXszUnU=; b=K1mRNf778afBJN1t9cJ8O+D2+wc999nz/xX+hQQCSKcn1QmUIPh/C0HAwmPH1odKKR +tfAQfRrmkKyqG19EkZkets+NQQkLoN6jsuez4ovH2zXxUGSdvxvD4ZeQhjbS+1PejkS zmutPYrFQ33jkx6SrB/3Z8fQidel71Rq/4xW0bTrcrT0MzdS4kAeKMg7zavW8xyCxQ3z HKttaipgrudDUtDybCVMlTVjsUsfp1KLU1rrQjEwgHQQW4uyJs7/fCO0ckArPISgrWqH vgaKvk6cjjR/OZnnMWRLMyv7uAKlXg6loojugSz8TgZGfT3G5HryHUU7paoTFIiqnRbB CR0Q== X-Gm-Message-State: AOJu0YzyDJwOj2o7fbefPdxX+84O8Em+pNippQsu/syVffsk1ARObeos QszTBvdBWx4vD9KqCqbmmYumcUgVkks= X-Google-Smtp-Source: AGHT+IFQFo70bnWL6yGH5+C6BXlVJnI6ecFdrweyh+X1w7WVf87mCw1jP+ItG+9DYu7DQSx7e5MsXQ== X-Received: by 2002:a17:902:7d92:b0:1c6:c41:af37 with SMTP id a18-20020a1709027d9200b001c60c41af37mr10357926plm.68.1696304503861; Mon, 02 Oct 2023 20:41:43 -0700 (PDT) Received: from localhost.localdomain ([182.0.135.201]) by smtp.gmail.com with ESMTPSA id u5-20020a17090282c500b001c446dea2c5sm247912plz.143.2023.10.02.20.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 20:41:43 -0700 (PDT) From: James Tirta Halim To: libc-alpha@sourceware.org Cc: James Tirta Halim Subject: [PATCH] ftw.c: Use unlikely for unlikely taken branches such that taken ones are placed closer Date: Tue, 3 Oct 2023 10:40:56 +0700 Message-ID: <20231003034056.140938-1-tirtajames45@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 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_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org --- io/ftw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/io/ftw.c b/io/ftw.c index a72c7d5171..94fb2842d2 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -209,7 +209,7 @@ ftw_allocate (struct ftw_data *data, size_t newsize) void *newp = realloc (data->dirstreams, data->maxdir * sizeof (struct dir_data *) + newsize); - if (newp == NULL) + if (__glibc_unlikely(newp == NULL)) return false; data->dirstreams = newp; data->dirbufsize = newsize; @@ -255,7 +255,7 @@ static int add_object (struct ftw_data *data, struct STRUCT_STAT *st) { struct known_object *newp = malloc (sizeof (struct known_object)); - if (newp == NULL) + if (__glibc_unlikely(newp == NULL)) return -1; newp->dev = st->st_dev; newp->ino = st->st_ino; @@ -287,7 +287,7 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp) size_t bufsize = 1024; char *buf = malloc (bufsize); - if (buf == NULL) + if (__glibc_unlikely(buf == NULL)) result = -1; else { @@ -298,12 +298,12 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp) while ((d = __readdir64 (st)) != NULL) { size_t this_len = NAMLEN (d); - if (actsize + this_len + 2 >= bufsize) + if (glibc_unlikely(actsize + this_len + 2 >= bufsize)) { char *newp; bufsize += MAX (1024, 2 * this_len); newp = (char *) realloc (buf, bufsize); - if (newp == NULL) + if (__glibc_unlikely(newp == NULL)) { /* No more memory. */ int save_err = errno; @@ -325,7 +325,7 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp) /* Shrink the buffer to what we actually need. */ void *content = realloc (buf, actsize); data->dirstreams[data->actdir]->content = content; - if (content == NULL) + if (__glibc_unlikely(content == NULL)) { int save_err = errno; free (buf);