Commit 824b7137 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul

Add mgrp to dbtxn. Addresses #215.

git-svn-id: file:///svn/tokudb@1319 c7de825b-a66e-492c-adef-691d508d4ae1
parent 74dbe993
...@@ -73,6 +73,8 @@ sample_offsets_local: ./db.h ...@@ -73,6 +73,8 @@ sample_offsets_local: ./db.h
sample_offsets_local: sample_offsets.c sample_offsets_local: sample_offsets.c
$(CC) $(CFLAGS) -I. -DLOCAL $< -o $@ $(CC) $(CFLAGS) -I. -DLOCAL $< -o $@
hfiles: db.h_4_1 db.h_4_3 db.h_4_4 db.h_4_5
check32: sample_offsets_local check32: sample_offsets_local
./sample_offsets_local ./sample_offsets_local
diff sample_offsets_local.h sample_offsets_32.h diff sample_offsets_local.h sample_offsets_32.h
......
...@@ -197,8 +197,9 @@ struct __toku_db_txn_active { ...@@ -197,8 +197,9 @@ struct __toku_db_txn_active {
DB_LSN lsn; /* 32-bit offset=8 size=8, 64=bit offset=8 size=8 */ DB_LSN lsn; /* 32-bit offset=8 size=8, 64=bit offset=8 size=8 */
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[10]; void* __toku_dummy0[9];
char __toku_dummy1[24]; char __toku_dummy1[24];
void *api_internal; /* 32-bit offset=68 size=4, 64=bit offset=112 size=8 */ void *api_internal; /* 32-bit offset=68 size=4, 64=bit offset=112 size=8 */
void* __toku_dummy2[1]; void* __toku_dummy2[1];
...@@ -218,8 +219,9 @@ struct __toku_db_txn_stat { ...@@ -218,8 +219,9 @@ struct __toku_db_txn_stat {
char __toku_dummy4[8]; /* Padding at the end */ char __toku_dummy4[8]; /* Padding at the end */
}; };
struct __toku_dbc { struct __toku_dbc {
DB *dbp; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
struct __toku_dbc_internal *i; struct __toku_dbc_internal *i;
void* __toku_dummy0[20]; void* __toku_dummy0[19];
char __toku_dummy1[104]; char __toku_dummy1[104];
int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=272 size=8 */ int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=272 size=8 */
void* __toku_dummy2[1]; void* __toku_dummy2[1];
......
...@@ -211,8 +211,9 @@ struct __toku_db_txn_active { ...@@ -211,8 +211,9 @@ struct __toku_db_txn_active {
char __toku_dummy1[132]; /* Padding at the end */ char __toku_dummy1[132]; /* Padding at the end */
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[15]; void* __toku_dummy0[14];
char __toku_dummy1[24]; char __toku_dummy1[24];
void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=152 size=8 */ void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=152 size=8 */
void* __toku_dummy2[2]; void* __toku_dummy2[2];
...@@ -232,8 +233,9 @@ struct __toku_db_txn_stat { ...@@ -232,8 +233,9 @@ struct __toku_db_txn_stat {
char __toku_dummy4[8]; /* Padding at the end */ char __toku_dummy4[8]; /* Padding at the end */
}; };
struct __toku_dbc { struct __toku_dbc {
DB *dbp; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
struct __toku_dbc_internal *i; struct __toku_dbc_internal *i;
void* __toku_dummy0[18]; void* __toku_dummy0[17];
char __toku_dummy1[112]; char __toku_dummy1[112];
int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=264 size=8 */ int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=264 size=8 */
void* __toku_dummy2[1]; void* __toku_dummy2[1];
......
...@@ -211,8 +211,9 @@ struct __toku_db_txn_active { ...@@ -211,8 +211,9 @@ struct __toku_db_txn_active {
char __toku_dummy2[184]; /* Padding at the end */ char __toku_dummy2[184]; /* Padding at the end */
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[18]; void* __toku_dummy0[17];
char __toku_dummy1[8]; char __toku_dummy1[8];
void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */ void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */
void* __toku_dummy2[2]; void* __toku_dummy2[2];
......
...@@ -210,8 +210,9 @@ struct __toku_db_txn_active { ...@@ -210,8 +210,9 @@ struct __toku_db_txn_active {
char __toku_dummy2[200]; /* Padding at the end */ char __toku_dummy2[200]; /* Padding at the end */
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[18]; void* __toku_dummy0[17];
char __toku_dummy1[8]; char __toku_dummy1[8];
void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */ void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */
void* __toku_dummy2[2]; void* __toku_dummy2[2];
...@@ -231,8 +232,9 @@ struct __toku_db_txn_stat { ...@@ -231,8 +232,9 @@ struct __toku_db_txn_stat {
char __toku_dummy4[8]; /* Padding at the end */ char __toku_dummy4[8]; /* Padding at the end */
}; };
struct __toku_dbc { struct __toku_dbc {
DB *dbp; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
struct __toku_dbc_internal *i; struct __toku_dbc_internal *i;
void* __toku_dummy0[24]; void* __toku_dummy0[23];
char __toku_dummy1[104]; char __toku_dummy1[104];
int (*c_close) (DBC *); /* 32-bit offset=204 size=4, 64=bit offset=304 size=8 */ int (*c_close) (DBC *); /* 32-bit offset=204 size=4, 64=bit offset=304 size=8 */
void* __toku_dummy2[1]; void* __toku_dummy2[1];
......
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