X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos-solaris.h;h=1a411af664e8de947fc0497f59a12648e8d60fe0;hb=c21198d9cd52b6239c8f9de2373574a7683a0593;hp=644807c5084fdf9d5f1c35a30a0daa97af24bc45;hpb=f1ee61586b30ea4a54c8f10e1b1c5aa28a837101;p=fio.git diff --git a/os/os-solaris.h b/os/os-solaris.h index 644807c5..1a411af6 100644 --- a/os/os-solaris.h +++ b/os/os-solaris.h @@ -7,18 +7,21 @@ #include #include #include -#include +#include #include #include #include #include +#include #include #include "../file.h" +#include "../lib/types.h" #define FIO_HAVE_CPU_AFFINITY #define FIO_HAVE_CHARDEV_SIZE #define FIO_USE_GENERIC_BDEV_SIZE +#define FIO_HAVE_FS_STAT #define FIO_USE_GENERIC_INIT_RANDOM_STATE #define FIO_HAVE_GETTID @@ -44,7 +47,6 @@ struct solaris_rand_seed { #define FIO_OS_HAS_CTIME_R typedef psetid_t os_cpu_mask_t; -typedef struct solaris_rand_seed os_random_state_t; static inline int chardev_size(struct fio_file *f, unsigned long long *bytes) { @@ -76,19 +78,17 @@ static inline unsigned long long os_phys_mem(void) return (unsigned long long) pages * (unsigned long long) pagesize; } -static inline void os_random_seed(unsigned long seed, os_random_state_t *rs) +static inline unsigned long long get_fs_free_size(const char *path) { - rs->r[0] = seed & 0xffff; - seed >>= 16; - rs->r[1] = seed & 0xffff; - seed >>= 16; - rs->r[2] = seed & 0xffff; - seed48(rs->r); -} + unsigned long long ret; + struct statvfs s; -static inline long os_random_long(os_random_state_t *rs) -{ - return nrand48(rs->r); + if (statvfs(path, &s) < 0) + return -1ULL; + + ret = s.f_frsize; + ret *= (unsigned long long) s.f_bfree; + return ret; } #define FIO_OS_DIRECTIO @@ -111,24 +111,25 @@ static inline int fio_set_odirect(struct fio_file *f) #define fio_cpu_clear(mask, cpu) pset_assign(PS_NONE, (cpu), NULL) #define fio_cpu_set(mask, cpu) pset_assign(*(mask), (cpu), NULL) -static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu) +static inline bool fio_cpu_isset(os_cpu_mask_t *mask, int cpu) { const unsigned int max_cpus = sysconf(_SC_NPROCESSORS_ONLN); unsigned int num_cpus; processorid_t *cpus; - int i, ret; + bool ret; + int i; cpus = malloc(sizeof(*cpus) * max_cpus); if (pset_info(*mask, NULL, &num_cpus, cpus) < 0) { free(cpus); - return 0; + return false; } - ret = 0; + ret = false; for (i = 0; i < num_cpus; i++) { if (cpus[i] == cpu) { - ret = 1; + ret = true; break; } }