Commit 3b543917 authored by Rich Prohaska's avatar Rich Prohaska

fix the get_cachesize function prototype. addresses #223

git-svn-id: file:///svn/tokudb@1377 c7de825b-a66e-492c-adef-691d508d4ae1
parent 17873b86
...@@ -141,7 +141,7 @@ struct __toku_db_env { ...@@ -141,7 +141,7 @@ struct __toku_db_env {
int (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=524 size=4, 64=bit offset=952 size=8 */ int (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=524 size=4, 64=bit offset=952 size=8 */
int (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=528 size=4, 64=bit offset=960 size=8 */ int (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=528 size=4, 64=bit offset=960 size=8 */
void* __toku_dummy19[15]; void* __toku_dummy19[15];
int (*get_cachesize) (DB_ENV *, u_int32_t *); /* 32-bit offset=592 size=4, 64=bit offset=1088 size=8 */ int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *); /* 32-bit offset=592 size=4, 64=bit offset=1088 size=8 */
int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=596 size=4, 64=bit offset=1096 size=8 */ int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int); /* 32-bit offset=596 size=4, 64=bit offset=1096 size=8 */
void* __toku_dummy20[28]; void* __toku_dummy20[28];
int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=712 size=4, 64=bit offset=1328 size=8 */ int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=712 size=4, 64=bit offset=1328 size=8 */
......
...@@ -111,7 +111,7 @@ struct __toku_db_env { ...@@ -111,7 +111,7 @@ struct __toku_db_env {
void* __toku_dummy4[2]; void* __toku_dummy4[2];
void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=380 size=4, 64=bit offset=632 size=8 */ void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=380 size=4, 64=bit offset=632 size=8 */
void* __toku_dummy5[3]; void* __toku_dummy5[3];
int (*get_cachesize) (DB_ENV *, u_int32_t *); /* 32-bit offset=396 size=4, 64=bit offset=664 size=8 */ int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *); /* 32-bit offset=396 size=4, 64=bit offset=664 size=8 */
void* __toku_dummy6[4]; void* __toku_dummy6[4];
int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=416 size=4, 64=bit offset=704 size=8 */ int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=416 size=4, 64=bit offset=704 size=8 */
void* __toku_dummy7[32]; void* __toku_dummy7[32];
......
...@@ -111,7 +111,7 @@ struct __toku_db_env { ...@@ -111,7 +111,7 @@ struct __toku_db_env {
void* __toku_dummy4[2]; void* __toku_dummy4[2];
void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=384 size=4, 64=bit offset=640 size=8 */ void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=384 size=4, 64=bit offset=640 size=8 */
void* __toku_dummy5[3]; void* __toku_dummy5[3];
int (*get_cachesize) (DB_ENV *, u_int32_t *); /* 32-bit offset=400 size=4, 64=bit offset=672 size=8 */ int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *); /* 32-bit offset=400 size=4, 64=bit offset=672 size=8 */
void* __toku_dummy6[4]; void* __toku_dummy6[4];
int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=420 size=4, 64=bit offset=712 size=8 */ int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=420 size=4, 64=bit offset=712 size=8 */
void* __toku_dummy7[31]; void* __toku_dummy7[31];
......
...@@ -112,7 +112,7 @@ struct __toku_db_env { ...@@ -112,7 +112,7 @@ struct __toku_db_env {
void* __toku_dummy4[2]; void* __toku_dummy4[2];
void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=404 size=4, 64=bit offset=664 size=8 */ void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=404 size=4, 64=bit offset=664 size=8 */
void* __toku_dummy5[3]; void* __toku_dummy5[3];
int (*get_cachesize) (DB_ENV *, u_int32_t *); /* 32-bit offset=420 size=4, 64=bit offset=696 size=8 */ int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *); /* 32-bit offset=420 size=4, 64=bit offset=696 size=8 */
void* __toku_dummy6[5]; void* __toku_dummy6[5];
int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=444 size=4, 64=bit offset=744 size=8 */ int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=444 size=4, 64=bit offset=744 size=8 */
void* __toku_dummy7[32]; void* __toku_dummy7[32];
......
...@@ -72,7 +72,7 @@ void sample_db_env_offsets (void) { ...@@ -72,7 +72,7 @@ void sample_db_env_offsets (void) {
STRUCT_SETUP(DB_ENV, close, "int (*%s) (DB_ENV *, u_int32_t)"); STRUCT_SETUP(DB_ENV, close, "int (*%s) (DB_ENV *, u_int32_t)");
STRUCT_SETUP(DB_ENV, err, "void (*%s) (const DB_ENV *, int, const char *, ...)"); STRUCT_SETUP(DB_ENV, err, "void (*%s) (const DB_ENV *, int, const char *, ...)");
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3 #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
STRUCT_SETUP(DB_ENV, get_cachesize, "int (*%s) (DB_ENV *, u_int32_t *)"); STRUCT_SETUP(DB_ENV, get_cachesize, "int (*%s) (DB_ENV *, u_int32_t *, u_int32_t *, int *)");
STRUCT_SETUP(DB_ENV, get_flags, "int (*%s) (DB_ENV *, u_int32_t *)"); STRUCT_SETUP(DB_ENV, get_flags, "int (*%s) (DB_ENV *, u_int32_t *)");
#endif #endif
STRUCT_SETUP(DB_ENV, log_archive, "int (*%s) (DB_ENV *, char **[], u_int32_t)"); STRUCT_SETUP(DB_ENV, log_archive, "int (*%s) (DB_ENV *, char **[], u_int32_t)");
......
...@@ -28,7 +28,7 @@ struct fieldinfo db_env_fields32[] = { ...@@ -28,7 +28,7 @@ struct fieldinfo db_env_fields32[] = {
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 492, 4}, {"int (*log_flush) (DB_ENV *, const DB_LSN *)", 492, 4},
{"int (*set_lk_detect) (DB_ENV *, u_int32_t)", 524, 4}, {"int (*set_lk_detect) (DB_ENV *, u_int32_t)", 524, 4},
{"int (*set_lk_max) (DB_ENV *, u_int32_t)", 528, 4}, {"int (*set_lk_max) (DB_ENV *, u_int32_t)", 528, 4},
{"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 592, 4}, {"int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *)", 592, 4},
{"int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 596, 4}, {"int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 596, 4},
{"int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 712, 4}, {"int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 712, 4},
{"int (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 716, 4}, {"int (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 716, 4},
......
...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields32[] = { ...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields32[] = {
{"void *api1_internal", 336, 4}, {"void *api1_internal", 336, 4},
{"int (*close) (DB_ENV *, u_int32_t)", 368, 4}, {"int (*close) (DB_ENV *, u_int32_t)", 368, 4},
{"void (*err) (const DB_ENV *, int, const char *, ...)", 380, 4}, {"void (*err) (const DB_ENV *, int, const char *, ...)", 380, 4},
{"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 396, 4}, {"int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *)", 396, 4},
{"int (*get_flags) (DB_ENV *, u_int32_t *)", 416, 4}, {"int (*get_flags) (DB_ENV *, u_int32_t *)", 416, 4},
{"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 548, 4}, {"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 548, 4},
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 560, 4}, {"int (*log_flush) (DB_ENV *, const DB_LSN *)", 560, 4},
......
...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields32[] = { ...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields32[] = {
{"void *api1_internal", 336, 4}, {"void *api1_internal", 336, 4},
{"int (*close) (DB_ENV *, u_int32_t)", 372, 4}, {"int (*close) (DB_ENV *, u_int32_t)", 372, 4},
{"void (*err) (const DB_ENV *, int, const char *, ...)", 384, 4}, {"void (*err) (const DB_ENV *, int, const char *, ...)", 384, 4},
{"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 400, 4}, {"int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *)", 400, 4},
{"int (*get_flags) (DB_ENV *, u_int32_t *)", 420, 4}, {"int (*get_flags) (DB_ENV *, u_int32_t *)", 420, 4},
{"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 548, 4}, {"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 548, 4},
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 560, 4}, {"int (*log_flush) (DB_ENV *, const DB_LSN *)", 560, 4},
......
...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields32[] = { ...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields32[] = {
{"void *api1_internal", 356, 4}, {"void *api1_internal", 356, 4},
{"int (*close) (DB_ENV *, u_int32_t)", 392, 4}, {"int (*close) (DB_ENV *, u_int32_t)", 392, 4},
{"void (*err) (const DB_ENV *, int, const char *, ...)", 404, 4}, {"void (*err) (const DB_ENV *, int, const char *, ...)", 404, 4},
{"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 420, 4}, {"int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *)", 420, 4},
{"int (*get_flags) (DB_ENV *, u_int32_t *)", 444, 4}, {"int (*get_flags) (DB_ENV *, u_int32_t *)", 444, 4},
{"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 576, 4}, {"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 576, 4},
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 588, 4}, {"int (*log_flush) (DB_ENV *, const DB_LSN *)", 588, 4},
......
...@@ -28,7 +28,7 @@ struct fieldinfo db_env_fields64[] = { ...@@ -28,7 +28,7 @@ struct fieldinfo db_env_fields64[] = {
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 888, 8}, {"int (*log_flush) (DB_ENV *, const DB_LSN *)", 888, 8},
{"int (*set_lk_detect) (DB_ENV *, u_int32_t)", 952, 8}, {"int (*set_lk_detect) (DB_ENV *, u_int32_t)", 952, 8},
{"int (*set_lk_max) (DB_ENV *, u_int32_t)", 960, 8}, {"int (*set_lk_max) (DB_ENV *, u_int32_t)", 960, 8},
{"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 1088, 8}, {"int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *)", 1088, 8},
{"int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 1096, 8}, {"int (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 1096, 8},
{"int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 1328, 8}, {"int (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)", 1328, 8},
{"int (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 1336, 8}, {"int (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t)", 1336, 8},
......
...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields64[] = { ...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields64[] = {
{"void *api1_internal", 544, 8}, {"void *api1_internal", 544, 8},
{"int (*close) (DB_ENV *, u_int32_t)", 608, 8}, {"int (*close) (DB_ENV *, u_int32_t)", 608, 8},
{"void (*err) (const DB_ENV *, int, const char *, ...)", 632, 8}, {"void (*err) (const DB_ENV *, int, const char *, ...)", 632, 8},
{"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 664, 8}, {"int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *)", 664, 8},
{"int (*get_flags) (DB_ENV *, u_int32_t *)", 704, 8}, {"int (*get_flags) (DB_ENV *, u_int32_t *)", 704, 8},
{"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 968, 8}, {"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 968, 8},
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 992, 8}, {"int (*log_flush) (DB_ENV *, const DB_LSN *)", 992, 8},
......
...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields64[] = { ...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields64[] = {
{"void *api1_internal", 544, 8}, {"void *api1_internal", 544, 8},
{"int (*close) (DB_ENV *, u_int32_t)", 616, 8}, {"int (*close) (DB_ENV *, u_int32_t)", 616, 8},
{"void (*err) (const DB_ENV *, int, const char *, ...)", 640, 8}, {"void (*err) (const DB_ENV *, int, const char *, ...)", 640, 8},
{"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 672, 8}, {"int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *)", 672, 8},
{"int (*get_flags) (DB_ENV *, u_int32_t *)", 712, 8}, {"int (*get_flags) (DB_ENV *, u_int32_t *)", 712, 8},
{"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 968, 8}, {"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 968, 8},
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 992, 8}, {"int (*log_flush) (DB_ENV *, const DB_LSN *)", 992, 8},
......
...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields64[] = { ...@@ -12,7 +12,7 @@ struct fieldinfo db_env_fields64[] = {
{"void *api1_internal", 568, 8}, {"void *api1_internal", 568, 8},
{"int (*close) (DB_ENV *, u_int32_t)", 640, 8}, {"int (*close) (DB_ENV *, u_int32_t)", 640, 8},
{"void (*err) (const DB_ENV *, int, const char *, ...)", 664, 8}, {"void (*err) (const DB_ENV *, int, const char *, ...)", 664, 8},
{"int (*get_cachesize) (DB_ENV *, u_int32_t *)", 696, 8}, {"int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *)", 696, 8},
{"int (*get_flags) (DB_ENV *, u_int32_t *)", 744, 8}, {"int (*get_flags) (DB_ENV *, u_int32_t *)", 744, 8},
{"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 1008, 8}, {"int (*log_archive) (DB_ENV *, char **[], u_int32_t)", 1008, 8},
{"int (*log_flush) (DB_ENV *, const DB_LSN *)", 1032, 8}, {"int (*log_flush) (DB_ENV *, const DB_LSN *)", 1032, 8},
......
...@@ -111,7 +111,7 @@ struct __toku_db_env { ...@@ -111,7 +111,7 @@ struct __toku_db_env {
void* __toku_dummy4[2]; void* __toku_dummy4[2];
void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=380 size=4, 64=bit offset=632 size=8 */ void (*err) (const DB_ENV *, int, const char *, ...); /* 32-bit offset=380 size=4, 64=bit offset=632 size=8 */
void* __toku_dummy5[3]; void* __toku_dummy5[3];
int (*get_cachesize) (DB_ENV *, u_int32_t *); /* 32-bit offset=396 size=4, 64=bit offset=664 size=8 */ int (*get_cachesize) (DB_ENV *, u_int32_t *, u_int32_t *, int *); /* 32-bit offset=396 size=4, 64=bit offset=664 size=8 */
void* __toku_dummy6[4]; void* __toku_dummy6[4];
int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=416 size=4, 64=bit offset=704 size=8 */ int (*get_flags) (DB_ENV *, u_int32_t *); /* 32-bit offset=416 size=4, 64=bit offset=704 size=8 */
void* __toku_dummy7[32]; void* __toku_dummy7[32];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment