* [PATCH v2] Cygwin: Make <sys/cpuset.h> safe for c89 compilations
@ 2023-07-04 0:51 Mark Geisert
2023-07-04 14:33 ` Corinna Vinschen
0 siblings, 1 reply; 4+ messages in thread
From: Mark Geisert @ 2023-07-04 0:51 UTC (permalink / raw)
To: cygwin-patches; +Cc: Mark Geisert
Four modifications to include/sys/cpuset.h:
* Change C++-style comments to C-style also supported by C++
* Change "inline" to "__inline" on code lines
* Add "#include <sys/cdefs.h>" to make sure __inline is defined
* Don't declare loop variables on for-loop init clauses
Tested by first reproducing the reported issue with home-grown test
programs by compiling with gcc option "-std=c89", then compiling again
using the modified <sys/cpuset.h>. Other "-std=" options tested too.
Addresses: https://cygwin.com/pipermail/cygwin-patches/2023q3/012308.html
Fixes: 315e5fbd99ec ("Cygwin: Fix type mismatch on sys/cpuset.h")
Signed-off-by: Mark Geisert <mark@maxrnd.com>
---
winsup/cygwin/include/sys/cpuset.h | 49 ++++++++++++++++--------------
winsup/cygwin/release/3.4.7 | 3 ++
2 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/winsup/cygwin/include/sys/cpuset.h b/winsup/cygwin/include/sys/cpuset.h
index d83359fdf..0c95134ff 100644
--- a/winsup/cygwin/include/sys/cpuset.h
+++ b/winsup/cygwin/include/sys/cpuset.h
@@ -9,14 +9,16 @@ details. */
#ifndef _SYS_CPUSET_H_
#define _SYS_CPUSET_H_
+#include <sys/cdefs.h>
+
#ifdef __cplusplus
extern "C" {
#endif
typedef __SIZE_TYPE__ __cpu_mask;
-#define __CPU_SETSIZE 1024 // maximum number of logical processors tracked
-#define __NCPUBITS (8 * sizeof (__cpu_mask)) // max size of processor group
-#define __CPU_GROUPMAX (__CPU_SETSIZE / __NCPUBITS) // maximum group number
+#define __CPU_SETSIZE 1024 /* maximum number of logical processors tracked */
+#define __NCPUBITS (8 * sizeof (__cpu_mask)) /* max size of processor group */
+#define __CPU_GROUPMAX (__CPU_SETSIZE / __NCPUBITS) /* maximum group number */
#define __CPUELT(cpu) ((cpu) / __NCPUBITS)
#define __CPUMASK(cpu) ((__cpu_mask) 1 << ((cpu) % __NCPUBITS))
@@ -32,21 +34,21 @@ int __sched_getaffinity_sys (pid_t, size_t, cpu_set_t *);
/* These macros alloc or free dynamically-sized cpu sets of size 'num' cpus.
Allocations are padded such that full-word operations can be done easily. */
#define CPU_ALLOC_SIZE(num) __cpuset_alloc_size (num)
-static inline size_t
+static __inline size_t
__cpuset_alloc_size (int num)
{
return (size_t) (((num + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask));
}
#define CPU_ALLOC(num) __cpuset_alloc (num)
-static inline cpu_set_t *
+static __inline cpu_set_t *
__cpuset_alloc (int num)
{
return (cpu_set_t *) __builtin_malloc (CPU_ALLOC_SIZE(num));
}
#define CPU_FREE(set) __cpuset_free (set)
-static inline void
+static __inline void
__cpuset_free (cpu_set_t *set)
{
__builtin_free (set);
@@ -54,14 +56,14 @@ __cpuset_free (cpu_set_t *set)
/* These _S macros operate on dynamically-sized cpu sets of size 'siz' bytes */
#define CPU_ZERO_S(siz, set) __cpuset_zero_s (siz, set)
-static inline void
+static __inline void
__cpuset_zero_s (size_t siz, cpu_set_t *set)
{
(void) __builtin_memset (set, 0, siz);
}
#define CPU_SET_S(cpu, siz, set) __cpuset_set_s (cpu, siz, set)
-static inline void
+static __inline void
__cpuset_set_s (int cpu, size_t siz, cpu_set_t *set)
{
if (cpu >= 0 && cpu < 8 * siz)
@@ -69,7 +71,7 @@ __cpuset_set_s (int cpu, size_t siz, cpu_set_t *set)
}
#define CPU_CLR_S(cpu, siz, set) __cpuset_clr_s (cpu, siz, set)
-static inline void
+static __inline void
__cpuset_clr_s (int cpu, size_t siz, cpu_set_t *set)
{
if (cpu >= 0 && cpu < 8 * siz)
@@ -77,7 +79,7 @@ __cpuset_clr_s (int cpu, size_t siz, cpu_set_t *set)
}
#define CPU_ISSET_S(cpu, siz, set) __cpuset_isset_s (cpu, siz, set)
-static inline int
+static __inline int
__cpuset_isset_s (int cpu, size_t siz, cpu_set_t *set)
{
int res = 0;
@@ -87,45 +89,48 @@ __cpuset_isset_s (int cpu, size_t siz, cpu_set_t *set)
}
#define CPU_COUNT_S(siz, set) __cpuset_count_s (siz, set)
-static inline int
+static __inline int
__cpuset_count_s (size_t siz, cpu_set_t *set)
{
- int res = 0;
- for (int i = 0; i < siz / sizeof (__cpu_mask); i++)
+ int i, res = 0;
+ for (i = 0; i < siz / sizeof (__cpu_mask); i++)
res += __builtin_popcountl ((set)->__bits[i]);
return res;
}
#define CPU_AND_S(siz, dst, src1, src2) __cpuset_and_s (siz, dst, src1, src2)
-static inline void
+static __inline void
__cpuset_and_s (size_t siz, cpu_set_t *dst, cpu_set_t *src1, cpu_set_t *src2)
{
- for (int i = 0; i < siz / sizeof (__cpu_mask); i++)
+ int i;
+ for (i = 0; i < siz / sizeof (__cpu_mask); i++)
(dst)->__bits[i] = (src1)->__bits[i] & (src2)->__bits[i];
}
#define CPU_OR_S(siz, dst, src1, src2) __cpuset_or_s (siz, dst, src1, src2)
-static inline void
+static __inline void
__cpuset_or_s (size_t siz, cpu_set_t *dst, cpu_set_t *src1, cpu_set_t *src2)
{
- for (int i = 0; i < siz / sizeof (__cpu_mask); i++)
+ int i;
+ for (i = 0; i < siz / sizeof (__cpu_mask); i++)
(dst)->__bits[i] = (src1)->__bits[i] | (src2)->__bits[i];
}
#define CPU_XOR_S(siz, dst, src1, src2) __cpuset_xor_s (siz, dst, src1, src2)
-static inline void
+static __inline void
__cpuset_xor_s (size_t siz, cpu_set_t *dst, cpu_set_t *src1, cpu_set_t *src2)
{
- for (int i = 0; i < siz / sizeof (__cpu_mask); i++)
+ int i;
+ for (i = 0; i < siz / sizeof (__cpu_mask); i++)
(dst)->__bits[i] = (src1)->__bits[i] ^ (src2)->__bits[i];
}
#define CPU_EQUAL_S(siz, src1, src2) __cpuset_equal_s (siz, src1, src2)
-static inline int
+static __inline int
__cpuset_equal_s (size_t siz, cpu_set_t *src1, cpu_set_t *src2)
{
- int res = 1;
- for (int i = 0; res && i < siz / sizeof (__cpu_mask); i++)
+ int i, res = 1;
+ for (i = 0; res && i < siz / sizeof (__cpu_mask); i++)
res &= (src1)->__bits[i] == (src2)->__bits[i];
return res;
}
diff --git a/winsup/cygwin/release/3.4.7 b/winsup/cygwin/release/3.4.7
index 0e6922163..923408ec2 100644
--- a/winsup/cygwin/release/3.4.7
+++ b/winsup/cygwin/release/3.4.7
@@ -25,3 +25,6 @@ Bug Fixes
- Fix return code and errno set by renameat2, if oldfile and newfile
refer to the same file, and the RENAME_NOREPLACE flag is set.
Addresses: https://cygwin.com/pipermail/cygwin/2023-April/253514.html
+
+- Make <sys/cpuset.h> safe for c89 compilations.
+ Addresses: https://cygwin.com/pipermail/cygwin-patches/2023q3/012308.html
--
2.39.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Cygwin: Make <sys/cpuset.h> safe for c89 compilations
2023-07-04 0:51 [PATCH v2] Cygwin: Make <sys/cpuset.h> safe for c89 compilations Mark Geisert
@ 2023-07-04 14:33 ` Corinna Vinschen
2023-07-04 14:55 ` Corinna Vinschen
0 siblings, 1 reply; 4+ messages in thread
From: Corinna Vinschen @ 2023-07-04 14:33 UTC (permalink / raw)
To: cygwin-patches
On Jul 3 17:51, Mark Geisert wrote:
> Four modifications to include/sys/cpuset.h:
> * Change C++-style comments to C-style also supported by C++
> * Change "inline" to "__inline" on code lines
> * Add "#include <sys/cdefs.h>" to make sure __inline is defined
> * Don't declare loop variables on for-loop init clauses
>
> Tested by first reproducing the reported issue with home-grown test
> programs by compiling with gcc option "-std=c89", then compiling again
> using the modified <sys/cpuset.h>. Other "-std=" options tested too.
>
> Addresses: https://cygwin.com/pipermail/cygwin-patches/2023q3/012308.html
> Fixes: 315e5fbd99ec ("Cygwin: Fix type mismatch on sys/cpuset.h")
> Signed-off-by: Mark Geisert <mark@maxrnd.com>
>
> ---
> winsup/cygwin/include/sys/cpuset.h | 49 ++++++++++++++++--------------
> winsup/cygwin/release/3.4.7 | 3 ++
> 2 files changed, 30 insertions(+), 22 deletions(-)
Pushed.
Thanks,
Corinna
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Cygwin: Make <sys/cpuset.h> safe for c89 compilations
2023-07-04 14:33 ` Corinna Vinschen
@ 2023-07-04 14:55 ` Corinna Vinschen
2023-07-04 18:41 ` Mark Geisert
0 siblings, 1 reply; 4+ messages in thread
From: Corinna Vinschen @ 2023-07-04 14:55 UTC (permalink / raw)
To: cygwin-patches
On Jul 4 16:33, Corinna Vinschen wrote:
> On Jul 3 17:51, Mark Geisert wrote:
> > Four modifications to include/sys/cpuset.h:
> > * Change C++-style comments to C-style also supported by C++
> > * Change "inline" to "__inline" on code lines
> > * Add "#include <sys/cdefs.h>" to make sure __inline is defined
> > * Don't declare loop variables on for-loop init clauses
> >
> > Tested by first reproducing the reported issue with home-grown test
> > programs by compiling with gcc option "-std=c89", then compiling again
> > using the modified <sys/cpuset.h>. Other "-std=" options tested too.
> >
> > Addresses: https://cygwin.com/pipermail/cygwin-patches/2023q3/012308.html
> > Fixes: 315e5fbd99ec ("Cygwin: Fix type mismatch on sys/cpuset.h")
> > Signed-off-by: Mark Geisert <mark@maxrnd.com>
> >
> > ---
> > winsup/cygwin/include/sys/cpuset.h | 49 ++++++++++++++++--------------
> > winsup/cygwin/release/3.4.7 | 3 ++
> > 2 files changed, 30 insertions(+), 22 deletions(-)
>
> Pushed.
FYI, I missed to notice that you added the release message to the
already existing 3.4.7 release. I moved it into a new file for 3.4.8.
Corinna
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Cygwin: Make <sys/cpuset.h> safe for c89 compilations
2023-07-04 14:55 ` Corinna Vinschen
@ 2023-07-04 18:41 ` Mark Geisert
0 siblings, 0 replies; 4+ messages in thread
From: Mark Geisert @ 2023-07-04 18:41 UTC (permalink / raw)
To: cygwin-patches
Corinna Vinschen wrote:
> On Jul 4 16:33, Corinna Vinschen wrote:
>> On Jul 3 17:51, Mark Geisert wrote:
>>> Four modifications to include/sys/cpuset.h:
>>> * Change C++-style comments to C-style also supported by C++
>>> * Change "inline" to "__inline" on code lines
>>> * Add "#include <sys/cdefs.h>" to make sure __inline is defined
>>> * Don't declare loop variables on for-loop init clauses
>>>
>>> Tested by first reproducing the reported issue with home-grown test
>>> programs by compiling with gcc option "-std=c89", then compiling again
>>> using the modified <sys/cpuset.h>. Other "-std=" options tested too.
>>>
>>> Addresses: https://cygwin.com/pipermail/cygwin-patches/2023q3/012308.html
>>> Fixes: 315e5fbd99ec ("Cygwin: Fix type mismatch on sys/cpuset.h")
>>> Signed-off-by: Mark Geisert <mark@maxrnd.com>
>>>
>>> ---
>>> winsup/cygwin/include/sys/cpuset.h | 49 ++++++++++++++++--------------
>>> winsup/cygwin/release/3.4.7 | 3 ++
>>> 2 files changed, 30 insertions(+), 22 deletions(-)
>>
>> Pushed.
>
> FYI, I missed to notice that you added the release message to the
> already existing 3.4.7 release. I moved it into a new file for 3.4.8.
Thank you for cleaning up after my goof on the version.
Cheers & Regards,
..mark
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-04 18:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-04 0:51 [PATCH v2] Cygwin: Make <sys/cpuset.h> safe for c89 compilations Mark Geisert
2023-07-04 14:33 ` Corinna Vinschen
2023-07-04 14:55 ` Corinna Vinschen
2023-07-04 18:41 ` Mark Geisert
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).