diff options
Diffstat (limited to 'usr/src/cmd/filebench/common/ipc.h')
| -rw-r--r-- | usr/src/cmd/filebench/common/ipc.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/usr/src/cmd/filebench/common/ipc.h b/usr/src/cmd/filebench/common/ipc.h index 8eed540c66..0596d177df 100644 --- a/usr/src/cmd/filebench/common/ipc.h +++ b/usr/src/cmd/filebench/common/ipc.h @@ -35,6 +35,7 @@ #include "threadflow.h" #include "fileset.h" #include "flowop.h" +#include "fb_random.h" #include "filebench.h" #ifdef __cplusplus @@ -50,21 +51,22 @@ extern "C" { #define FILEBENCH_NFILESETS FILEBENCH_MEMSIZE #define FILEBENCH_NFILESETENTRIES (1024 * 1024) #define FILEBENCH_NPROCFLOWS FILEBENCH_MEMSIZE -#define FILEBENCH_NTHREADFLOWS 64 * FILEBENCH_MEMSIZE -#define FILEBENCH_NFLOWOPS 64 * FILEBENCH_MEMSIZE +#define FILEBENCH_NTHREADFLOWS (64 * FILEBENCH_MEMSIZE) +#define FILEBENCH_NFLOWOPS (64 * FILEBENCH_MEMSIZE) #define FILEBENCH_NVARS FILEBENCH_MEMSIZE -#define FILEBENCH_FILESETPATHMEMORY FILEBENCH_NFILESETENTRIES*FSE_MAXPATHLEN -#define FILEBENCH_STRINGMEMORY FILEBENCH_NVARS * 128 +#define FILEBENCH_NRANDDISTS (FILEBENCH_MEMSIZE/4) +#define FILEBENCH_FILESETPATHMEMORY (FILEBENCH_NFILESETENTRIES*FSE_MAXPATHLEN) +#define FILEBENCH_STRINGMEMORY (FILEBENCH_NVARS * 128) #define FILEBENCH_MAXBITMAP FILEBENCH_NFILESETENTRIES #define FILEBENCH_PROCFLOW 0 #define FILEBENCH_THREADFLOW 1 #define FILEBENCH_FLOWOP 2 -#define FILEBENCH_INTEGER 3 -#define FILEBENCH_STRING 4 -#define FILEBENCH_VARIABLE 5 -#define FILEBENCH_FILESET 6 -#define FILEBENCH_FILESETENTRY 7 +#define FILEBENCH_AVD 3 +#define FILEBENCH_VARIABLE 4 +#define FILEBENCH_FILESET 5 +#define FILEBENCH_FILESETENTRY 6 +#define FILEBENCH_RANDDIST 7 #define FILEBENCH_TYPES 8 #define FILEBENCH_NSEMS 128 @@ -95,6 +97,7 @@ typedef struct filebench_shm { procflow_t *proclist; var_t *var_list; var_t *var_dyn_list; + randdist_t *shm_rand_list; int debug_level; hrtime_t epoch; hrtime_t starttime; @@ -130,8 +133,8 @@ typedef struct filebench_shm { threadflow_t threadflow[FILEBENCH_NTHREADFLOWS]; flowop_t flowop[FILEBENCH_NFLOWOPS]; var_t var[FILEBENCH_NVARS]; - vinteger_t integer_ptrs[FILEBENCH_NVARS]; - char *string_ptrs[FILEBENCH_NVARS]; + randdist_t shm_randdist[FILEBENCH_NRANDDISTS]; + struct avd shm_avd_ptrs[FILEBENCH_NVARS * 2]; char strings[FILEBENCH_STRINGMEMORY]; char semids[FILEBENCH_NSEMS]; int bitmap[FILEBENCH_TYPES][FILEBENCH_MAXBITMAP]; |