From: Lipeng Zhu <lipeng.zhu@intel.com>
To: tobias@codesourcery.com
Cc: Richard.Earnshaw@arm.com, fortran@gcc.gnu.org,
gcc-patches@gcc.gnu.org, hongjiu.lu@intel.com, jakub@redhat.com,
pan.deng@intel.com, rep.dot.nop@gmail.com,
thomas@codesourcery.com, tianyou.li@intel.com,
tkoenig@netcologne.de, wangyang.guo@intel.com,
Lipeng Zhu <lipeng.zhu@intel.com>
Subject: [PATCH v2] libgfortran: Bugfix if not define HAVE_ATOMIC_FETCH_ADD
Date: Thu, 4 Jan 2024 20:43:26 -0500 [thread overview]
Message-ID: <20240105014325.1490280-1-lipeng.zhu@intel.com> (raw)
In-Reply-To: <ee74d269-9df5-4ef8-87e7-2493d8ee4eb9@intel.com>
This patch try to fix the bug when HAVE_ATOMIC_FETCH_ADD is
not defined in dec_waiting_unlocked function. As io.h does
not include async.h, the WRLOCK and RWUNLOCK macros are
undefined.
libgfortran/ChangeLog:
* io/io.h (dec_waiting_unlocked): Use
__gthread_rwlock_wrlock/__gthread_rwlock_unlock or
__gthread_mutex_lock/__gthread_mutex_unlock functions
to replace WRLOCK and RWUNLOCK macros.
Signed-off-by: Lipeng Zhu <lipeng.zhu@intel.com>
---
libgfortran/io/io.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
index 15daa0995b1..c7f0f7d7d9e 100644
--- a/libgfortran/io/io.h
+++ b/libgfortran/io/io.h
@@ -1020,9 +1020,15 @@ dec_waiting_unlocked (gfc_unit *u)
#ifdef HAVE_ATOMIC_FETCH_ADD
(void) __atomic_fetch_add (&u->waiting, -1, __ATOMIC_RELAXED);
#else
- WRLOCK (&unit_rwlock);
+#ifdef __GTHREAD_RWLOCK_INIT
+ __gthread_rwlock_wrlock (&unit_rwlock);
+ u->waiting--;
+ __gthread_rwlock_unlock (&unit_rwlock);
+#else
+ __gthread_mutex_lock (&unit_rwlock);
u->waiting--;
- RWUNLOCK (&unit_rwlock);
+ __gthread_mutex_unlock (&unit_rwlock);
+#endif
#endif
}
--
2.39.3
next prev parent reply other threads:[~2024-01-05 1:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-22 2:36 [PATCH] " Lipeng Zhu
2024-01-03 11:12 ` Tobias Burnus
2024-01-03 22:04 ` Jerry D
2024-01-04 2:18 ` Lipeng Zhu
2024-01-05 1:43 ` Lipeng Zhu [this message]
2024-01-10 11:52 ` [PATCH v2] " Richard Earnshaw
2024-01-11 3:05 ` Lipeng Zhu
2024-01-11 12:38 ` Jakub Jelinek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240105014325.1490280-1-lipeng.zhu@intel.com \
--to=lipeng.zhu@intel.com \
--cc=Richard.Earnshaw@arm.com \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=hongjiu.lu@intel.com \
--cc=jakub@redhat.com \
--cc=pan.deng@intel.com \
--cc=rep.dot.nop@gmail.com \
--cc=thomas@codesourcery.com \
--cc=tianyou.li@intel.com \
--cc=tkoenig@netcologne.de \
--cc=tobias@codesourcery.com \
--cc=wangyang.guo@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).