CodeSamples: Support for building on different operating systems
PATCH v2 1/1 CodeSamples: Support for building on different operating systems
--- CodeSamples/Makefile | 4 ++- CodeSamples/api-pthreads/api-linux.h | 36 +++++++++++++++++++++++ CodeSamples/api-pthreads/api-pthreads.h | 13 --------- CodeSamples/api-pthreads/api-qnx.h | 38 +++++++++++++++++++++++++ CodeSamples/arch-arm64/arch-arm64.h | 4 +++ CodeSamples/depends.mk | 29 ++++++++++++++++++- 6 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 CodeSamples/api-pthreads/api-linux.h create mode 100644 CodeSamples/api-pthreads/api-qnx.h
CodeSamples/Makefile +3 -1
@@ -38,10 +38,12 @@ endif sed '/end{snippet}/d' >> api.h echo "" >> api.h cat api-pthreads/api-gcc.h >> api.h + cat api-pthreads/api-$(os_compat).h >> api.h echo "" >> api.h if test -f /usr/include/urcu-call-rcu.h -o \ -f /usr/local/include/urcu-call-rcu.h -o \ - -f /usr/include/$(subdir_ub)/urcu-call-rcu.h ; \ + -f /usr/include/$(subdir_ub)/urcu-call-rcu.h -o \ + -f $(QNX_TARGET)/usr/include/urcu-call-rcu.h ; \ then \ echo "#define _LGPL_SOURCE" >> api.h; \ echo "#include <urcu/rculist.h>" >> api.h; \
CodeSamples/api-pthreads/api-linux.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* api-linux.h: Linux-specific functions +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. However, please note that much +* of the code in this file derives from the Linux kernel, and that such +* code may not be available except under GPLv2. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, you can access it online at +* http://www.gnu.org/licenses/gpl-2.0.html. +* +* Copyright (c) 2006-2019 Paul E. McKenney, IBM. +* Copyright (c) 2019 Paul E. McKenney, Facebook. +*/ + +static __inline__void run_on (int cpu) +{ +cpu_set_t mask; +int ret; + +CPU_ZERO (&mask); +CPU_SET (cpu, &mask); + ret =sched_setaffinity (0 ,sizeof (mask), &mask); +if (ret) { +perror ("sched_setaffinity" ); +abort (); + } +}
CodeSamples/api-pthreads/api-pthreads.h +0 -13
@@ -308,19 +308,6 @@ static __inline__ void waitall(void) }// \end{snippet} -static __inline__void run_on (int cpu) -{ -cpu_set_t mask; -int ret; - -CPU_ZERO (&mask); -CPU_SET (cpu, &mask); - ret =sched_setaffinity (0 ,sizeof (mask), &mask); -if (ret) { -perror ("sched_setaffinity" ); -abort (); - } -}/* * Timekeeping, using monotonic globally coherent clock.
CodeSamples/api-pthreads/api-qnx.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* api-qnx.h: QNX-specific functions +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. However, please note that much +* of the code in this file derives from the Linux kernel, and that such +* code may not be available except under GPLv2. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, you can access it online at +* http://www.gnu.org/licenses/gpl-2.0.html. +* +* Copyright (c) 2006-2019 Paul E. McKenney, IBM. +* Copyright (c) 2019 Paul E. McKenney, Facebook. +*/ + +#include <stdint.h> +#include <sys/neutrino.h> + +static inline void run_on (int cpu) +{ +uintptr_t runmask; +int ret; + + runmask = (1UL << cpu); + ret =ThreadCtl (_NTO_TCTL_RUNMASK, (void *)runmask); +if (ret) { +perror ("sched_setaffinity" ); +abort (); + } +}
CodeSamples/arch-arm64/arch-arm64.h +4 -0
@@ -46,6 +46,10 @@#include <stdlib.h> #include <time.h> +#ifndef CLOCK_MONOTONIC_RAW +#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC +#endif +/* * Generate 64-bit timestamp. */
CodeSamples/depends.mk +28 -1
@@ -1,7 +1,13 @@ ifeq ($(strip $(arch)),) -arch := $(shell uname -m) +arch := $(shell uname -p) endif +ifeq ($(strip $(os)),) +os := $(shell uname) +endif + +ifeq ($(os),Linux) +# Linux ifeq ($(arch),i686) target := x86 subdir_ub := i386-linux-gnu
@@ -23,6 +29,27 @@ subdir_ub := arm-linux-gnueabihf else target := subdir_ub := +endif +os_compat := linux + +else ifeq ($(os),QNX) +# QNX +ifeq ($(arch),x86_64) +target := x86 +else ifeq ($(arch),aarch64le) +target := arm64 +else +target := +endif +subdir_ub := +os_compat := qnx + +else +# Other OS +target := +subdir_ub := +os_compat := + endif api_depend_common := $(top)/linux/common.h \
Signature · 1 line
2.25.1
CodeSamples/Makefile endif · line 41
Quoted 1 line · Elad Lahav
CodeSamples/Makefile +1
-0+ cat api-pthreads/api-$(os_compat).h >> api.h
I didn't want to go overboard here, so it's just the minimum required for having a single per-OS header with specific definitions.
CodeSamples/arch-arm64/arch-arm64.h line 51
Quoted 3 lines
CodeSamples/arch-arm64/arch-arm64.h +3
-0+#ifndef CLOCK_MONOTONIC_RAW +#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC +#endif
This one wasn't moved to the per-OS header because of the order in which headers are included, which I didn't want to fiddle with. That said, would you be open to changing the ARM64 get_timestamp() to a simple read of the hardware clock? It is architecturally-defined.
--Elad
Quoted 5 lines · Elad Lahav
CodeSamples/Makefile endif · line 41
Quoted 1 line · Elad Lahav
CodeSamples/Makefile +1
-0+ cat api-pthreads/api-$(os_compat).h >> api.hI didn't want to go overboard here, so it's just the minimum required for having a single per-OS header with specific definitions.
I am good with that, thank you!
Quoted 6 lines
CodeSamples/arch-arm64/arch-arm64.h line 51
Quoted 3 lines
CodeSamples/arch-arm64/arch-arm64.h +3
-0+#ifndef CLOCK_MONOTONIC_RAW +#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC +#endif This one wasn't moved to the per-OS header because of the order in which headers are included, which I didn't want to fiddle with.
That is fine, especially given that there are other POSIX OSes, including old versions of Linux, that do not have CLOCK_MONOTONIC_RAW.
Quoted 2 lines
That said, would you be open to changing the ARM64
get_timestamp()to a simple read of the hardware clock? It is architecturally-defined.
Sounds good to me!
Your patch looks good and works on my system. One nit, but an important
one: The new api-pthreads/api-qnx.h file should have your copyright notice rather than mine, given that you created the file. Does something like this work for you?
* Copyright (c) 2021 Elad Lahav, BlackBerry.
Thanx, Paul