Re: [PATCH] RESEND Fix headers for building with some older libs

whoops this line should be gone too
+#define FIO_HAVE_SETPSHARED

On 7/24/07, Shawn Lewis <shawnlewis_at_google.com> wrote:
>
> The previous patch tried to disable pthread_mutexattr_setpshared but it
> didn't
> work since we don't include os.h in mutex.c.
>
> diff --git a/os/os-linux.h b/os/os-linux.h
> index 11f767c..7e05b8c 100644
> --- a/os/os-linux.h
> +++ b/os/os-linux.h
> @@ -23,22 +23,34 @@ #define FIO_HAVE_ODIRECT
> #define FIO_HAVE_HUGETLB
> #define FIO_HAVE_RAWBIND
> #define FIO_HAVE_BLKTRACE
> +#define FIO_HAVE_SETPSHARED
>
> #define OS_MAP_ANON (MAP_ANONYMOUS)
>
> +#ifndef CLOCK_MONOTONIC
> +#define CLOCK_MONOTONIC 1
> +#endif
> +
> +#ifdef FIO_HAVE_CPU_AFFINITY
> typedef cpu_set_t os_cpu_mask_t;
> +#else
> +typedef int os_cpu_mask_t;
> +#endif
> typedef struct drand48_data os_random_state_t;
>
> /*
> * we want fadvise64 really, but it's so tangled... later
> */
> +#ifdef FIO_HAVE_FADVISE
> #define fadvise(fd, off, len, advice) \
> posix_fadvise((fd), (off_t)(off), (len), (advice))
> +#endif
>
> /*
> * If you are on an ancient glibc (2.3.2), then define GLIBC_2_3_2 if you
> want
> * the affinity helpers to work.
> */
> +#ifdef FIO_HAVE_CPU_AFFINITY
> #ifndef GLIBC_2_3_2
> #define fio_setaffinity(td) \
> sched_setaffinity((td)->pid, sizeof((td)->o.cpumask), &(td)->
> o.cpumask)
> @@ -50,6 +62,7 @@ #define fio_setaffinity(td) \
> #define fio_getaffinity(pid, ptr) \
> sched_getaffinity((pid), (ptr))
> #endif
> +#endif
>
> static inline int ioprio_set(int which, int who, int ioprio)
> {
> diff --git a/os/os.h b/os/os.h
> index 660dcc5..42cd63d 100644
> --- a/os/os.h
> +++ b/os/os.h
> @@ -27,9 +27,11 @@ #endif
> #ifndef FIO_HAVE_FADVISE
> #define fadvise(fd, off, len, advice) (0)
>
> +#ifndef POSIX_FADV_DONTNEED
> #define POSIX_FADV_DONTNEED (0)
> #define POSIX_FADV_SEQUENTIAL (0)
> #define POSIX_FADV_RANDOM (0)
> +#endif
> #endif /* FIO_HAVE_FADVISE */
>
> #ifndef FIO_HAVE_CPU_AFFINITY
> @@ -49,7 +51,9 @@ #endif
>
> #ifndef FIO_HAVE_HUGETLB
> #define SHM_HUGETLB 0
> +#ifndef FIO_HUGE_PAGE
> #define FIO_HUGE_PAGE 0
> +#endif
> #else
> #ifndef FIO_HUGE_PAGE
> #define FIO_HUGE_PAGE 4194304
>
>
Received on Wed Jul 25 2007 - 04:40:40 CEST